diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index a87b71279d8..4d4e3ed8608 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -1,17 +1,17 @@ -# $OpenBSD: Makefile,v 1.30 2008/07/03 08:07:56 sthen Exp $ +# $OpenBSD: Makefile,v 1.31 2008/09/20 22:15:51 rui Exp $ COMMENT-main= extendable SNMP implementation COMMENT-perl= SNMP modules for Perl -V= 5.4.1.1 +V= 5.4.2 DISTNAME= net-snmp-${V} -PKGNAME-main= ${DISTNAME}p1 -PKGNAME-perl= p5-SNMP-${V}p0 -SHARED_LIBS= netsnmp 7.0 \ - netsnmpagent 7.0 \ - netsnmphelpers 7.0 \ - netsnmpmibs 7.0 \ - netsnmptrapd 7.0 +PKGNAME-main= ${DISTNAME} +PKGNAME-perl= p5-SNMP-${V} +SHARED_LIBS= netsnmp 8.0 \ + netsnmpagent 8.0 \ + netsnmphelpers 8.0 \ + netsnmpmibs 8.0 \ + netsnmptrapd 8.0 CATEGORIES= net perl5 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo index f22772d95e1..457d785291e 100644 --- a/net/net-snmp/distinfo +++ b/net/net-snmp/distinfo @@ -1,5 +1,5 @@ -MD5 (net-snmp-5.4.1.1.tar.gz) = AKze8kv96U7FopEjPiYRtg== -RMD160 (net-snmp-5.4.1.1.tar.gz) = hwtqPk6yjfPL3w3zTSP0a9feiWE= -SHA1 (net-snmp-5.4.1.1.tar.gz) = z+73SPJCp7Ja2O6pWXf/J3mE42g= -SHA256 (net-snmp-5.4.1.1.tar.gz) = si7LXn8JB8IMx/yfHh8xsbSy3YGr3D4uC/3fjQYACKI= -SIZE (net-snmp-5.4.1.1.tar.gz) = 5123861 +MD5 (net-snmp-5.4.2.tar.gz) = LJfQ2Z4eyJ1k9nE8BpB5rQ== +RMD160 (net-snmp-5.4.2.tar.gz) = jAz9JZiTAjwsmPpodGrbSFVdd4g= +SHA1 (net-snmp-5.4.2.tar.gz) = W2nafWC7wQkrYZkvLZzLEFE3fsY= +SHA256 (net-snmp-5.4.2.tar.gz) = n7DWhoQEtJRXjA29lFALOpsChjQiUstrpBrmRDh2eTc= +SIZE (net-snmp-5.4.2.tar.gz) = 5168274 diff --git a/net/net-snmp/patches/patch-Makefile_top b/net/net-snmp/patches/patch-Makefile_top index a5198e5f3ad..354dfb0f5df 100644 --- a/net/net-snmp/patches/patch-Makefile_top +++ b/net/net-snmp/patches/patch-Makefile_top @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile_top,v 1.5 2007/09/26 20:03:42 rui Exp $ ---- Makefile.top.orig Sat Jul 7 00:39:10 2007 -+++ Makefile.top Sat Sep 15 23:12:28 2007 +$OpenBSD: patch-Makefile_top,v 1.6 2008/09/20 22:15:51 rui Exp $ +--- Makefile.top.orig Fri May 9 15:23:07 2008 ++++ Makefile.top Fri Sep 19 18:04:37 2008 @@ -35,7 +35,9 @@ INSTALL_PREFIX = $(DESTDIR) INSTALL = $(LIBTOOL) --mode=install @INSTALL@ UNINSTALL = $(LIBTOOL) --mode=uninstall rm -f @@ -14,7 +14,7 @@ $OpenBSD: patch-Makefile_top,v 1.5 2007/09/26 20:03:42 rui Exp $ AUTOCONF = @AUTOCONF@ @@ -80,10 +82,10 @@ LIBCURRENT = 16 LIBAGE = 1 - LIBREVISION = 0 + LIBREVISION = 1 -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 diff --git a/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c b/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c index 0296d98ada6..85fc316e112 100644 --- a/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c +++ b/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-agent_mibgroup_mibII_tcpTable_c,v 1.5 2007/09/26 20:03:42 rui Exp $ ---- 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, +$OpenBSD: patch-agent_mibgroup_mibII_tcpTable_c,v 1.6 2008/09/20 22:15:51 rui Exp $ +--- agent/mibgroup/mibII/tcpTable.c.orig Sun Oct 14 13:12:58 2007 ++++ agent/mibgroup/mibII/tcpTable.c Fri Sep 19 18:04:38 2008 +@@ -456,7 +456,7 @@ tcpTable_next_entry( void **loop_context, * and update the loop context ready for the next one. */ *data_context = (void*)entry; @@ -10,7 +10,7 @@ $OpenBSD: patch-agent_mibgroup_mibII_tcpTable_c,v 1.5 2007/09/26 20:03:42 rui Ex return index; } -@@ -460,7 +460,7 @@ tcpTable_free(netsnmp_cache *cache, void *magic) +@@ -466,7 +466,7 @@ tcpTable_free(netsnmp_cache *cache, void *magic) TCPTABLE_ENTRY_TYPE *p; while (tcp_head) { p = tcp_head; @@ -19,7 +19,7 @@ $OpenBSD: patch-agent_mibgroup_mibII_tcpTable_c,v 1.5 2007/09/26 20:03:42 rui Ex free(p); } -@@ -803,7 +803,7 @@ tcpTable_load(netsnmp_cache *cache, void *vmagic) +@@ -811,7 +811,7 @@ tcpTable_load(netsnmp_cache *cache, void *vmagic) nnew->state == 8 /* closeWait */ ) tcp_estab++; diff --git a/net/net-snmp/patches/patch-agent_mibgroup_mibII_var_route_c b/net/net-snmp/patches/patch-agent_mibgroup_mibII_var_route_c index ce8d99ef88c..ed31d9550a6 100644 --- a/net/net-snmp/patches/patch-agent_mibgroup_mibII_var_route_c +++ b/net/net-snmp/patches/patch-agent_mibgroup_mibII_var_route_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-agent_mibgroup_mibII_var_route_c,v 1.5 2007/09/26 20:03:42 rui Exp $ ---- 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) +$OpenBSD: patch-agent_mibgroup_mibII_var_route_c,v 1.6 2008/09/20 22:15:52 rui Exp $ +--- agent/mibgroup/mibII/var_route.c.orig Mon Jul 28 15:39:55 2008 ++++ agent/mibgroup/mibII/var_route.c Fri Sep 19 18:04:38 2008 +@@ -1715,22 +1715,21 @@ TAILQ_HEAD(, snmprt) continue; switch (bit) { case RTA_DST: diff --git a/net/net-snmp/patches/patch-configure b/net/net-snmp/patches/patch-configure index 0d5216b9e3e..a9e06a1f590 100644 --- a/net/net-snmp/patches/patch-configure +++ b/net/net-snmp/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.8 2007/09/26 20:03:42 rui Exp $ ---- configure.orig Fri Jul 27 18:04:19 2007 -+++ configure Sat Sep 15 23:12:29 2007 -@@ -21267,34 +21267,6 @@ fi +$OpenBSD: patch-configure,v 1.9 2008/09/20 22:15:52 rui Exp $ +--- configure.orig Fri Sep 5 10:29:01 2008 ++++ configure Fri Sep 19 18:04:38 2008 +@@ -21655,34 +21655,6 @@ fi echo "$as_me:$LINENO: result: $EXTRACPPFLAGS" >&5 echo "${ECHO_T}$EXTRACPPFLAGS" >&6 @@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.8 2007/09/26 20:03:42 rui Exp $ # Set SNMPLIBPATH & SNMPSHAREPATH SNMPLIBPATH="" -@@ -27953,6 +27925,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -28344,6 +28316,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -44,7 +44,7 @@ $OpenBSD: patch-configure,v 1.8 2007/09/26 20:03:42 rui Exp $ #include _ACEOF rm -f conftest.$ac_objext -@@ -27997,6 +27970,7 @@ _ACEOF +@@ -28388,6 +28361,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -52,7 +52,7 @@ $OpenBSD: patch-configure,v 1.8 2007/09/26 20:03:42 rui Exp $ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -@@ -33548,7 +33522,7 @@ done +@@ -33939,7 +33913,7 @@ done @@ -61,7 +61,7 @@ $OpenBSD: patch-configure,v 1.8 2007/09/26 20:03:42 rui Exp $ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_header" >&5 -@@ -37024,7 +36998,6 @@ cat confdefs.h >>conftest.$ac_ext +@@ -37415,7 +37389,6 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ diff --git a/net/net-snmp/patches/patch-snmplib_snmp_version_c b/net/net-snmp/patches/patch-snmplib_snmp_version_c deleted file mode 100644 index 546d402ae6f..00000000000 --- a/net/net-snmp/patches/patch-snmplib_snmp_version_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-snmplib_snmp_version_c,v 1.1 2008/06/10 18:00:35 sthen Exp $ ---- snmplib/snmp_version.c.orig Tue Jun 10 10:16:25 2008 -+++ snmplib/snmp_version.c Tue Jun 10 10:16:33 2008 -@@ -5,7 +5,7 @@ - #ifndef UCD_COMPATIBLE - static - #endif --const char *NetSnmpVersionInfo = "5.4.1"; -+const char *NetSnmpVersionInfo = "5.4.1.1"; - - const char * - netsnmp_get_version() diff --git a/net/net-snmp/pkg/PLIST-main b/net/net-snmp/pkg/PLIST-main index 13e9a6fa8a3..c59d3f7d27e 100644 --- a/net/net-snmp/pkg/PLIST-main +++ b/net/net-snmp/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.4 2008/06/10 18:00:35 sthen Exp $ +@comment $OpenBSD: PLIST-main,v 1.5 2008/09/20 22:15:52 rui Exp $ @pkgpath net/net-snmp %%SHARED%% @bin bin/encode_keychange @@ -15,7 +15,7 @@ bin/snmpconf @bin bin/snmpdf @bin bin/snmpget @bin bin/snmpgetnext -@bin bin/snmpinform +bin/snmpinform @bin bin/snmpnetstat @bin bin/snmpset @bin bin/snmpstatus @@ -440,6 +440,7 @@ share/snmp/mib2c.iterate_access.conf share/snmp/mib2c.mfd.conf share/snmp/mib2c.notify.conf share/snmp/mib2c.old-api.conf +share/snmp/mib2c.perl.conf share/snmp/mib2c.scalar.conf share/snmp/mib2c.table_data.conf share/snmp/mibs/ @@ -480,6 +481,7 @@ share/snmp/mibs/RFC-1215.txt share/snmp/mibs/RFC1155-SMI.txt share/snmp/mibs/RFC1213-MIB.txt share/snmp/mibs/RMON-MIB.txt +share/snmp/mibs/SCTP-MIB.txt share/snmp/mibs/SMUX-MIB.txt share/snmp/mibs/SNMP-COMMUNITY-MIB.txt share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt