[Midnightbsd-cvs] mports: net-mgmt/net-snmp: Update to 5.3.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Mar 24 17:20:51 EDT 2008
Log Message:
-----------
Update to 5.3.2
Modified Files:
--------------
mports/net-mgmt/net-snmp:
Makefile (r1.5 -> r1.6)
distinfo (r1.2 -> r1.3)
pkg-plist (r1.4 -> r1.5)
mports/net-mgmt/net-snmp/files:
patch-hr_storage.c (r1.1 -> r1.2)
patch-snmpTCPIPv6Domain.c (r1.1 -> r1.2)
patch-snmpUCDIPv6Domain.c (r1.1 -> r1.2)
patch-snmp_agent.c (r1.1 -> r1.2)
snmpd.sh.in (r1.3 -> r1.4)
Added Files:
-----------
mports/net-mgmt/net-snmp/files:
patch-Makefile.in (r1.3)
patch-freebsd7.h (r1.3)
patch-freebsd8.h (r1.1)
patch-snmpUDPDomain.c (r1.3)
patch-ucd_snmp.h (r1.4)
Removed Files:
-------------
mports/net-mgmt/net-snmp/files:
patch-memory_freebsd2.c
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/net-mgmt/net-snmp/pkg-plist,v
retrieving revision 1.4
retrieving revision 1.5
diff -L net-mgmt/net-snmp/pkg-plist -L net-mgmt/net-snmp/pkg-plist -u -r1.4 -r1.5
--- net-mgmt/net-snmp/pkg-plist
+++ net-mgmt/net-snmp/pkg-plist
@@ -1,4 +1,3 @@
- at comment $MidnightBSD$
bin/encode_keychange
bin/fixproc
bin/ipf-mod.pl
@@ -59,6 +58,8 @@
include/net-snmp/agent/set_helper.h
include/net-snmp/agent/snmp_agent.h
include/net-snmp/agent/snmp_vars.h
+include/net-snmp/agent/stash_cache.h
+include/net-snmp/agent/stash_to_next.h
include/net-snmp/agent/table.h
include/net-snmp/agent/table_array.h
include/net-snmp/agent/table_container.h
@@ -151,6 +152,8 @@
include/net-snmp/system/freebsd4.h
include/net-snmp/system/freebsd5.h
include/net-snmp/system/freebsd6.h
+include/net-snmp/system/freebsd7.h
+include/net-snmp/system/freebsd8.h
include/net-snmp/system/generic.h
include/net-snmp/system/hpux.h
include/net-snmp/system/irix.h
@@ -208,6 +211,7 @@
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/netsnmp_request_infoPtr.pm
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/default_store.pm
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SNMP.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP/.packlist
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.bs
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/ASN.so
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN/autosplit.ix
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net-mgmt/net-snmp/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L net-mgmt/net-snmp/Makefile -L net-mgmt/net-snmp/Makefile -u -r1.5 -r1.6
--- net-mgmt/net-snmp/Makefile
+++ net-mgmt/net-snmp/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= snmp
-PORTVERSION= 5.3.1
-PORTREVISION= 1
+PORTVERSION= 5.3.2
CATEGORIES= net-mgmt ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= net-snmp
@@ -120,11 +119,13 @@
. endif
.endfor
-MAN1= mib2c.1 \
+MAN1= encode_keychange.1 fixproc.1 mib2c.1 mib2c-update.1 \
+ net-snmp-config.1 \
snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 \
snmpdelta.1 snmpdf.1 snmpget.1 snmpgetnext.1 snmpinform.1 \
snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
- snmptranslate.1 snmptrap.1 snmpusm.1 snmpvacm.1 snmpwalk.1
+ snmptranslate.1 snmptrap.1 snmpusm.1 snmpvacm.1 snmpwalk.1 \
+ tkmib.1 traptoemail.1
MAN3= add_mibdir.3 add_module_replacement.3 default_store.3 \
get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \
netsnmp_agent.3 netsnmp_bulk_to_next.3 netsnmp_debug.3 \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/net-mgmt/net-snmp/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L net-mgmt/net-snmp/distinfo -L net-mgmt/net-snmp/distinfo -u -r1.2 -r1.3
--- net-mgmt/net-snmp/distinfo
+++ net-mgmt/net-snmp/distinfo
@@ -1,3 +1,3 @@
-MD5 (net-snmp-5.3.1.tar.gz) = 360a9783dbc853bab6bda90d961daee5
-SHA256 (net-snmp-5.3.1.tar.gz) = fb6d5113ccdd8c4661fe5d825160e45a7c5035b145e24ec18f71a509ecb0fe43
-SIZE (net-snmp-5.3.1.tar.gz) = 4210843
+MD5 (net-snmp-5.3.2.tar.gz) = 978b9c5e26a36806945761b8ad0a0ecb
+SHA256 (net-snmp-5.3.2.tar.gz) = 8171e0592b8c7e5dbb4009a44843c9b7f3b089f4685555578a0f3eeb849d49e7
+SIZE (net-snmp-5.3.2.tar.gz) = 4320436
Index: snmpd.sh.in
===================================================================
RCS file: /home/cvs/mports/net-mgmt/net-snmp/files/snmpd.sh.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -L net-mgmt/net-snmp/files/snmpd.sh.in -L net-mgmt/net-snmp/files/snmpd.sh.in -u -r1.3 -r1.4
--- net-mgmt/net-snmp/files/snmpd.sh.in
+++ net-mgmt/net-snmp/files/snmpd.sh.in
@@ -1,7 +1,6 @@
#!/bin/sh
#
-# $MidnightBSD$
-# $FreeBSD: ports/net-mgmt/net-snmp/files/snmpd.sh.in,v 1.6 2007/03/25 12:35:45 kuriyama Exp $
+# $FreeBSD: ports/net-mgmt/net-snmp/files/snmpd.sh.in,v 1.7 2007/10/27 07:20:34 kuriyama Exp $
#
# PROVIDE: snmpd
# REQUIRE: DAEMON
@@ -53,14 +52,27 @@
;;
esac
+for conffile in ${snmpd_conffile}; do
+ if [ ! -z ${conffile} -a -f ${conffile} ]; then
+ if [ -z ${snmpd_conffile_set} ]; then
+ snmpd_conffile_set="${conffile}"
+ else
+ snmpd_conffile_set="${snmpd_conffile_set},${conffile}"
+ fi
+ else
+ echo "snmpd configuration file $conffile not set or not found."
+ exit 1
+ fi
+done
+
case "${snmpd_flags}" in
*-c\ *)
echo "Warning: \$snmpd_flags includes -c option." \
"Please use \$snmpd_conffile instead."
;;
*)
- if [ ! -z "${snmpd_conffile}" -a -f ${snmpd_conffile} ]; then
- snmpd_flags="-c ${snmpd_conffile} ${snmpd_flags}"
+ if [ ! -z "${snmpd_conffile_set}" ]; then
+ snmpd_flags="-c ${snmpd_conffile_set} ${snmpd_flags}"
fi
;;
esac
Index: patch-snmpUCDIPv6Domain.c
===================================================================
RCS file: /home/cvs/mports/net-mgmt/net-snmp/files/patch-snmpUCDIPv6Domain.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net-mgmt/net-snmp/files/patch-snmpUCDIPv6Domain.c -L net-mgmt/net-snmp/files/patch-snmpUCDIPv6Domain.c -u -r1.1 -r1.2
--- net-mgmt/net-snmp/files/patch-snmpUCDIPv6Domain.c
+++ net-mgmt/net-snmp/files/patch-snmpUCDIPv6Domain.c
@@ -1,14 +1,16 @@
---- snmplib/snmpUDPIPv6Domain.c.orig Sat Oct 16 03:52:29 2004
-+++ snmplib/snmpUDPIPv6Domain.c Mon Oct 25 09:28:10 2004
-@@ -104,13 +104,21 @@
+Index: snmplib/snmpUDPIPv6Domain.c
+diff -u -p snmplib/snmpUDPIPv6Domain.c.orig snmplib/snmpUDPIPv6Domain.c
+--- snmplib/snmpUDPIPv6Domain.c.orig Mon Aug 20 17:06:42 2007
++++ snmplib/snmpUDPIPv6Domain.c Fri Jan 11 13:39:36 2008
+@@ -103,13 +103,24 @@ netsnmp_udp6_fmtaddr(netsnmp_transport *
if (to == NULL) {
return strdup("UDP/IPv6: unknown");
} else {
- char addr[INET6_ADDRSTRLEN];
-- char tmp[INET6_ADDRSTRLEN + 8];
-+ char tmp[NI_MAXHOST];
+- char tmp[INET6_ADDRSTRLEN + 18];
++ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12];
-- sprintf(tmp, "UDP/IPv6: [%s]:%hd",
+- sprintf(tmp, "UDP/IPv6: [%s]:%hu",
- inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr,
- INET6_ADDRSTRLEN), ntohs(to->sin6_port));
- return strdup(tmp);
@@ -20,10 +22,13 @@
+#ifndef NI_WITHSCOPEID
+#define NI_WITHSCOPEID 0
+#endif
-+ if (getnameinfo(to, sizeof(struct sockaddr_in6), tmp, sizeof(tmp),
-+ NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID)) {
++ if (getnameinfo((struct sockaddr *)to, sizeof(struct sockaddr_in6),
++ addr, sizeof(addr), NULL, 0,
++ NI_NUMERICHOST | NI_WITHSCOPEID)) {
+ return strdup("UDP/IPv6: unknown");
+ }
++ snprintf(tmp, sizeof(tmp), "UDP/IPv6: [%s]:%hu", addr,
++ ntohs(to->sin6_port));
+ return strdup(tmp);
}
}
Index: patch-snmpTCPIPv6Domain.c
===================================================================
RCS file: /home/cvs/mports/net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c -L net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c -u -r1.1 -r1.2
--- net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c
+++ net-mgmt/net-snmp/files/patch-snmpTCPIPv6Domain.c
@@ -1,12 +1,14 @@
---- snmplib/snmpTCPIPv6Domain.c.orig Sat Oct 16 03:52:29 2004
-+++ snmplib/snmpTCPIPv6Domain.c Mon Oct 25 09:22:06 2004
-@@ -95,13 +95,21 @@
+Index: snmplib/snmpTCPIPv6Domain.c
+diff -u -p snmplib/snmpTCPIPv6Domain.c.orig snmplib/snmpTCPIPv6Domain.c
+--- snmplib/snmpTCPIPv6Domain.c.orig Fri Sep 16 19:30:49 2005
++++ snmplib/snmpTCPIPv6Domain.c Fri Jan 11 13:40:09 2008
+@@ -96,13 +96,24 @@ netsnmp_tcp6_fmtaddr(netsnmp_transport *
if (to == NULL) {
return strdup("TCP/IPv6: unknown");
} else {
- char addr[INET6_ADDRSTRLEN];
- char tmp[INET6_ADDRSTRLEN + 8];
-+ char tmp[NI_MAXHOST];
++ char addr[NI_MAXHOST], tmp[NI_MAXHOST + NI_MAXSERV + 12];
- sprintf(tmp, "TCP/IPv6: [%s]:%hd",
- inet_ntop(AF_INET6, (void *) &(to->sin6_addr), addr,
@@ -20,10 +22,13 @@
+#ifndef NI_WITHSCOPEID
+#define NI_WITHSCOPEID 0
+#endif
-+ if (getnameinfo(to, sizeof(struct sockaddr_in6), tmp, sizeof(tmp),
-+ NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID)) {
++ if (getnameinfo((struct sockaddr *)to, sizeof(struct sockaddr_in6),
++ addr, sizeof(addr), NULL, 0,
++ NI_NUMERICHOST | NI_WITHSCOPEID)) {
+ return strdup("UDP/IPv6: unknown");
+ }
++ snprintf(tmp, sizeof(tmp), "TCP/IPv6: [%s]:%hd", addr,
++ ntohs(to->sin6_port));
+ return strdup(tmp);
}
}
Index: patch-hr_storage.c
===================================================================
RCS file: /home/cvs/mports/net-mgmt/net-snmp/files/patch-hr_storage.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net-mgmt/net-snmp/files/patch-hr_storage.c -L net-mgmt/net-snmp/files/patch-hr_storage.c -u -r1.1 -r1.2
--- net-mgmt/net-snmp/files/patch-hr_storage.c
+++ net-mgmt/net-snmp/files/patch-hr_storage.c
@@ -1,6 +1,15 @@
---- agent/mibgroup/host/hr_storage.c.orig Fri Oct 7 07:55:23 2005
-+++ agent/mibgroup/host/hr_storage.c Wed Nov 30 12:01:05 2005
-@@ -233,6 +233,10 @@
+--- agent/mibgroup/host/hr_storage.c.orig 2007-06-08 19:33:58.000000000 +0900
++++ agent/mibgroup/host/hr_storage.c 2008-01-11 21:37:48.767962726 +0900
+@@ -229,7 +229,7 @@
+ mach_port_t myHost;
+ #endif
+
+-static int physmem, pagesize;
++static u_long physmem, pagesize;
+ static void parse_storage_config(const char *, char *);
+
+ /*********************
+@@ -252,6 +252,10 @@
void sol_get_swapinfo(int *, int *);
#endif
@@ -11,7 +20,7 @@
#define HRSTORE_MEMSIZE 1
#define HRSTORE_INDEX 2
#define HRSTORE_TYPE 3
-@@ -472,7 +476,8 @@
+@@ -499,7 +503,8 @@
NULL,
"Memory Buffers", /* HRS_TYPE_MBUF */
"Real Memory", /* HRS_TYPE_MEM */
@@ -21,7 +30,7 @@
};
-@@ -611,6 +616,7 @@
+@@ -647,6 +652,7 @@
storage_type_id[storage_type_len - 1] = 3; /* Virtual Mem */
break;
case HRS_TYPE_MBUF:
@@ -29,7 +38,7 @@
storage_type_id[storage_type_len - 1] = 1; /* Other */
break;
default:
-@@ -704,7 +710,7 @@
+@@ -752,7 +758,7 @@
long_return = memory_totals.t_vm;
#endif
break;
@@ -38,7 +47,7 @@
case HRS_TYPE_MEM:
long_return = physmem;
break;
-@@ -726,13 +732,45 @@
+@@ -774,13 +780,45 @@
i++)
long_return += mbstat.m_mtypes[i];
#elif defined(MBSTAT_SYMBOL) && defined(STRUCT_MBSTAT_HAS_M_MBUFS)
@@ -84,7 +93,7 @@
default:
#if NO_DUMMY_VALUES
goto try_next;
-@@ -796,6 +834,12 @@
+@@ -856,6 +894,12 @@
#endif
#elif defined(MBSTAT_SYMBOL) && defined(STRUCT_MBSTAT_HAS_M_CLUSTERS)
long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */
@@ -97,7 +106,7 @@
#elif defined(NO_DUMMY_VALUES)
goto try_next;
#else
-@@ -803,6 +847,11 @@
+@@ -863,6 +907,11 @@
#endif
break;
#endif /* !linux && !solaris2 && !hpux10 && !hpux11 && ... */
@@ -109,7 +118,7 @@
default:
#if NO_DUMMY_VALUES
goto try_next;
-@@ -829,7 +878,11 @@
+@@ -889,7 +938,11 @@
break;
#if !defined(linux) && !defined(solaris2) && !defined(hpux10) && !defined(hpux11) && defined(MBSTAT_SYMBOL)
case HRS_TYPE_MBUF:
@@ -121,11 +130,10 @@
break;
#endif /* !linux && !solaris2 && !hpux10 && !hpux11 && MBSTAT_SYMBOL */
default:
-@@ -955,3 +1008,97 @@
- *usedP = ainfo.ani_resv;
+@@ -1015,6 +1068,100 @@
}
#endif /* solaris2 */
-+
+
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500102
+void
+collect_mbuf(long *long_mbuf, long *long_mbufc)
@@ -219,3 +227,7 @@
+#endif
+}
+#endif
++
+ #ifdef WIN32
+ char *win_realpath(const char *file_name, char *resolved_name)
+ {
Index: patch-snmp_agent.c
===================================================================
RCS file: /home/cvs/mports/net-mgmt/net-snmp/files/patch-snmp_agent.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net-mgmt/net-snmp/files/patch-snmp_agent.c -L net-mgmt/net-snmp/files/patch-snmp_agent.c -u -r1.1 -r1.2
--- net-mgmt/net-snmp/files/patch-snmp_agent.c
+++ net-mgmt/net-snmp/files/patch-snmp_agent.c
@@ -1,10 +1,13 @@
---- agent/snmp_agent.c.orig Thu Mar 17 17:17:43 2005
-+++ agent/snmp_agent.c Wed Nov 30 12:23:41 2005
-@@ -839,6 +839,7 @@
- ;
- else if (hosts_ctl("snmpd", STRING_UNKNOWN, STRING_UNKNOWN, STRING_UNKNOWN)){
- snmp_log(allow_severity, "Connection from <UNKNOWN> (%s)\n", addr_string);
-+ SNMP_FREE(addr_string);
- addr_string = strdup("<UNKNOWN>");
- } else {
- snmp_log(deny_severity, "Connection from <UNKNOWN> (%s) REFUSED\n", addr_string);
+Index: agent/snmp_agent.c
+diff -u -p agent/snmp_agent.c.orig agent/snmp_agent.c
+--- agent/snmp_agent.c.orig Thu Aug 16 22:31:40 2007
++++ agent/snmp_agent.c Fri Jan 11 13:06:27 2008
+@@ -819,7 +819,7 @@ netsnmp_agent_check_packet(netsnmp_sessi
+ }
+ #ifdef USE_LIBWRAP
+ /* Catch udp,udp6,tcp,tcp6 transports using "[" */
+- tcpudpaddr = strstr(addr_string, "[");
++ tcpudpaddr = strrchr(addr_string, '[');
+ if ( tcpudpaddr != 0 ) {
+ char sbuf[64];
+ char *xp;
--- /dev/null
+++ net-mgmt/net-snmp/files/patch-freebsd8.h
@@ -0,0 +1,4 @@
+--- include/net-snmp/system/freebsd8.h.orig Sun Jul 17 22:41:06 2005
++++ include/net-snmp/system/freebsd8.h Sun Jul 17 22:41:28 2005
+@@ -0,0 +1 @@
++#include "freebsd7.h"
--- net-mgmt/net-snmp/files/patch-memory_freebsd2.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- agent/mibgroup/ucd-snmp/memory_freebsd2.c Sat Mar 3 19:40:34 2007
-+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig Sat Mar 3 19:39:57 2007
-@@ -256,7 +256,7 @@
-
- u_long phys_mem;
- size_t phys_mem_size = sizeof(phys_mem);
-- int phys_mem_mib[] = { CTL_HW, HW_USERMEM };
-+ int phys_mem_mib[] = { CTL_HW, HW_PHYSMEM };
-
- #ifdef BUFSPACE_SYMBOL
- long bufspace;
More information about the Midnightbsd-cvs
mailing list