OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   04-Sep-2003 20:04:00
  Branch: HEAD                             Handle: 2003090419035801

  Modified files:
    openpkg-src/snmp        rc.snmp snmp.spec snmpd.conf
    openpkg-web             news.txt

  Log:
    various package cleanups

  Summary:
    Revision    Changes     Path
    1.11        +5  -7      openpkg-src/snmp/rc.snmp
    1.57        +8  -8      openpkg-src/snmp/snmp.spec
    1.2         +11 -20     openpkg-src/snmp/snmpd.conf
    1.6404      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/snmp/rc.snmp
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 rc.snmp
  --- openpkg-src/snmp/rc.snmp  22 Jul 2003 15:05:26 -0000      1.10
  +++ openpkg-src/snmp/rc.snmp  4 Sep 2003 18:03:59 -0000       1.11
  @@ -13,7 +13,6 @@
   
   %common
       snmp_pidfile="@l_prefix@/var/snmp/snmpd.pid"
  -    snmp_config="@l_prefix@/etc/snmp/snmpd.conf"
       snmp_signal () {
           [ -f $snmp_pidfile ] && kill -$1 `cat $snmp_pidfile`
       }
  @@ -22,7 +21,7 @@
       snmp_usable="no"
       snmp_active="no"
       rcService snmp enable yes && \
  -        [ -f $snmp_config ] && snmp_usable="yes"
  +        snmp_usable="yes"
       rcService snmp enable yes && \
           snmp_signal 0 && snmp_active="yes"
       echo "snmp_enable=\"$snmp_enable\""
  @@ -31,24 +30,23 @@
   
   %start -u @l_susr@
       rcService snmp enable yes || exit 0
  -    if [ -f $snmp_config ]; then
  -        @l_prefix@/sbin/snmpd -s -P $snmp_pidfile
  -    fi
  +    rcService snmp active yes && exit 0
  +    @l_prefix@/sbin/snmpd -s -P $snmp_pidfile
   
   %stop -u @l_susr@
       rcService snmp enable yes || exit 0
  +    rcService snmp active no  && exit 0
       snmp_signal TERM
   
   %restart -u @l_susr@
       rcService snmp enable yes || exit 0
  +    rcService snmp active no  && exit 0
       rc snmp stop
       sleep 2
       rc snmp start
   
   %daily -u @l_susr@
       rcService snmp enable yes || exit 0
  -
  -    #   rotate logfile
       shtool rotate -f \
           -n ${snmp_log_numfiles} -s ${snmp_log_minsize} -d \
           -z ${snmp_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/snmp/snmp.spec
  ============================================================================
  $ cvs diff -u -r1.56 -r1.57 snmp.spec
  --- openpkg-src/snmp/snmp.spec        26 Aug 2003 09:53:54 -0000      1.56
  +++ openpkg-src/snmp/snmp.spec        4 Sep 2003 18:03:59 -0000       1.57
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      BSD
   Version:      5.0.8
  -Release:      20030826
  +Release:      20030904
   
   #   package options
   %option       with_fsl      yes
  @@ -68,10 +68,10 @@
   
   %description
       This is a toolkit relating to the Simple Network Management Protocol
  -    (SNMP), including: an extensible agent; an SNMP library; tools to
  -    request or set information from SNMP agents; tools to generate and
  -    handle SNMP traps; a version of the unix 'netstat' command using
  -    SNMP; etc.
  +    (SNMP), including an extensible agent, an SNMP library, tools to
  +    request or set information from SNMP agents, tools to generate and
  +    handle SNMP traps, a version of the unix 'netstat' command using
  +    SNMP, etc.
   
   %prep
       #   unpack and patch package
  @@ -173,9 +173,9 @@
       #   strip down installation
       rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/snmpinform
       rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/ipf-mod.pl
  -    ln $RPM_BUILD_ROOT%{l_prefix}/bin/snmptrap \
  -       $RPM_BUILD_ROOT%{l_prefix}/bin/snmpinform
  -    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
  +    ln  $RPM_BUILD_ROOT%{l_prefix}/bin/snmptrap \
  +        $RPM_BUILD_ROOT%{l_prefix}/bin/snmpinform
  +    strip $RPM_BUILD_ROOT%{l_prefix}/bin/*  >/dev/null 2>&1 || true
       strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
   
       #   install run-command script
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/snmp/snmpd.conf
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 snmpd.conf
  --- openpkg-src/snmp/snmpd.conf       29 Apr 2003 13:48:48 -0000      1.1
  +++ openpkg-src/snmp/snmpd.conf       4 Sep 2003 18:03:59 -0000       1.2
  @@ -1,21 +1,12 @@
  -###########################################################################
  -#
  -# snmpd.conf
  -#
  -#   - created by the snmpconf configuration program
  -#
  -###########################################################################
  -# SECTION: Access Control Setup
  -#
  -#   This section defines who is allowed to talk to your running
  -#   snmp agent.
  +##
  +##  snmpd.conf
  +##
  +
  +#   rouser: a SNMPv3 read-only user
  +#   arguments: user [noauth|auth|priv] [restriction_oid]
  +rouser openpkg
       
  -# rouser: a SNMPv3 read-only user
  -#   arguments:  user [noauth|auth|priv] [restriction_oid]
  -    
  -rouser  nms
  -    
  -# rocommunity: a SNMPv1/SNMPv2c read-only access community name
  -#   arguments:  community [default|hostname|network/bits] [oid]
  -    
  -rocommunity  public 127.0.0.1
  +#   rocommunity: a SNMPv1/SNMPv2c read-only access community name
  +#   arguments: community [default|hostname|network/bits] [oid]
  +rocommunity public 127.0.0.1
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.6403 -r1.6404 news.txt
  --- openpkg-web/news.txt      4 Sep 2003 17:54:32 -0000       1.6403
  +++ openpkg-web/news.txt      4 Sep 2003 18:03:58 -0000       1.6404
  @@ -1,3 +1,4 @@
  +04-Sep-2003: Upgraded package: P<snmp-5.0.8-20030904>
   04-Sep-2003: Upgraded package: P<p0f-2.0.1-20030904>
   04-Sep-2003: Upgraded package: P<mysql-4.0.14-20030904>
   04-Sep-2003: Upgraded package: P<mysql3-3.23.57-20030904>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to