diff options
| author | shattered <shattered@pkgsrc.org> | 2011-10-22 07:33:34 +0000 |
|---|---|---|
| committer | shattered <shattered@pkgsrc.org> | 2011-10-22 07:33:34 +0000 |
| commit | ea04b32cfe504741e4078d73358aadee1e902111 (patch) | |
| tree | 03e5c62f64abf932fe07a7d790e3e47fe7cbb74e /net/net-snmp | |
| parent | 607cb3099d6ad3ba4a0642c915b3357eeb422138 (diff) | |
| download | pkgsrc-ea04b32cfe504741e4078d73358aadee1e902111.tar.gz | |
PR/39320 -- Don't override user-supplied rc.d *_flags variable.
Diffstat (limited to 'net/net-snmp')
| -rw-r--r-- | net/net-snmp/Makefile | 4 | ||||
| -rw-r--r-- | net/net-snmp/files/snmpd.sh | 5 | ||||
| -rw-r--r-- | net/net-snmp/files/snmptrapd.sh | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 1b0595b7a3a..74a74884416 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.87 2011/08/14 14:14:40 obache Exp $ +# $NetBSD: Makefile,v 1.88 2011/10/22 07:33:34 shattered Exp $ DISTNAME= net-snmp-5.6.1.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} diff --git a/net/net-snmp/files/snmpd.sh b/net/net-snmp/files/snmpd.sh index 9a0b9328f24..b9c4e4a9f8e 100644 --- a/net/net-snmp/files/snmpd.sh +++ b/net/net-snmp/files/snmpd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: snmpd.sh,v 1.4 2004/05/31 11:47:29 tron Exp $ +# $NetBSD: snmpd.sh,v 1.5 2011/10/22 07:33:34 shattered Exp $ # # PROVIDE: snmpd # REQUIRE: DAEMON @@ -9,11 +9,12 @@ if [ -f /etc/rc.subr ]; then . /etc/rc.subr fi +: ${snmpd_flags:="-Ls d"} # log using syslog LOG_DAEMON + name="snmpd" rcvar=$name command="@PREFIX@/sbin/${name}" pidfile="/var/run/${name}.pid" -snmpd_flags="-Ls d" # log using syslog LOG_DAEMON command_args="-p ${pidfile}" if [ -f @PKG_SYSCONFDIR@/snmpd.conf ]; then diff --git a/net/net-snmp/files/snmptrapd.sh b/net/net-snmp/files/snmptrapd.sh index 133c78408a6..df56df321a8 100644 --- a/net/net-snmp/files/snmptrapd.sh +++ b/net/net-snmp/files/snmptrapd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: snmptrapd.sh,v 1.4 2006/05/12 19:52:33 adam Exp $ +# $NetBSD: snmptrapd.sh,v 1.5 2011/10/22 07:33:34 shattered Exp $ # # PROVIDE: snmptrapd # REQUIRE: DAEMON @@ -9,11 +9,12 @@ if [ -f /etc/rc.subr ]; then . /etc/rc.subr fi +: ${snmptrapd_flags:="-Ls 1"} # log using syslog w/ facility LOG_LOCAL1 + name="snmptrapd" rcvar=$name command="@PREFIX@/sbin/${name}" pidfile="/var/run/${name}.pid" -snmptrapd_flags="-Ls 1" # log using syslog w/ facility LOG_LOCAL1 command_args="-p ${pidfile}" if [ -f @PKG_SYSCONFDIR@/snmptrapd.conf ]; then |