- Remove "sig_stop=KILL" in snmpd.sh.in. This was introduced when

  PR ports/63759 was committed (3 years ago).  Try to use normal TERM
  signal for graceful termination [1].
- Increase /bin/ps cache size from 16KB to 120KB.  This should fix
  process counter (ex prCount.1) on the server which has large number
  of processes [2].

PR:		ports/103811 [1], ports/110498 [2]
Reported by:	Yuri Arabadji <yuri@deepunix.net> [1],
		Mike Andrews <mandrews@bit0.com> [2]

9 files changed, 38 insertions, 8 deletions

diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index 9fa6ec968849..1dedd9da65e9 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
diff --git a/net-mgmt/net-snmp-devel/files/patch-net-snmp-config.h.in b/net-mgmt/net-snmp-devel/files/patch-net-snmp-config.h.in
new file mode 100644
index 000000000000..0069a7226a36
--- /dev/null
+++ b/net-mgmt/net-snmp-devel/files/patch-net-snmp-config.h.in
@@ -0,0 +1,11 @@
+--- include/net-snmp/net-snmp-config.h.in.orig	Sun Mar 25 21:01:16 2007
++++ include/net-snmp/net-snmp-config.h.in	Sun Mar 25 21:01:33 2007
+@@ -1334,7 +1334,7 @@
+ 
+ #define EXCACHETIME 30
+ #define CACHEFILE ".snmp-exec-cache"
+-#define MAXCACHESIZE (200*80)   /* roughly 200 lines max */
++#define MAXCACHESIZE (1500*80)   /* roughly 1500 lines max */
+ 
+ /* misc defaults */
+ 
diff --git a/net-mgmt/net-snmp-devel/files/snmpd.sh.in b/net-mgmt/net-snmp-devel/files/snmpd.sh.in
index 35dab34e1e18..b2c7590d8aa4 100644
--- a/net-mgmt/net-snmp-devel/files/snmpd.sh.in
+++ b/net-mgmt/net-snmp-devel/files/snmpd.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp-devel/files/Attic/snmpd.sh.in,v 1.5 2007-02-28 01:17:16 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp-devel/files/Attic/snmpd.sh.in,v 1.6 2007-03-25 12:35:45 kuriyama Exp $
 #
 # PROVIDE: snmpd
 # REQUIRE: DAEMON
@@ -32,7 +32,6 @@ rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/${name}
 pidfile=${snmpd_pidfile}
-sig_stop=KILL
 start_precmd=snmpd_precmd
 
 load_rc_config ${name}
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 9fa6ec968849..1dedd9da65e9 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
diff --git a/net-mgmt/net-snmp/files/patch-net-snmp-config.h.in b/net-mgmt/net-snmp/files/patch-net-snmp-config.h.in
new file mode 100644
index 000000000000..0069a7226a36
--- /dev/null
+++ b/net-mgmt/net-snmp/files/patch-net-snmp-config.h.in
@@ -0,0 +1,11 @@
+--- include/net-snmp/net-snmp-config.h.in.orig	Sun Mar 25 21:01:16 2007
++++ include/net-snmp/net-snmp-config.h.in	Sun Mar 25 21:01:33 2007
+@@ -1334,7 +1334,7 @@
+ 
+ #define EXCACHETIME 30
+ #define CACHEFILE ".snmp-exec-cache"
+-#define MAXCACHESIZE (200*80)   /* roughly 200 lines max */
++#define MAXCACHESIZE (1500*80)   /* roughly 1500 lines max */
+ 
+ /* misc defaults */
+ 
diff --git a/net-mgmt/net-snmp/files/snmpd.sh.in b/net-mgmt/net-snmp/files/snmpd.sh.in
index 5777d5074666..7452947d1375 100644
--- a/net-mgmt/net-snmp/files/snmpd.sh.in
+++ b/net-mgmt/net-snmp/files/snmpd.sh.in
@@ -32,7 +32,6 @@ rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/${name}
 pidfile=${snmpd_pidfile}
-sig_stop=KILL
 start_precmd=snmpd_precmd
 
 load_rc_config ${name}
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index 9fa6ec968849..1dedd9da65e9 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
diff --git a/net-mgmt/net-snmp53/files/patch-net-snmp-config.h.in b/net-mgmt/net-snmp53/files/patch-net-snmp-config.h.in
new file mode 100644
index 000000000000..0069a7226a36
--- /dev/null
+++ b/net-mgmt/net-snmp53/files/patch-net-snmp-config.h.in
@@ -0,0 +1,11 @@
+--- include/net-snmp/net-snmp-config.h.in.orig	Sun Mar 25 21:01:16 2007
++++ include/net-snmp/net-snmp-config.h.in	Sun Mar 25 21:01:33 2007
+@@ -1334,7 +1334,7 @@
+ 
+ #define EXCACHETIME 30
+ #define CACHEFILE ".snmp-exec-cache"
+-#define MAXCACHESIZE (200*80)   /* roughly 200 lines max */
++#define MAXCACHESIZE (1500*80)   /* roughly 1500 lines max */
+ 
+ /* misc defaults */
+ 
diff --git a/net-mgmt/net-snmp53/files/snmpd.sh.in b/net-mgmt/net-snmp53/files/snmpd.sh.in
index bd52e41eb8d9..08b42edbf3c7 100644
--- a/net-mgmt/net-snmp53/files/snmpd.sh.in
+++ b/net-mgmt/net-snmp53/files/snmpd.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp53/files/Attic/snmpd.sh.in,v 1.5 2007-02-28 01:17:16 kuriyama Exp $
+# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp53/files/Attic/snmpd.sh.in,v 1.6 2007-03-25 12:35:45 kuriyama Exp $
 #
 # PROVIDE: snmpd
 # REQUIRE: DAEMON
@@ -32,7 +32,6 @@ rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/${name}
 pidfile=${snmpd_pidfile}
-sig_stop=KILL
 start_precmd=snmpd_precmd
 
 load_rc_config ${name}