here's an update to net/net-snmp. Changelog available here: http://net-snmp.sourceforge.net/about/ChangeLog.html
I have sent this diff to Tim Kornau (maintainer) but I still didn't get an answer. This diff also adds a patch (patch-agent_mibgroup_if-mib_data_access_interface_sysctl_c) from claudio@ to allow 64bit network counters. works for me on i386, amd64, macppc and sparc64. ok? cheers, rui Index: Makefile =================================================================== RCS file: /cvs/ports/net/net-snmp/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- Makefile 15 Sep 2007 22:36:56 -0000 1.23 +++ Makefile 24 Sep 2007 10:12:27 -0000 @@ -3,9 +3,9 @@ COMMENT-main= extendable SNMP implementation COMMENT-perl= SNMP modules for Perl -DISTNAME= net-snmp-5.4 -PKGNAME-main= ${DISTNAME}p1 -PKGNAME-perl= p5-SNMP-5.4 +DISTNAME= net-snmp-5.4.1 +PKGNAME-main= ${DISTNAME} +PKGNAME-perl= p5-SNMP-5.4.1 SHARED_LIBS= netsnmp 7.0 \ netsnmpagent 7.0 \ netsnmphelpers 7.0 \ @@ -23,12 +23,11 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c crypto kvm m perl util wrap +WANTLIB-main= c crypto kvm m perl util wrap MULTI_PACKAGES= -main -perl -LIB_DEPENDS-perl= netsnmpmibs,netsnmphelpers,netsnmpagent,netsnmp::net/net-snmp,-main -WANTLIB-main= ${WANTLIB} +LIB_DEPENDS-perl= netsnmptrapd,netsnmpmibs,netsnmphelpers,netsnmpagent,netsnmp::net/net-snmp,-main NET_SNMP_MIB_LIST= host disman/event-mib smux mibII/mta_sendmail Index: distinfo =================================================================== RCS file: /cvs/ports/net/net-snmp/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 19 May 2007 10:52:06 -0000 1.6 +++ distinfo 24 Sep 2007 10:12:27 -0000 @@ -1,5 +1,5 @@ -MD5 (net-snmp-5.4.tar.gz) = RtiTKBBW/0duWXZZy5FXTQ== -RMD160 (net-snmp-5.4.tar.gz) = itH5o974Ai7qSNm3SucdjvtZymE= -SHA1 (net-snmp-5.4.tar.gz) = jtsXUJ66n4yc+wFf41oQJASBKes= -SHA256 (net-snmp-5.4.tar.gz) = L0PNbzxAZvjBf9xHkxqWwfzoCMnR3XS8taednSnV+Uc= -SIZE (net-snmp-5.4.tar.gz) = 5031685 +MD5 (net-snmp-5.4.1.tar.gz) = bJdN96WlsVefchFeawRb2g== +RMD160 (net-snmp-5.4.1.tar.gz) = NyNIjauNFkcCp9VcnHLursB91Qw= +SHA1 (net-snmp-5.4.1.tar.gz) = rFugM8ENU9MFdBUSH4xJNsZDwgg= +SHA256 (net-snmp-5.4.1.tar.gz) = Dql2ciyZPIfe3o62NI5v6wWeOFG77y3oJL8YrJfNtWU= +SIZE (net-snmp-5.4.1.tar.gz) = 5122455 Index: patches/patch-Makefile_rules =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-Makefile_rules,v retrieving revision 1.2 diff -u -r1.2 patch-Makefile_rules --- patches/patch-Makefile_rules 19 May 2007 10:52:06 -0000 1.2 +++ patches/patch-Makefile_rules 24 Sep 2007 10:12:27 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_rules,v 1.2 2007/05/19 10:52:06 rui Exp $ ---- Makefile.rules.orig Sun May 6 20:59:42 2007 -+++ Makefile.rules Sun May 6 21:04:39 2007 -@@ -216,14 +216,20 @@ uninstalllibs: +$OpenBSD$ +--- Makefile.rules.orig Sat Jul 7 00:39:10 2007 ++++ Makefile.rules Sat Sep 15 23:12:28 2007 +@@ -228,14 +228,20 @@ uninstalllibs: installbin: installlocalbin installsubdirbin installlocalbin: $(INSTALLBINPROGS) @@ -26,7 +26,7 @@ installsubdirbin: @if test "$(SUBDIRS)" != ""; then \ -@@ -257,7 +263,7 @@ installlocalsbin: $(INSTALLSBINPROGS) +@@ -269,7 +275,7 @@ installlocalsbin: $(INSTALLSBINPROGS) @if test "$(INSTALLSBINPROGS)" != ""; then \ it="$(INSTALLSBINPROGS)" ; \ $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(sbindir) ; \ Index: patches/patch-Makefile_top =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-Makefile_top,v retrieving revision 1.4 diff -u -r1.4 patch-Makefile_top --- patches/patch-Makefile_top 19 May 2007 10:52:06 -0000 1.4 +++ patches/patch-Makefile_top 24 Sep 2007 10:12:27 -0000 @@ -1,10 +1,10 @@ -$OpenBSD: patch-Makefile_top,v 1.4 2007/05/19 10:52:06 rui Exp $ ---- Makefile.top.orig Sat May 5 19:20:47 2007 -+++ Makefile.top Sat May 5 19:27:00 2007 -@@ -34,7 +34,9 @@ INSTALL_PREFIX = $(DESTDIR) - # +$OpenBSD$ +--- Makefile.top.orig Sat Jul 7 00:39:10 2007 ++++ Makefile.top Sat Sep 15 23:12:28 2007 +@@ -35,7 +35,9 @@ INSTALL_PREFIX = $(DESTDIR) INSTALL = $(LIBTOOL) --mode=install @INSTALL@ UNINSTALL = $(LIBTOOL) --mode=uninstall rm -f + LIBTOOLCLEAN = $(LIBTOOL) --mode=clean rm -f -INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DATA = $(LIBTOOL) --mode=install @INSTALL_DATA@ +INSTALL_PROGRAM = $(LIBTOOL) --mode=install @INSTALL_PROGRAM@ @@ -12,17 +12,16 @@ SED = @SED@ LN_S = @LN_S@ AUTOCONF = @AUTOCONF@ -@@ -77,11 +79,10 @@ LINKCC = @LINKCC@ - LIBCURRENT = 15 - LIBAGE = 0 +@@ -80,10 +82,10 @@ LIBCURRENT = 16 + LIBAGE = 1 LIBREVISION = 0 -- + -LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o -+LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -o ++LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -o LIB_EXTENSION = la LIB_VERSION = -LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir) -+LIB_LDCONFIG_CMD = : ++LIB_LDCONFIG_CMD = : LINK = $(LIBTOOL) --mode=link $(LINKCC) # RANLIB = @RANLIB@ RANLIB = : Index: patches/patch-agent_Makefile_in =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-agent_Makefile_in,v retrieving revision 1.3 diff -u -r1.3 patch-agent_Makefile_in --- patches/patch-agent_Makefile_in 19 May 2007 10:52:06 -0000 1.3 +++ patches/patch-agent_Makefile_in 24 Sep 2007 10:12:27 -0000 @@ -1,38 +1,43 @@ -$OpenBSD: patch-agent_Makefile_in,v 1.3 2007/05/19 10:52:06 rui Exp $ ---- agent/Makefile.in.orig Sun May 6 20:22:22 2007 -+++ agent/Makefile.in Sun May 6 20:29:13 2007 -@@ -74,11 +74,11 @@ INSTALLUCDHEADERS= \ +$OpenBSD$ +--- agent/Makefile.in.orig Thu Jul 5 00:26:56 2007 ++++ agent/Makefile.in Sat Sep 15 23:12:28 2007 +@@ -18,8 +18,8 @@ top_builddir = .. + SUBDIRS=helpers mibgroup + + INSTALLSBINPROGS= @SNMPD@ +-INSTALLLIBS = libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) +-INSTALLPOSTLIBS = libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ++INSTALLLIBS = libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION) ++INSTALLPOSTLIBS = libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION) + + INCLUDESUBDIR=agent + INCLUDESUBDIRHEADERS=agent_read_config.h \ +@@ -74,10 +74,10 @@ INSTALLUCDHEADERS= \ # # how to build it info # -USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) -HELPERLIB = helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION) -+USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION) -+HELPERLIB = helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION) - LOCAL_LIBS = - PERLLDOPTS = @PERLLDOPTS@ --LIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) @AGENTLIBS@ $(PERLLDOPTS) -+LIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION) @AGENTLIBS@ $(PERLLDOPTS) - OUR_AGENT_LIBS = $(INSTALLLIBS) $(HELPERLIB) @WRAPLIBS@ $(LIBS) @DLLIBS@ - CPPFLAGS = $(TOP_INCLUDES) -I. $(AGENT_INCLUDES) $(MIBGROUP_INCLUDES) \ - $(SNMPLIB_INCLUDES) @CPPFLAGS@ -@@ -136,13 +136,13 @@ snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(HELPERLIB) +-AGENTLIB = libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) +-MIBLIB = libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ++USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION) ++HELPERLIB = helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION) ++AGENTLIB = libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION) ++MIBLIB = libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmib_VERSION) + + LOCAL_LIBS = -L../snmplib/.libs -L../snmplib -L./.libs -L./helpers/.libs -L./helpers + LAGENTLIBS = @LAGENTLIBS@ +@@ -142,11 +142,11 @@ snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $ $(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${OUR_AGENT_LIBS} --libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} -- $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS) -- $(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) -+libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION): ${LLIBAGENTOBJS} -+ $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS) -+ $(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION) - --libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} -- $(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS) @SENSORLIBS@ -- $(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) -+libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION): ${LMIBOBJS} -+ $(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS) @SENSORLIBS@ -+ $(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION) +-libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS) ++libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION): ${LLIBAGENTOBJS} $(USELIBS) + $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) + $(RANLIB) $(AGENTLIB) - agentlib: libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) +-libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) ++libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION): ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) + $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) ${LMIBLIBS} $(LDFLAGS) $(LIB_LD_LIBS) + $(RANLIB) $(MIBLIB) Index: patches/patch-agent_helpers_Makefile_in =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-agent_helpers_Makefile_in,v retrieving revision 1.3 diff -u -r1.3 patch-agent_helpers_Makefile_in --- patches/patch-agent_helpers_Makefile_in 14 Jun 2007 18:19:24 -0000 1.3 +++ patches/patch-agent_helpers_Makefile_in 24 Sep 2007 10:12:27 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-agent_helpers_Makefile_in,v 1.3 2007/06/14 18:19:24 ajacoutot Exp $ ---- agent/helpers/Makefile.in.orig Thu Sep 14 11:53:44 2006 -+++ agent/helpers/Makefile.in Thu Jun 14 18:53:36 2007 +$OpenBSD$ +--- agent/helpers/Makefile.in.orig Tue Jun 26 22:45:20 2007 ++++ agent/helpers/Makefile.in Sat Sep 15 23:12:28 2007 @@ -12,7 +12,7 @@ top_builddir=../.. # What to install # @@ -8,15 +8,28 @@ -INSTALLLIBS=libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION) +INSTALLLIBS=libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION) INCLUDESUBDIR=agent - INCLUDESUBDIRHEADERS=all_helpers.h \ + HEADERS=all_helpers.h \ baby_steps.h \ -@@ -131,6 +131,6 @@ LOBJS = all_helpers.lo \ +@@ -48,10 +48,10 @@ INCLUDESUBDIRHEADERS=$(HEADERS) $(HEADERSONLY) + # + # Build info + # +-NETSNMPLIB = ../../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) +-HELPERLIB = libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION) +-AGENTLIB = ../libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) +-MIBLIB = ../libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ++NETSNMPLIB = ../../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION) ++HELPERLIB = libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION) ++AGENTLIB = ../libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION) ++MIBLIB = ../libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION) + # -I. -I.. -I../.. + CPPFLAGS= $(TOP_INCLUDES) -I. $(AGENT_INCLUDES) $(MIBGROUP_INCLUDES) \ + $(SNMPLIB_INCLUDES) @CPPFLAGS@ +@@ -139,6 +139,6 @@ LOBJS = all_helpers.lo \ all: standardall --libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION): ${LOBJS} -- $(LIB_LD_CMD) libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION) ${LOBJS} $(LIB_LD_LIBS) -- $(RANLIB) libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION) -+libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION): ${LOBJS} -+ $(LIB_LD_CMD) libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION) ${LOBJS} $(LIB_LD_LIBS) -+ $(RANLIB) libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION) +-libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION): $(LOBJS) ++libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION): $(LOBJS) + $(LIB_LD_CMD) $@ $(LOBJS) $(AGENTLIB) $(NETSNMPLIB) $(LDFLAGS) $(LIB_LD_LIBS) + $(RANLIB) $@ Index: patches/patch-agent_mibgroup_host_hr_storage_c =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-agent_mibgroup_host_hr_storage_c,v retrieving revision 1.4 diff -u -r1.4 patch-agent_mibgroup_host_hr_storage_c --- patches/patch-agent_mibgroup_host_hr_storage_c 14 Jun 2007 18:19:24 -0000 1.4 +++ patches/patch-agent_mibgroup_host_hr_storage_c 24 Sep 2007 10:12:27 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-agent_mibgroup_host_hr_storage_c,v 1.4 2007/06/14 18:19:24 ajacoutot Exp $ ---- agent/mibgroup/host/hr_storage.c.orig Thu Oct 12 11:54:57 2006 -+++ agent/mibgroup/host/hr_storage.c Thu Jun 14 18:54:14 2007 +$OpenBSD$ +--- agent/mibgroup/host/hr_storage.c.orig Fri Jun 8 11:33:58 2007 ++++ agent/mibgroup/host/hr_storage.c Sat Sep 15 23:12:28 2007 @@ -175,6 +175,7 @@ #include <net-snmp/library/read_config.h> Index: patches/patch-agent_mibgroup_if-mib_data_access_interface_sysctl_c =================================================================== RCS file: patches/patch-agent_mibgroup_if-mib_data_access_interface_sysctl_c diff -N patches/patch-agent_mibgroup_if-mib_data_access_interface_sysctl_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-agent_mibgroup_if-mib_data_access_interface_sysctl_c 24 Sep 2007 10:12:27 -0000 @@ -0,0 +1,38 @@ +$OpenBSD$ +--- agent/mibgroup/if-mib/data_access/interface_sysctl.c.orig Wed Jun 20 22:34:24 2007 ++++ agent/mibgroup/if-mib/data_access/interface_sysctl.c Mon Sep 24 11:01:51 2007 +@@ -451,22 +451,22 @@ netsnmp_arch_interface_container_load(netsnmp_containe + NETSNMP_INTERFACE_FLAGS_HAS_V6_REASMMAX; + + /* get counters */ +- entry->stats.ibytes.low = ifp->ifm_data.ifi_ibytes; +- entry->stats.ibytes.high = 0; +- entry->stats.iucast.low = ifp->ifm_data.ifi_ipackets; +- entry->stats.iucast.high = 0; +- entry->stats.imcast.low = ifp->ifm_data.ifi_imcasts; +- entry->stats.imcast.high = 0; ++ entry->stats.ibytes.low = ifp->ifm_data.ifi_ibytes & 0xffffffff; ++ entry->stats.ibytes.high = ifp->ifm_data.ifi_ibytes >> 32; ++ entry->stats.iucast.low = ifp->ifm_data.ifi_ipackets & 0xffffffff; ++ entry->stats.iucast.high = ifp->ifm_data.ifi_ipackets >> 32; ++ entry->stats.imcast.low = ifp->ifm_data.ifi_imcasts & 0xffffffff; ++ entry->stats.imcast.high = ifp->ifm_data.ifi_imcasts >> 32; + entry->stats.ierrors = ifp->ifm_data.ifi_ierrors; + entry->stats.idiscards = ifp->ifm_data.ifi_iqdrops; + entry->stats.iunknown_protos = ifp->ifm_data.ifi_noproto; + +- entry->stats.obytes.low = ifp->ifm_data.ifi_obytes; +- entry->stats.obytes.high = 0; +- entry->stats.oucast.low = ifp->ifm_data.ifi_opackets; +- entry->stats.oucast.high = 0; +- entry->stats.omcast.low = ifp->ifm_data.ifi_omcasts; +- entry->stats.omcast.high = 0; ++ entry->stats.obytes.low = ifp->ifm_data.ifi_obytes & 0xffffffff; ++ entry->stats.obytes.high = ifp->ifm_data.ifi_obytes >> 32; ++ entry->stats.oucast.low = ifp->ifm_data.ifi_opackets & 0xffffffff; ++ entry->stats.oucast.high = ifp->ifm_data.ifi_opackets >> 32; ++ entry->stats.omcast.low = ifp->ifm_data.ifi_omcasts & 0xffffffff; ++ entry->stats.omcast.high = ifp->ifm_data.ifi_omcasts >> 32; + entry->stats.oerrors = ifp->ifm_data.ifi_oerrors; + entry->ns_flags |= NETSNMP_INTERFACE_FLAGS_HAS_BYTES | + NETSNMP_INTERFACE_FLAGS_HAS_DROPS | Index: patches/patch-agent_mibgroup_mibII_interfaces_c =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-agent_mibgroup_mibII_interfaces_c,v retrieving revision 1.3 diff -u -r1.3 patch-agent_mibgroup_mibII_interfaces_c --- patches/patch-agent_mibgroup_mibII_interfaces_c 14 Jun 2007 18:19:24 -0000 1.3 +++ patches/patch-agent_mibgroup_mibII_interfaces_c 24 Sep 2007 10:12:27 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-agent_mibgroup_mibII_interfaces_c,v 1.3 2007/06/14 18:19:24 ajacoutot Exp $ ---- agent/mibgroup/mibII/interfaces.c.orig Tue Nov 7 00:43:27 2006 -+++ agent/mibgroup/mibII/interfaces.c Thu Jun 14 18:53:37 2007 +$OpenBSD$ +--- agent/mibgroup/mibII/interfaces.c.orig Mon Nov 6 23:43:27 2006 ++++ agent/mibgroup/mibII/interfaces.c Sat Sep 15 23:12:28 2007 @@ -2097,11 +2097,10 @@ Interface_Scan_Get_Count(void) #else /* hpux11 */ Index: patches/patch-agent_mibgroup_mibII_mta_sendmail_c =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-agent_mibgroup_mibII_mta_sendmail_c,v retrieving revision 1.1 diff -u -r1.1 patch-agent_mibgroup_mibII_mta_sendmail_c --- patches/patch-agent_mibgroup_mibII_mta_sendmail_c 5 Nov 2005 19:09:38 -0000 1.1 +++ patches/patch-agent_mibgroup_mibII_mta_sendmail_c 24 Sep 2007 10:12:27 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-agent_mibgroup_mibII_mta_sendmail_c,v 1.1 2005/11/05 19:09:38 bernd Exp $ ---- agent/mibgroup/mibII/mta_sendmail.c.orig Fri Nov 4 00:56:43 2005 -+++ agent/mibgroup/mibII/mta_sendmail.c Fri Nov 4 00:57:02 2005 +$OpenBSD$ +--- agent/mibgroup/mibII/mta_sendmail.c.orig Fri Sep 15 01:48:50 2006 ++++ agent/mibgroup/mibII/mta_sendmail.c Sat Sep 15 23:12:28 2007 @@ -520,7 +520,7 @@ open_sendmailst(BOOL config) count_queuegroup(struct QGrp *qg) { Index: patches/patch-agent_mibgroup_mibII_route_write_c =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-agent_mibgroup_mibII_route_write_c,v retrieving revision 1.2 diff -u -r1.2 patch-agent_mibgroup_mibII_route_write_c --- patches/patch-agent_mibgroup_mibII_route_write_c 19 May 2007 10:52:06 -0000 1.2 +++ patches/patch-agent_mibgroup_mibII_route_write_c 24 Sep 2007 10:12:27 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-agent_mibgroup_mibII_route_write_c,v 1.2 2007/05/19 10:52:06 rui Exp $ ---- agent/mibgroup/mibII/route_write.c.orig Sat May 5 19:48:04 2007 -+++ agent/mibgroup/mibII/route_write.c Sat May 5 20:10:26 2007 +$OpenBSD$ +--- agent/mibgroup/mibII/route_write.c.orig Sun Mar 25 20:03:40 2007 ++++ agent/mibgroup/mibII/route_write.c Sat Sep 15 23:12:28 2007 @@ -97,7 +97,7 @@ int addRoute(u_long dstip, u_long gwip, u_long iff, u_short flags) Index: patches/patch-agent_mibgroup_mibII_tcpTable_c =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c,v retrieving revision 1.4 diff -u -r1.4 patch-agent_mibgroup_mibII_tcpTable_c --- patches/patch-agent_mibgroup_mibII_tcpTable_c 14 Jun 2007 18:19:24 -0000 1.4 +++ patches/patch-agent_mibgroup_mibII_tcpTable_c 24 Sep 2007 10:12:27 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-agent_mibgroup_mibII_tcpTable_c,v 1.4 2007/06/14 18:19:24 ajacoutot Exp $ ---- agent/mibgroup/mibII/tcpTable.c.orig Tue Nov 7 00:43:27 2006 -+++ agent/mibgroup/mibII/tcpTable.c Thu Jun 14 18:53:37 2007 +$OpenBSD$ +--- agent/mibgroup/mibII/tcpTable.c.orig Mon Nov 6 23:43:27 2006 ++++ agent/mibgroup/mibII/tcpTable.c Sat Sep 15 23:12:28 2007 @@ -450,7 +450,7 @@ tcpTable_next_entry( void **loop_context, * and update the loop context ready for the next one. */ Index: patches/patch-agent_mibgroup_mibII_var_route_c =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-agent_mibgroup_mibII_var_route_c,v retrieving revision 1.4 diff -u -r1.4 patch-agent_mibgroup_mibII_var_route_c --- patches/patch-agent_mibgroup_mibII_var_route_c 14 Jun 2007 18:19:24 -0000 1.4 +++ patches/patch-agent_mibgroup_mibII_var_route_c 24 Sep 2007 10:12:27 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-agent_mibgroup_mibII_var_route_c,v 1.4 2007/06/14 18:19:24 ajacoutot Exp $ ---- agent/mibgroup/mibII/var_route.c.orig Tue Nov 7 00:43:27 2006 -+++ agent/mibgroup/mibII/var_route.c Thu Jun 14 18:53:37 2007 +$OpenBSD$ +--- agent/mibgroup/mibII/var_route.c.orig Mon Nov 6 23:43:27 2006 ++++ agent/mibgroup/mibII/var_route.c Sat Sep 15 23:12:28 2007 @@ -1710,22 +1710,21 @@ TAILQ_HEAD(, snmprt) continue; switch (bit) { Index: patches/patch-agent_mibgroup_ucd-snmp_dlmod_c =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-agent_mibgroup_ucd-snmp_dlmod_c,v retrieving revision 1.2 diff -u -r1.2 patch-agent_mibgroup_ucd-snmp_dlmod_c --- patches/patch-agent_mibgroup_ucd-snmp_dlmod_c 5 Nov 2005 19:09:38 -0000 1.2 +++ patches/patch-agent_mibgroup_ucd-snmp_dlmod_c 24 Sep 2007 10:12:27 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-agent_mibgroup_ucd-snmp_dlmod_c,v 1.2 2005/11/05 19:09:38 bernd Exp $ ---- agent/mibgroup/ucd-snmp/dlmod.c.orig Fri May 20 23:34:43 2005 -+++ agent/mibgroup/ucd-snmp/dlmod.c Thu Nov 3 23:31:04 2005 +$OpenBSD$ +--- agent/mibgroup/ucd-snmp/dlmod.c.orig Thu Mar 9 16:19:40 2006 ++++ agent/mibgroup/ucd-snmp/dlmod.c Sat Sep 15 23:12:28 2007 @@ -180,7 +180,12 @@ dlmod_load_module(struct dlmod *dlm) if (dlm->status == DLMOD_ERROR) return; Index: patches/patch-agent_mibgroup_ucd-snmp_versioninfo_c =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-agent_mibgroup_ucd-snmp_versioninfo_c,v retrieving revision 1.2 diff -u -r1.2 patch-agent_mibgroup_ucd-snmp_versioninfo_c --- patches/patch-agent_mibgroup_ucd-snmp_versioninfo_c 19 May 2007 10:52:06 -0000 1.2 +++ patches/patch-agent_mibgroup_ucd-snmp_versioninfo_c 24 Sep 2007 10:12:27 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-agent_mibgroup_ucd-snmp_versioninfo_c,v 1.2 2007/05/19 10:52:06 rui Exp $ ---- agent/mibgroup/ucd-snmp/versioninfo.c.orig Sat May 5 20:13:44 2007 -+++ agent/mibgroup/ucd-snmp/versioninfo.c Sat May 5 20:16:29 2007 +$OpenBSD$ +--- agent/mibgroup/ucd-snmp/versioninfo.c.orig Fri Sep 15 01:48:50 2006 ++++ agent/mibgroup/ucd-snmp/versioninfo.c Sat Sep 15 23:12:28 2007 @@ -94,7 +94,13 @@ var_extensible_version(struct variable *vp, char *cptr; time_t curtime; Index: patches/patch-apps_Makefile_in =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-apps_Makefile_in,v retrieving revision 1.3 diff -u -r1.3 patch-apps_Makefile_in --- patches/patch-apps_Makefile_in 14 Jun 2007 18:19:24 -0000 1.3 +++ patches/patch-apps_Makefile_in 24 Sep 2007 10:12:27 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-apps_Makefile_in,v 1.3 2007/06/14 18:19:24 ajacoutot Exp $ ---- apps/Makefile.in.orig Fri Oct 21 07:38:20 2005 -+++ apps/Makefile.in Thu Jun 14 18:53:38 2007 +$OpenBSD$ +--- apps/Makefile.in.orig Thu Jul 5 00:26:56 2007 ++++ apps/Makefile.in Sat Sep 15 23:12:28 2007 @@ -36,7 +36,7 @@ INSTALLBINPROGS = snmpget$(EXEEXT) \ INSTALLSBINPROGS = snmptrapd$(EXEEXT) @@ -10,27 +10,27 @@ SUBDIRS = snmpnetstat -@@ -45,8 +45,8 @@ SUBDIRS = snmpnetstat +@@ -45,10 +45,10 @@ SUBDIRS = snmpnetstat # # USELIBS/USEAGENTLIBS are for dependencies -USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) --USEAGENTLIBS = ../agent/libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ../agent/libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ../agent/helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION) $(USELIBS) +-HELPERLIB = ../agent/helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION) +-AGENTLIB = ../agent/libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) +-MIBLIB = ../agent/libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) +USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION) -+USEAGENTLIBS = ../agent/libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsmmpagent_VERSION) ../agent/libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION) ../agent/helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION) $(USELIBS) ++HELPERLIB = ../agent/helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION) ++AGENTLIB = ../agent/libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION) ++MIBLIB = ../agent/libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION) + USEAGENTLIBS = $(MIBLIB) $(AGENTLIB) $(HELPERLIB) $(USELIBS) # - # link path in src dir -@@ -138,9 +138,9 @@ encode_keychange$(EXEEXT): encode_keychange.$(OSUFF +@@ -142,7 +142,7 @@ encode_keychange$(EXEEXT): encode_keychange.$(OSUFF snmpdf$(EXEEXT): snmpdf.$(OSUFFIX) $(USELIBS) - $(LINK) -o $@ snmpdf.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} + $(LINK) ${CFLAGS} -o $@ snmpdf.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} -libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION): $(LLIBTRAPD_OBJS) -- $(LIB_LD_CMD) libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBTRAPD_OBJS} $(LIB_LD_LIBS) -- $(RANLIB) libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION) +libnetsnmptrapd.$(LIB_EXTENSION)$(LIBnetsnmptrapd_VERSION): $(LLIBTRAPD_OBJS) -+ $(LIB_LD_CMD) libnetsnmptrapd.$(LIB_EXTENSION)$(LIBnetsnmptrapd_VERSION) ${LLIBTRAPD_OBJS} $(LIB_LD_LIBS) -+ $(RANLIB) libnetsnmptrapd.$(LIB_EXTENSION)$(LIBnetsnmptrapd_VERSION) + $(LIB_LD_CMD) $@ ${LLIBTRAPD_OBJS} $(MIBLIB) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) + $(RANLIB) $@ - snmpinforminstall: - rm -f $(INSTALL_PREFIX)$(bindir)/snmpinform$(EXEEXT) Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-configure,v retrieving revision 1.7 diff -u -r1.7 patch-configure --- patches/patch-configure 14 Jun 2007 18:19:24 -0000 1.7 +++ patches/patch-configure 24 Sep 2007 10:12:27 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.7 2007/06/14 18:19:24 ajacoutot Exp $ ---- configure.orig Sat May 5 20:26:01 2007 -+++ configure Sat May 5 20:38:25 2007 -@@ -21042,34 +21042,6 @@ fi +$OpenBSD$ +--- configure.orig Fri Jul 27 18:04:19 2007 ++++ configure Sat Sep 15 23:12:29 2007 +@@ -21267,34 +21267,6 @@ fi echo "$as_me:$LINENO: result: $EXTRACPPFLAGS" >&5 echo "${ECHO_T}$EXTRACPPFLAGS" >&6 @@ -36,7 +36,7 @@ # Set SNMPLIBPATH & SNMPSHAREPATH SNMPLIBPATH="" -@@ -27070,6 +27042,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -27953,6 +27925,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -44,7 +44,7 @@ #include <tcpd.h> _ACEOF rm -f conftest.$ac_objext -@@ -27114,6 +27087,7 @@ _ACEOF +@@ -27997,6 +27970,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -52,16 +52,16 @@ #include <tcpd.h> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -@@ -32130,7 +32104,7 @@ done +@@ -33548,7 +33522,7 @@ done --for ac_header in malloc.h net/if_dl.h sys/sysctl.h stdlib.h net/if_types.h sys/queue.h osreldate.h machine/types.h sys/user.h sys/proc.h sys/mbuf.h sys/mount.h -+for ac_header in sys/param.h net/if_dl.h sys/sysctl.h stdlib.h net/if_types.h sys/queue.h osreldate.h machine/types.h sys/socketvar.h sys/user.h sys/proc.h sys/mbuf.h sys/mount.h +-for ac_header in malloc.h net/if_dl.h sys/sysctl.h stdlib.h net/if_types.h sys/queue.h osreldate.h machine/types.h sys/user.h sys/proc.h sys/mbuf.h sys/mount.h sys/dkstat.h sys/conf.h ++for ac_header in sys/param.h net/if_dl.h sys/sysctl.h stdlib.h net/if_types.h sys/queue.h osreldate.h machine/types.h sys/socketvar.h sys/user.h sys/proc.h sys/mbuf.h sys/mount.h sys/dkstat.h sys/conf.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_header" >&5 -@@ -35608,7 +35582,6 @@ cat confdefs.h >>conftest.$ac_ext +@@ -37024,7 +36998,6 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ Index: patches/patch-include_net-snmp_system_openbsd_h =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-include_net-snmp_system_openbsd_h,v retrieving revision 1.2 diff -u -r1.2 patch-include_net-snmp_system_openbsd_h --- patches/patch-include_net-snmp_system_openbsd_h 14 Jun 2007 18:19:24 -0000 1.2 +++ patches/patch-include_net-snmp_system_openbsd_h 24 Sep 2007 10:12:27 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-include_net-snmp_system_openbsd_h,v 1.2 2007/06/14 18:19:24 ajacoutot Exp $ ---- include/net-snmp/system/openbsd.h.orig Wed Oct 11 18:15:00 2006 -+++ include/net-snmp/system/openbsd.h Thu Jun 14 18:53:38 2007 +$OpenBSD$ +--- include/net-snmp/system/openbsd.h.orig Thu Mar 8 15:52:34 2007 ++++ include/net-snmp/system/openbsd.h Sat Sep 15 23:12:29 2007 @@ -3,8 +3,6 @@ #define netbsd1 netbsd1 /* we're really close to this */ #define UVM Index: patches/patch-net-snmp-config_in =================================================================== RCS file: patches/patch-net-snmp-config_in diff -N patches/patch-net-snmp-config_in --- patches/patch-net-snmp-config_in 19 May 2007 10:52:06 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-net-snmp-config_in,v 1.2 2007/05/19 10:52:06 rui Exp $ ---- net-snmp-config.in.orig Sat May 5 20:40:08 2007 -+++ net-snmp-config.in Sat May 5 20:40:27 2007 -@@ -34,7 +34,7 @@ [EMAIL PROTECTED]@ - NSC_LDFLAGS="@LDFLAGS@" - NSC_INCLUDEDIR=${includedir} - NSC_LIBDIR=-L${libdir} --NSC_LIBS="@LIBS@ @WRAPLIBS@" -+NSC_LIBS="@LIBS@" - NSC_AGENTLIBS="@AGENTLIBS@ @WRAPLIBS@ @PERLLDOPTS@" - NSC_PREFIX=$prefix - NSC_EXEC_PREFIX=$exec_prefix Index: patches/patch-perl_SNMP_Makefile_PL =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-perl_SNMP_Makefile_PL,v retrieving revision 1.2 diff -u -r1.2 patch-perl_SNMP_Makefile_PL --- patches/patch-perl_SNMP_Makefile_PL 14 Jun 2007 18:19:24 -0000 1.2 +++ patches/patch-perl_SNMP_Makefile_PL 24 Sep 2007 10:12:27 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-perl_SNMP_Makefile_PL,v 1.2 2007/06/14 18:19:24 ajacoutot Exp $ ---- perl/SNMP/Makefile.PL.orig Fri Sep 15 14:47:00 2006 -+++ perl/SNMP/Makefile.PL Thu Jun 14 18:53:38 2007 +$OpenBSD$ +--- perl/SNMP/Makefile.PL.orig Wed May 30 23:53:09 2007 ++++ perl/SNMP/Makefile.PL Sat Sep 15 23:12:29 2007 @@ -21,7 +21,7 @@ sub InitMakeParams { my %Params = ( NAME => 'SNMP', Index: patches/patch-snmplib_Makefile_in =================================================================== RCS file: /cvs/ports/net/net-snmp/patches/patch-snmplib_Makefile_in,v retrieving revision 1.3 diff -u -r1.3 patch-snmplib_Makefile_in --- patches/patch-snmplib_Makefile_in 19 May 2007 10:52:07 -0000 1.3 +++ patches/patch-snmplib_Makefile_in 24 Sep 2007 10:12:27 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-snmplib_Makefile_in,v 1.3 2007/05/19 10:52:07 rui Exp $ ---- snmplib/Makefile.in.orig Sun May 6 03:04:30 2007 -+++ snmplib/Makefile.in Sun May 6 03:06:04 2007 +$OpenBSD$ +--- snmplib/Makefile.in.orig Mon Jun 18 22:34:43 2007 ++++ snmplib/Makefile.in Sat Sep 15 23:12:29 2007 @@ -127,7 +127,7 @@ INSTALLUCDHEADERS= asn1.h \ transform_oids.h @@ -10,16 +10,12 @@ INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) # -@@ -187,9 +187,9 @@ CPPFLAGS = $(TOP_INCLUDES) -I. $(SNMPLIB_INCLUDES) @C +@@ -187,7 +187,7 @@ CPPFLAGS = $(TOP_INCLUDES) -I. $(SNMPLIB_INCLUDES) @C all: standardall # how to build the libraries. --libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} -- $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@ -- $(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) -+libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION): ${TOBJS} -+ $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION) ${TOBJS} -+ $(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION) +-libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS) ++libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION): $(TOBJS) + $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ + $(RANLIB) $@ - libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} - $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@