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 Date: 01-Sep-2004 17:31:48
Branch: HEAD Handle: 2004090116314800
Modified files:
openpkg-src/snmp rc.snmp snmp.spec
Log:
remove obsolete null substitution and remove pid file from command
line
Summary:
Revision Changes Path
1.12 +1 -1 openpkg-src/snmp/rc.snmp
1.68 +6 -4 openpkg-src/snmp/snmp.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/snmp/rc.snmp
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.snmp
--- openpkg-src/snmp/rc.snmp 4 Sep 2003 18:03:59 -0000 1.11
+++ openpkg-src/snmp/rc.snmp 1 Sep 2004 15:31:48 -0000 1.12
@@ -31,7 +31,7 @@
%start -u @l_susr@
rcService snmp enable yes || exit 0
rcService snmp active yes && exit 0
- @l_prefix@/sbin/snmpd -s -P $snmp_pidfile
+ @l_prefix@/sbin/snmpd -s
%stop -u @l_susr@
rcService snmp enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/snmp/snmp.spec
============================================================================
$ cvs diff -u -r1.67 -r1.68 snmp.spec
--- openpkg-src/snmp/snmp.spec 10 Aug 2004 16:59:41 -0000 1.67
+++ openpkg-src/snmp/snmp.spec 1 Sep 2004 15:31:48 -0000 1.68
@@ -37,7 +37,7 @@
Group: Network
License: BSD
Version: 5.1.2
-Release: 20040810
+Release: 20040901
# package options
%option with_fsl yes
@@ -90,6 +90,11 @@
%setup -q -n net-snmp-%{version}
%patch -p0
+ # provide a default PID file location
+ %{l_shtool} subst \
+ -e 's;\(pid_file =\) NULL;\1 "%{l_prefix}/var/snmp/snmpd.pid";' \
+ agent/snmpd.c
+
# adjust package for RPM support in Host MIB
# (because OpenPKG RPM is a little bit different)
%{l_shtool} subst \
@@ -100,9 +105,6 @@
-e 's;-lrpm\([^a-z]\);-lrpm -lrpmio\1;g' \
-e 's;-lrpmio\([^a-z]\);-lrpmio -lrpmpopt -lrpmbz2 -lrpmz\1;g' \
configure
- %{l_shtool} subst \
- -e 's;@OPENPKG_RPMRC@;"%{l_prefix}/etc/openpkg/rpmrc";' \
- agent/mibgroup/host/hr_swinst.c
# adjust package for not requiring --enable-shared for --with-perl-modules
# (because it technically working also with static libraries on most
platforms)
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
