Subject: pkg/19939: net/net-snmp update to 5.0.7
To: None <gnats-bugs@gnats.netbsd.org>
From: Greg A. Woods <woods@weird.com>
List: netbsd-bugs
Date: 01/19/2003 18:59:08
>Number: 19939
>Category: pkg
>Synopsis: net/net-snmp update to 5.0.7
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sun Jan 19 16:00:01 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Greg A. Woods
>Release: pkgsrc-current 2003/01/18
>Organization:
Planix, Inc.; Toronto, Ontario; Canada
>Environment:
System: NetBSD 1.5W
Architecture: i386
Machine: i386
>Description:
net-snmp-5.0.7 is available and contains many bug fixes
The default log file should not be used. Although it's now
possible to disable the default log file on the snmpd command
line, it's also possible to set a log file too and the latter is
much more appropriate for a default than the former.
Also it's useful to enable the smux and host agent modules and
to avoid using SSL if it's not necessary and/or desirable.
new command line flags are needed to control the syslog facility
when starting the daemons
The rc.d scripts need a lot of work to provide full features on
non-NetBSD platforms, but that's better done by using a new
template I've got and not by individually futzing with each one.
>How-To-Repeat:
>Fix:
note this change removes patches/patch-aa
cvs diff: Diffing net/net-snmp
Index: net/net-snmp/Makefile
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/net/net-snmp/Makefile,v
retrieving revision 1.2
diff -c -r1.2 Makefile
*** net/net-snmp/Makefile 24 Oct 2002 09:34:07 -0000 1.2
--- net/net-snmp/Makefile 19 Jan 2003 23:44:51 -0000
***************
*** 1,6 ****
# $NetBSD: Makefile,v 1.2 2002/10/24 09:34:07 jlam Exp $
! DISTNAME= net-snmp-5.0.6
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} \
ftp://ftp.net-smnp.org/pub/sourceforge/net-snmp/
--- 1,6 ----
# $NetBSD: Makefile,v 1.2 2002/10/24 09:34:07 jlam Exp $
! DISTNAME= net-snmp-5.0.7
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} \
ftp://ftp.net-smnp.org/pub/sourceforge/net-snmp/
***************
*** 17,35 ****
NET_SNMP_SYS_CONTACT?= default_user@contact.domain
NET_SNMP_SYS_LOCATION?= defaultlocation
- NET_SNMP_LOGFILE?= /var/log/snmpd.log
NET_SNMP_PERSISTENTDIR?= /var/net-snmp
! NET_SNMP_MIBDIRS?= \$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs
USE_BUILDLINK2= # defined
USE_LIBTOOL= # defined
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
! .if (${OPSYS} == "NetBSD")
CFLAGS+= -Dnetbsd1
.endif
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --enable-shared
.if defined(USE_INET6) && (${USE_INET6} == "YES")
CONFIGURE_ARGS+= --enable-ipv6
--- 17,35 ----
NET_SNMP_SYS_CONTACT?= default_user@contact.domain
NET_SNMP_SYS_LOCATION?= defaultlocation
NET_SNMP_PERSISTENTDIR?= /var/net-snmp
! NET_SNMP_MIBDIRS?= \$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:/usr/local/share/snmp/mibs:/usr/local/lib/tnm3.0.0/mibs
USE_BUILDLINK2= # defined
USE_LIBTOOL= # defined
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
! .if (${OPSYS} == "NetBSD") && empty(CFLAGS:M*-Dnetbsd1*)
CFLAGS+= -Dnetbsd1
.endif
GNU_CONFIGURE= # defined
+
CONFIGURE_ARGS+= --enable-shared
.if defined(USE_INET6) && (${USE_INET6} == "YES")
CONFIGURE_ARGS+= --enable-ipv6
***************
*** 38,51 ****
.endif
CONFIGURE_ARGS+= --with-defaults
CONFIGURE_ARGS+= --with-libwrap
CONFIGURE_ARGS+= --with-openssl
CONFIGURE_ARGS+= --with-sys-contact="${NET_SNMP_SYS_CONTACT}"
CONFIGURE_ARGS+= --with-sys-location="${NET_SNMP_SYS_LOCATION}"
! CONFIGURE_ARGS+= --with-logfile="${NET_SNMP_LOGFILE}"
CONFIGURE_ARGS+= --with-persistent-directory="${NET_SNMP_PERSISTENTDIR}"
.if !empty(NET_SNMP_MIBDIRS)
CONFIGURE_ARGS+= --with-mibdirs="${NET_SNMP_MIBDIRS}"
.endif
#
# Using "dummy" values is technically not compliant with SNMP specs, but
# otherwise, some tools, e.g. net/tcl-scotty, net/tkined, may ignore results
--- 38,60 ----
.endif
CONFIGURE_ARGS+= --with-defaults
CONFIGURE_ARGS+= --with-libwrap
+ .if defined(NET_SNMP_USE_SSL) && ${NET_SNMP_USE_SSL} == "YES"
CONFIGURE_ARGS+= --with-openssl
+ .endif
CONFIGURE_ARGS+= --with-sys-contact="${NET_SNMP_SYS_CONTACT}"
CONFIGURE_ARGS+= --with-sys-location="${NET_SNMP_SYS_LOCATION}"
! #
! # NOTE: if you specify a logfile then this file will be written to by
! # default and although it can be disabled on the command line, the
! # daemon must be stopped to cycle it properly. Remember rc.d/snmpd
! # will use '-s' to enable standard syslog logging anyway.
! #
! CONFIGURE_ARGS+= --without-logfile
CONFIGURE_ARGS+= --with-persistent-directory="${NET_SNMP_PERSISTENTDIR}"
.if !empty(NET_SNMP_MIBDIRS)
CONFIGURE_ARGS+= --with-mibdirs="${NET_SNMP_MIBDIRS}"
.endif
+ CONFIGURE_ARGS+= --with-mib-modules="smux host"
#
# Using "dummy" values is technically not compliant with SNMP specs, but
# otherwise, some tools, e.g. net/tcl-scotty, net/tkined, may ignore results
***************
*** 58,64 ****
#
CONFIGURE_ARGS+= --enable-ucd-snmp-compatibility
! .if !exists(/usr/bin/lpstat)
CONFIGURE_ENV+= ac_cv_path_LPSTAT_PATH=no
.endif
CONFIGURE_ENV+= PERLPROG="${PERL5}"
--- 67,73 ----
#
CONFIGURE_ARGS+= --enable-ucd-snmp-compatibility
! .if (${OPSYS} == "NetBSD") || !exists(/usr/bin/lpstat)
CONFIGURE_ENV+= ac_cv_path_LPSTAT_PATH=no
.endif
CONFIGURE_ENV+= PERLPROG="${PERL5}"
***************
*** 92,98 ****
${PREFIX}/share/examples/net-snmp/EXAMPLE.conf
.include "../../lang/perl5/buildlink2.mk"
! .include "../../security/openssl/buildlink2.mk"
.include "../../security/tcp_wrappers/buildlink2.mk"
.include "../../mk/bsd.pkg.install.mk"
--- 101,109 ----
${PREFIX}/share/examples/net-snmp/EXAMPLE.conf
.include "../../lang/perl5/buildlink2.mk"
! .if defined(NET_SNMP_USE_SSL) && ${NET_SNMP_USE_SSL} == "YES"
! . include "../../security/openssl/buildlink2.mk"
! .endif
.include "../../security/tcp_wrappers/buildlink2.mk"
.include "../../mk/bsd.pkg.install.mk"
Index: net/net-snmp/PLIST
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/net/net-snmp/PLIST,v
retrieving revision 1.3
diff -c -r1.3 PLIST
*** net/net-snmp/PLIST 16 Dec 2002 00:27:48 -0000 1.3
--- net/net-snmp/PLIST 19 Jan 2003 22:14:40 -0000
***************
*** 192,220 ****
include/ucd-snmp/version.h
lib/libnetsnmp.a
lib/libnetsnmp.la
lib/libnetsnmp.so
lib/libnetsnmp.so.5
! lib/libnetsnmp.so.5.6
lib/libnetsnmpagent.a
lib/libnetsnmpagent.la
lib/libnetsnmpagent.so
lib/libnetsnmpagent.so.5
! lib/libnetsnmpagent.so.5.6
lib/libnetsnmphelpers.a
lib/libnetsnmphelpers.la
lib/libnetsnmphelpers.so
lib/libnetsnmphelpers.so.5
! lib/libnetsnmphelpers.so.5.6
lib/libnetsnmpmibs.a
lib/libnetsnmpmibs.la
lib/libnetsnmpmibs.so
lib/libnetsnmpmibs.so.5
! lib/libnetsnmpmibs.so.5.6
lib/libsnmp.a
lib/libsnmp.la
lib/libsnmp.so
lib/libsnmp.so.5
! lib/libsnmp.so.5.6
man/man1/mib2c.1
man/man1/snmpbulkget.1
man/man1/snmpbulkwalk.1
--- 192,220 ----
include/ucd-snmp/version.h
lib/libnetsnmp.a
lib/libnetsnmp.la
lib/libnetsnmp.so
lib/libnetsnmp.so.5
! lib/libnetsnmp.so.5.7
lib/libnetsnmpagent.a
lib/libnetsnmpagent.la
lib/libnetsnmpagent.so
lib/libnetsnmpagent.so.5
! lib/libnetsnmpagent.so.5.7
lib/libnetsnmphelpers.a
lib/libnetsnmphelpers.la
lib/libnetsnmphelpers.so
lib/libnetsnmphelpers.so.5
! lib/libnetsnmphelpers.so.5.7
lib/libnetsnmpmibs.a
lib/libnetsnmpmibs.la
lib/libnetsnmpmibs.so
lib/libnetsnmpmibs.so.5
! lib/libnetsnmpmibs.so.5.7
lib/libsnmp.a
lib/libsnmp.la
${SHARED_ONLY}lib/libsnmp.so
${SHARED_ONLY}lib/libsnmp.so.5
! ${SHARED_ONLY}lib/libsnmp.so.5.7
man/man1/mib2c.1
man/man1/snmpbulkget.1
man/man1/snmpbulkwalk.1
Index: net/net-snmp/distinfo
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/net/net-snmp/distinfo,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 distinfo
*** net/net-snmp/distinfo 24 Oct 2002 08:29:33 -0000 1.1.1.1
--- net/net-snmp/distinfo 19 Jan 2003 21:40:34 -0000
***************
*** 1,5 ****
$NetBSD: distinfo,v 1.1.1.1 2002/10/24 08:29:33 jlam Exp $
! SHA1 (net-snmp-5.0.6.tar.gz) = c4aa9e638161014a02bc670fc7d5c09a34024f8c
! Size (net-snmp-5.0.6.tar.gz) = 2209625 bytes
! SHA1 (patch-aa) = 186aeb6c637a3ebe2a0d65d819a4af2bfc4467e9
--- 1,4 ----
$NetBSD: distinfo,v 1.1.1.1 2002/10/24 08:29:33 jlam Exp $
! SHA1 (net-snmp-5.0.7.tar.gz) = 0bd9337a26ffc214d3306590d7142c60a5ac17fc
! Size (net-snmp-5.0.7.tar.gz) = 2253313 bytes
cvs diff: Diffing net/net-snmp/files
Index: net/net-snmp/files/snmpd.sh
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/net/net-snmp/files/snmpd.sh,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 snmpd.sh
*** net/net-snmp/files/snmpd.sh 24 Oct 2002 08:29:34 -0000 1.1.1.1
--- net/net-snmp/files/snmpd.sh 19 Jan 2003 22:16:22 -0000
***************
*** 13,19 ****
rcvar=$name
command="@PREFIX@/sbin/${name}"
pidfile="/var/run/${name}.pid"
! snmpd_flags="-s" # log using syslog
command_args="-P ${pidfile}"
if [ -f @PKG_SYSCONFDIR@/snmpd.conf ]; then
--- 13,19 ----
rcvar=$name
command="@PREFIX@/sbin/${name}"
pidfile="/var/run/${name}.pid"
! snmpd_flags="-s -S d" # log using syslog LOG_DAEMON
command_args="-P ${pidfile}"
if [ -f @PKG_SYSCONFDIR@/snmpd.conf ]; then
Index: net/net-snmp/files/snmptrapd.sh
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/net/net-snmp/files/snmptrapd.sh,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 snmptrapd.sh
*** net/net-snmp/files/snmptrapd.sh 24 Oct 2002 08:29:34 -0000 1.1.1.1
--- net/net-snmp/files/snmptrapd.sh 19 Jan 2003 22:16:42 -0000
***************
*** 13,19 ****
rcvar=$name
command="@PREFIX@/sbin/${name}"
pidfile="/var/run/${name}.pid"
! snmptrapd_flags="-s -l 1" # log using syslog w/ facility LOG_LOCAL1
command_args="-u ${pidfile}"
if [ -f @PKG_SYSCONFDIR@/snmptrapd.conf ]; then
--- 13,19 ----
rcvar=$name
command="@PREFIX@/sbin/${name}"
pidfile="/var/run/${name}.pid"
! snmptrapd_flags="-s -S 1" # log using syslog w/ facility LOG_LOCAL1
command_args="-u ${pidfile}"
if [ -f @PKG_SYSCONFDIR@/snmptrapd.conf ]; then
cvs diff: Diffing net/net-snmp/patches
Index: net/net-snmp/patches/patch-aa
===================================================================
RCS file: net/net-snmp/patches/patch-aa
diff -N net/net-snmp/patches/patch-aa
*** net/net-snmp/patches/patch-aa 24 Oct 2002 08:29:34 -0000 1.1.1.1
--- /dev/null 1 Jan 1970 00:00:00 -0000
***************
*** 1,15 ****
- $NetBSD: patch-aa,v 1.1.1.1 2002/10/24 08:29:34 jlam Exp $
-
- --- agent/snmp_agent.c.orig Sat Oct 5 16:41:58 2002
- +++ agent/snmp_agent.c
- @@ -69,6 +69,10 @@ SOFTWARE.
- #include <dmalloc.h>
- #endif
-
- +#if HAVE_SYSLOG_H
- +#include <syslog.h>
- +#endif
- +
- #ifdef USE_LIBWRAP
- #include <tcpd.h>
- int allow_severity = LOG_INFO;
--- 0 ----
>Release-Note:
>Audit-Trail:
>Unformatted: