[Midnightbsd-cvs] mports [22046] trunk/net-mgmt/net-snmp: revert this
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Oct 30 14:36:33 EDT 2016
Revision: 22046
http://svnweb.midnightbsd.org/mports/?rev=22046
Author: laffer1
Date: 2016-10-30 14:36:33 -0400 (Sun, 30 Oct 2016)
Log Message:
-----------
revert this
Modified Paths:
--------------
trunk/net-mgmt/net-snmp/Makefile
trunk/net-mgmt/net-snmp/distinfo
trunk/net-mgmt/net-snmp/files/extra-patch-local_Makefile.in
trunk/net-mgmt/net-snmp/files/net-snmp.conf
trunk/net-mgmt/net-snmp/files/patch-Makefile.in
trunk/net-mgmt/net-snmp/files/patch-agent_Makefile.in
trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_memory_memory__freebsd.c
trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_icmp.h
trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_tcp-mib_data__access_tcpConn__freebsd4.c
trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_ucd-snmp_diskio.c
trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_udp-mib_data__access_udp__endpoint__freebsd4.c
trunk/net-mgmt/net-snmp/files/patch-kthreads
trunk/net-mgmt/net-snmp/files/patch-perl5.23
trunk/net-mgmt/net-snmp/files/patch-snmplib_snmp__api.c
trunk/net-mgmt/net-snmp/files/pkg-message.in
trunk/net-mgmt/net-snmp/files/snmpd.in
trunk/net-mgmt/net-snmp/files/snmptrapd.in
trunk/net-mgmt/net-snmp/pkg-descr
trunk/net-mgmt/net-snmp/pkg-plist
Modified: trunk/net-mgmt/net-snmp/Makefile
===================================================================
--- trunk/net-mgmt/net-snmp/Makefile 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/Makefile 2016-10-30 18:36:33 UTC (rev 22046)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= snmp
-PORTVERSION= 5.7.3
+PORTVERSION= 5.7.2
CATEGORIES= net-mgmt ipv6
MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= net-
@@ -8,8 +8,7 @@
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= ports at MidnightBSD.org
-COMMENT= Extendable SNMP implementation
-
+COMMENT= An extendable SNMP implementation
LICENSE= bsd3
OPTIONS_DEFINE= IPV6 MFD_REWRITES PERL PERL_EMBEDDED PYTHON DUMMY TKMIB \
Modified: trunk/net-mgmt/net-snmp/distinfo
===================================================================
--- trunk/net-mgmt/net-snmp/distinfo 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/distinfo 2016-10-30 18:36:33 UTC (rev 22046)
@@ -1,2 +1,2 @@
-SHA256 (net-snmp-5.7.3.tar.gz) = 12ef89613c7707dc96d13335f153c1921efc9d61d3708ef09f3fc4a7014fb4f0
-SIZE (net-snmp-5.7.3.tar.gz) = 6382428
+SHA256 (net-snmp-5.7.2.tar.gz) = 09ed31b4cc1f3c0411ef9a16eff79ef3b30d89c32ca46d5a01a41826c4ceb816
+SIZE (net-snmp-5.7.2.tar.gz) = 6281352
Modified: trunk/net-mgmt/net-snmp/files/extra-patch-local_Makefile.in
===================================================================
--- trunk/net-mgmt/net-snmp/files/extra-patch-local_Makefile.in 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/extra-patch-local_Makefile.in 2016-10-30 18:36:33 UTC (rev 22046)
@@ -9,3 +9,14 @@
SHELLSCRIPTS=mib2c-update
SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \
ipf-mod.pl.made snmpconf.made traptoemail.made snmp-bridge-mib.made \
+--- local/Makefile.in.orig 2015-01-19 14:37:56 UTC
++++ local/Makefile.in
+@@ -16,7 +16,7 @@ OTHERUNINSTALL=localuninstall
+ #
+ SNMPCONFPATH=@SNMPCONFPATH@
+ PERSISTENT_DIRECTORY=@PERSISTENT_DIRECTORY@
+-PERLSCRIPTS=snmpcheck tkmib mib2c fixproc ipf-mod.pl snmpconf traptoemail snmp-bridge-mib net-snmp-cert
++PERLSCRIPTS=snmpcheck mib2c fixproc ipf-mod.pl snmpconf traptoemail snmp-bridge-mib net-snmp-cert
+ SHELLSCRIPTS=mib2c-update
+ SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \
+ ipf-mod.pl.made snmpconf.made traptoemail.made snmp-bridge-mib.made \
Modified: trunk/net-mgmt/net-snmp/files/net-snmp.conf
===================================================================
--- trunk/net-mgmt/net-snmp/files/net-snmp.conf 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/net-snmp.conf 2016-10-30 18:36:33 UTC (rev 22046)
@@ -4,3 +4,9 @@
#
# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num]
/var/log/snmpd.log 644 7 100 * J /var/run/net_snmpd.pid
+# configuration file for newsyslog for net-snmp
+#
+# see newsyslog.conf(5) for details
+#
+# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num]
+/var/log/snmpd.log 644 7 100 * J /var/run/net_snmpd.pid
Modified: trunk/net-mgmt/net-snmp/files/patch-Makefile.in
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-Makefile.in 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/patch-Makefile.in 2016-10-30 18:36:33 UTC (rev 22046)
@@ -9,3 +9,14 @@
if test $$? != 0 ; then \
exit 1 ; \
fi
+--- Makefile.in.orig 2015-01-19 14:39:40 UTC
++++ Makefile.in
+@@ -230,7 +230,7 @@ pythonmodules: subdirs
+ fi
+
+ pythoninstall:
+- @(dir=`pwd`; cd python; $(PYMAKE) install --basedir=$$dir) ; \
++ @(dir=`pwd`; cd python; $(PYMAKE) install --root=${STAGEDIR} --basedir=$$dir ${PYDISTUTILS_INSTALLARGS}) ; \
+ if test $$? != 0 ; then \
+ exit 1 ; \
+ fi
Modified: trunk/net-mgmt/net-snmp/files/patch-agent_Makefile.in
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-agent_Makefile.in 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/patch-agent_Makefile.in 2016-10-30 18:36:33 UTC (rev 22046)
@@ -9,3 +9,14 @@
OUR_AGENT_LIBS = $(AGENTLIB) $(MIBLIB) $(LIBS) @DLLIBS@
CPPFLAGS = $(TOP_INCLUDES) -I. $(AGENT_INCLUDES) $(MIBGROUP_INCLUDES) \
$(SNMPLIB_INCLUDES) @CPPFLAGS@
+--- agent/Makefile.in.orig 2015-01-19 16:46:08 UTC
++++ agent/Makefile.in
+@@ -120,7 +120,7 @@ LMIBLIBS = @LMIBLIBS@
+ VAL_LIBS = @VAL_LIBS@
+ PERLLDOPTS_FOR_APPS = @PERLLDOPTS_FOR_APPS@
+ PERLLDOPTS_FOR_LIBS = @PERLLDOPTS_FOR_LIBS@
+-LIBS = $(USELIBS) @AGENTLIBS@ $(PERLLDOPTS_FOR_APPS) $(VAL_LIBS)
++LIBS = $(USELIBS) @AGENTLIBS@ $(PERLLDOPTS_FOR_APPS) $(VAL_LIBS) -lpkg
+ OUR_AGENT_LIBS = $(AGENTLIB) $(MIBLIB) $(LIBS) @DLLIBS@
+ CPPFLAGS = $(TOP_INCLUDES) -I. $(AGENT_INCLUDES) $(MIBGROUP_INCLUDES) \
+ $(SNMPLIB_INCLUDES) @CPPFLAGS@
Modified: trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_memory_memory__freebsd.c
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_memory_memory__freebsd.c 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_memory_memory__freebsd.c 2016-10-30 18:36:33 UTC (rev 22046)
@@ -9,3 +9,14 @@
mem->free = 0;
}
+--- agent/mibgroup/hardware/memory/memory_freebsd.c.orig 2015-02-20 14:44:47 UTC
++++ agent/mibgroup/hardware/memory/memory_freebsd.c
+@@ -163,7 +163,7 @@ int netsnmp_mem_arch_load( netsnmp_cache
+ if (!mem->descr)
+ mem->descr = strdup("Cached memory");
+ mem->units = pagesize;
+- mem->size = cache_count;
++ mem->size = cache_count + inact_count;
+ mem->free = 0;
+ }
+
Modified: trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_icmp.h
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_icmp.h 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_icmp.h 2016-10-30 18:36:33 UTC (rev 22046)
@@ -9,3 +9,14 @@
config_arch_require(netbsd, mibII/kernel_netbsd)
config_arch_require(netbsdelf, mibII/kernel_netbsd)
config_arch_require(openbsd4, mibII/kernel_sysctl)
+--- agent/mibgroup/mibII/icmp.h.orig 2014-12-08 20:23:22 UTC
++++ agent/mibgroup/mibII/icmp.h
+@@ -14,6 +14,8 @@ config_arch_require(freebsd7, mibII/ker
+ config_arch_require(freebsd8, mibII/kernel_sysctl)
+ config_arch_require(freebsd9, mibII/kernel_sysctl)
+ config_arch_require(freebsd10, mibII/kernel_sysctl)
++config_arch_require(freebsd11, mibII/kernel_sysctl)
++config_arch_require(freebsd12, mibII/kernel_sysctl)
+ config_arch_require(netbsd, mibII/kernel_netbsd)
+ config_arch_require(netbsdelf, mibII/kernel_netbsd)
+ config_arch_require(openbsd4, mibII/kernel_sysctl)
Modified: trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_tcp-mib_data__access_tcpConn__freebsd4.c
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_tcp-mib_data__access_tcpConn__freebsd4.c 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_tcp-mib_data__access_tcpConn__freebsd4.c 2016-10-30 18:36:33 UTC (rev 22046)
@@ -9,3 +9,14 @@
if(rc<0)
return rc;
+--- agent/mibgroup/tcp-mib/data_access/tcpConn_freebsd4.c.orig 2015-10-13 12:04:38 UTC
++++ agent/mibgroup/tcp-mib/data_access/tcpConn_freebsd4.c
+@@ -216,6 +216,8 @@ _load(netsnmp_container *container, u_in
+ CONTAINER_INSERT(container, entry);
+ }
+
++ free(tcpcb_buf);
++
+ if(rc<0)
+ return rc;
+
Modified: trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_ucd-snmp_diskio.c
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_ucd-snmp_diskio.c 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_ucd-snmp_diskio.c 2016-10-30 18:36:33 UTC (rev 22046)
@@ -52,3 +52,57 @@
#else
long_ret = (signed long) stat->dinfo->devices[indx].num_writes;
#endif
+--- agent/mibgroup/ucd-snmp/diskio.c.orig 2014-12-08 20:23:22 UTC
++++ agent/mibgroup/ucd-snmp/diskio.c
+@@ -944,14 +944,14 @@ var_diskio(struct variable * vp,
+ return (u_char *) stat->dinfo->devices[indx].device_name;
+ case DISKIO_NREAD:
+ #if HAVE_DEVSTAT_GETDEVS
+- long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_READ];
++ long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_READ] & 0xFFFFFFFF;
+ #else
+ long_ret = (signed long) stat->dinfo->devices[indx].bytes_read;
+ #endif
+ return (u_char *) & long_ret;
+ case DISKIO_NWRITTEN:
+ #if HAVE_DEVSTAT_GETDEVS
+- long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE];
++ long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE] & 0xFFFFFFFF;
+ #else
+ long_ret = (signed long) stat->dinfo->devices[indx].bytes_written;
+ #endif
+@@ -959,7 +959,7 @@ var_diskio(struct variable * vp,
+ case DISKIO_NREADX:
+ *var_len = sizeof(struct counter64);
+ #if HAVE_DEVSTAT_GETDEVS
+- longlong_ret = stat->dinfo->devices[indx].bytes[DEVSTAT_READ];
++ longlong_ret = stat->dinfo->devices[indx].bytes[DEVSTAT_READ] & 0xFFFFFFFF;
+ #else
+ longlong_ret = stat->dinfo->devices[indx].bytes_read;
+ #endif
+@@ -969,7 +969,7 @@ var_diskio(struct variable * vp,
+ case DISKIO_NWRITTENX:
+ *var_len = sizeof(struct counter64);
+ #if HAVE_DEVSTAT_GETDEVS
+- longlong_ret = stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE];
++ longlong_ret = stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE] & 0xFFFFFFFF;
+ #else
+ longlong_ret = stat->dinfo->devices[indx].bytes_written;
+ #endif
+@@ -978,14 +978,14 @@ var_diskio(struct variable * vp,
+ return (u_char *) & c64_ret;
+ case DISKIO_READS:
+ #if HAVE_DEVSTAT_GETDEVS
+- long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_READ];
++ long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_READ] & 0xFFFFFFFF;
+ #else
+ long_ret = (signed long) stat->dinfo->devices[indx].num_reads;
+ #endif
+ return (u_char *) & long_ret;
+ case DISKIO_WRITES:
+ #if HAVE_DEVSTAT_GETDEVS
+- long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_WRITE];
++ long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_WRITE] & 0xFFFFFFFF;
+ #else
+ long_ret = (signed long) stat->dinfo->devices[indx].num_writes;
+ #endif
Modified: trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_udp-mib_data__access_udp__endpoint__freebsd4.c
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_udp-mib_data__access_udp__endpoint__freebsd4.c 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/patch-agent_mibgroup_udp-mib_data__access_udp__endpoint__freebsd4.c 2016-10-30 18:36:33 UTC (rev 22046)
@@ -9,3 +9,14 @@
if(rc<0)
return rc;
+--- agent/mibgroup/udp-mib/data_access/udp_endpoint_freebsd4.c.orig 2015-10-13 12:04:44 UTC
++++ agent/mibgroup/udp-mib/data_access/udp_endpoint_freebsd4.c
+@@ -187,6 +187,8 @@ _load(netsnmp_container *container, u_in
+ CONTAINER_INSERT(container, entry);
+ }
+
++ free(udpcb_buf);
++
+ if(rc<0)
+ return rc;
+
Modified: trunk/net-mgmt/net-snmp/files/patch-kthreads
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-kthreads 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/patch-kthreads 2016-10-30 18:36:33 UTC (rev 22046)
@@ -94,3 +94,99 @@
int swrun_max_processes( void );
int swrun_count_processes_by_name( char *name );
+diff --git a/agent/mibgroup/host/data_access/swrun.c b/agent/mibgroup/host/data_access/swrun.c
+index d18ea5f..60ad5b4 100644
+--- agent/mibgroup/host/data_access/swrun.c
++++ agent/mibgroup/host/data_access/swrun.c
+@@ -75,10 +75,27 @@ shutdown_swrun(void)
+ }
+
+ int
+-swrun_count_processes( void )
++swrun_count_processes(int include_kthreads)
+ {
++ netsnmp_swrun_entry *entry;
++ netsnmp_iterator *it;
++ int i = 0;
++
+ netsnmp_cache_check_and_reload(swrun_cache);
+- return ( swrun_container ? CONTAINER_SIZE(swrun_container) : 0 );
++ if ( !swrun_container )
++ return 0; /* or -1 */
++
++ if (include_kthreads)
++ return ( swrun_container ? CONTAINER_SIZE(swrun_container) : 0 );
++
++ it = CONTAINER_ITERATOR( swrun_container );
++ while ((entry = (netsnmp_swrun_entry*)ITERATOR_NEXT( it )) != NULL) {
++ if (4 == entry->hrSWRunType)
++ i++;
++ }
++ ITERATOR_RELEASE( it );
++
++ return i;
+ }
+
+ #ifndef NETSNMP_FEATURE_REMOVE_SWRUN_MAX_PROCESSES
+diff --git a/agent/mibgroup/host/hr_system.c b/agent/mibgroup/host/hr_system.c
+index d99cc7d..e853779 100644
+--- agent/mibgroup/host/hr_system.c
++++ agent/mibgroup/host/hr_system.c
+@@ -24,6 +24,7 @@
+
+ #include <net-snmp/net-snmp-includes.h>
+ #include <net-snmp/agent/net-snmp-agent-includes.h>
++#include <net-snmp/data_access/swrun.h>
+
+ #include "host.h"
+ #include "host_res.h"
+@@ -114,7 +115,14 @@ static long get_max_solaris_processes(void);
+ static int get_load_dev(void);
+ static int count_users(void);
+ extern int count_processes(void);
+-extern int swrun_count_processes(void);
++#if USING_HOST_DATA_ACCESS_SWRUN_MODULE
++static int count_kthreads = 0;
++
++static void parse_count_kthreads(const char *token, const char *line)
++{
++ count_kthreads = atoi(line);
++}
++#endif
+
+ /*********************
+ *
+@@ -194,6 +202,11 @@ init_hr_system(void)
+ #ifdef NPROC_SYMBOL
+ auto_nlist(NPROC_SYMBOL, 0, 0);
+ #endif
++#if USING_HOST_DATA_ACCESS_SWRUN_MODULE
++ snmpd_register_const_config_handler("count_kthreads",
++ parse_count_kthreads, NULL,
++ "0|1 0 to exclude kernel threads from hrSystemProcesses.0");
++#endif
+
+ REGISTER_MIB("host/hr_system", hrsystem_variables, variable2,
+ hrsystem_variables_oid);
+@@ -317,7 +330,7 @@ var_hrsys(struct variable * vp,
+ return (u_char *) & long_return;
+ case HRSYS_PROCS:
+ #if USING_HOST_DATA_ACCESS_SWRUN_MODULE
+- long_return = swrun_count_processes();
++ long_return = swrun_count_processes(count_kthreads);
+ #elif USING_HOST_HR_SWRUN_MODULE
+ long_return = count_processes();
+ #else
+diff --git a/include/net-snmp/data_access/swrun.h b/include/net-snmp/data_access/swrun.h
+index 3e15c41..4f768ac 100644
+--- include/net-snmp/data_access/swrun.h
++++ include/net-snmp/data_access/swrun.h
+@@ -85,7 +85,7 @@ extern "C" {
+
+ void netsnmp_swrun_entry_free(netsnmp_swrun_entry *entry);
+
+- int swrun_count_processes( void );
++ int swrun_count_processes( int include_kthreads );
+ int swrun_max_processes( void );
+ int swrun_count_processes_by_name( char *name );
+
Modified: trunk/net-mgmt/net-snmp/files/patch-perl5.23
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-perl5.23 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/patch-perl5.23 2016-10-30 18:36:33 UTC (rev 22046)
@@ -133,3 +133,138 @@
use ExtUtils::MakeMaker;
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
# the contents of the Makefile that is written.
+--- agent/snmp_perl.c.orig 2015-08-11 13:07:06 UTC
++++ agent/snmp_perl.c
+@@ -5,6 +5,10 @@
+ #include <EXTERN.h>
+ #include "perl.h"
+
++#ifdef U64TYPE
++#define U64 U64pairU32
++#endif
++
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ #include <net-snmp/agent/net-snmp-agent-includes.h>
+--- perl/OID/OID.xs.orig 2015-08-11 13:07:28 UTC
++++ perl/OID/OID.xs
+@@ -7,6 +7,10 @@
+ #include "perl.h"
+ #include "XSUB.h"
+
++#ifdef U64TYPE
++#define U64 U64pairU32
++#endif
++
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+
+--- perl/SNMP/SNMP.xs.orig 2015-08-11 13:07:54 UTC
++++ perl/SNMP/SNMP.xs
+@@ -16,6 +16,10 @@
+ #include "perl.h"
+ #include "XSUB.h"
+
++#ifdef U64TYPE
++#define U64 U64pairU32
++#endif
++
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ #include <sys/types.h>
+--- perl/TrapReceiver/TrapReceiver.xs.orig 2015-08-11 13:08:02 UTC
++++ perl/TrapReceiver/TrapReceiver.xs
+@@ -9,6 +9,10 @@
+
+ #include "ppport.h"
+
++#ifdef U64TYPE
++#define U64 U64pairU32
++#endif
++
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ #include <net-snmp/agent/net-snmp-agent-includes.h>
+--- perl/agent/agent.xs.orig 2015-08-11 13:07:48 UTC
++++ perl/agent/agent.xs
+@@ -9,6 +9,10 @@
+ #include <netdb.h>
+ #include <sys/socket.h>
+
++#ifdef U64TYPE
++#define U64 U64pairU32
++#endif
++
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ #include <net-snmp/agent/net-snmp-agent-includes.h>
+--- perl/ASN/Makefile.PL.orig 2014-12-08 20:23:22 UTC
++++ perl/ASN/Makefile.PL
+@@ -1,3 +1,4 @@
++package ASN;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
+--- perl/AnyData_SNMP/Makefile.PL.orig 2015-09-03 22:27:45 UTC
++++ perl/AnyData_SNMP/Makefile.PL
+@@ -1,3 +1,4 @@
++package AnyData_SNMP;
+ use ExtUtils::MakeMaker;
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.
+--- perl/OID/Makefile.PL.orig 2014-12-08 20:23:22 UTC
++++ perl/OID/Makefile.PL
+@@ -1,3 +1,4 @@
++package OID;
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.
+
+--- perl/SNMP/Makefile.PL.orig 2014-12-08 20:23:22 UTC
++++ perl/SNMP/Makefile.PL
+@@ -1,3 +1,4 @@
++package SNMP;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
+--- perl/TrapReceiver/Makefile.PL.orig 2014-12-08 20:23:22 UTC
++++ perl/TrapReceiver/Makefile.PL
+@@ -1,3 +1,4 @@
++package TrapReceiver;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
+--- perl/agent/Makefile.PL.orig 2014-12-08 20:23:22 UTC
++++ perl/agent/Makefile.PL
+@@ -1,3 +1,4 @@
++package agent;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
+--- perl/agent/Support/Makefile.PL.orig 2014-12-08 20:23:22 UTC
++++ perl/agent/Support/Makefile.PL
+@@ -1,3 +1,4 @@
++package agent_Support;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
+--- perl/agent/default_store/Makefile.PL.orig 2014-12-08 20:23:22 UTC
++++ perl/agent/default_store/Makefile.PL
+@@ -1,3 +1,4 @@
++package agent_default_store;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
+--- perl/default_store/Makefile.PL.orig 2014-12-08 20:23:22 UTC
++++ perl/default_store/Makefile.PL
+@@ -1,3 +1,4 @@
++package default_store;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
+--- perl/manager/Makefile.PL.orig 2014-12-08 20:23:22 UTC
++++ perl/manager/Makefile.PL
+@@ -1,3 +1,4 @@
++package manager;
+ use ExtUtils::MakeMaker;
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.
Modified: trunk/net-mgmt/net-snmp/files/patch-snmplib_snmp__api.c
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-snmplib_snmp__api.c 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/patch-snmplib_snmp__api.c 2016-10-30 18:36:33 UTC (rev 22046)
@@ -115,3 +115,120 @@
}
/*
+--- snmplib/snmp_api.c.orig 2014-12-08 20:23:22 UTC
++++ snmplib/snmp_api.c
+@@ -4350,10 +4350,9 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char
+ u_char type;
+ u_char msg_type;
+ u_char *var_val;
+- int badtype = 0;
+ size_t len;
+ size_t four;
+- netsnmp_variable_list *vp = NULL;
++ netsnmp_variable_list *vp = NULL, *vplast = NULL;
+ oid objid[MAX_OID_LEN];
+ u_char *p;
+
+@@ -4493,38 +4492,24 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char
+ (ASN_SEQUENCE | ASN_CONSTRUCTOR),
+ "varbinds");
+ if (data == NULL)
+- return -1;
++ goto fail;
+
+ /*
+ * get each varBind sequence
+ */
+ while ((int) *length > 0) {
+- netsnmp_variable_list *vptemp;
+- vptemp = (netsnmp_variable_list *) malloc(sizeof(*vptemp));
+- if (NULL == vptemp) {
+- return -1;
+- }
+- if (NULL == vp) {
+- pdu->variables = vptemp;
+- } else {
+- vp->next_variable = vptemp;
+- }
+- vp = vptemp;
++ vp = SNMP_MALLOC_TYPEDEF(netsnmp_variable_list);
++ if (NULL == vp)
++ goto fail;
+
+- vp->next_variable = NULL;
+- vp->val.string = NULL;
+ vp->name_length = MAX_OID_LEN;
+- vp->name = NULL;
+- vp->index = 0;
+- vp->data = NULL;
+- vp->dataFreeHook = NULL;
+ DEBUGDUMPSECTION("recv", "VarBind");
+ data = snmp_parse_var_op(data, objid, &vp->name_length, &vp->type,
+ &vp->val_len, &var_val, length);
+ if (data == NULL)
+- return -1;
++ goto fail;
+ if (snmp_set_var_objid(vp, objid, vp->name_length))
+- return -1;
++ goto fail;
+
+ len = MAX_PACKET_LENGTH;
+ DEBUGDUMPHEADER("recv", "Value");
+@@ -4604,7 +4589,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char
+ vp->val.string = (u_char *) malloc(vp->val_len);
+ }
+ if (vp->val.string == NULL) {
+- return -1;
++ goto fail;
+ }
+ p = asn_parse_string(var_val, &len, &vp->type, vp->val.string,
+ &vp->val_len);
+@@ -4619,7 +4604,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char
+ vp->val_len *= sizeof(oid);
+ vp->val.objid = (oid *) malloc(vp->val_len);
+ if (vp->val.objid == NULL) {
+- return -1;
++ goto fail;
+ }
+ memmove(vp->val.objid, objid, vp->val_len);
+ break;
+@@ -4631,7 +4616,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char
+ case ASN_BIT_STR:
+ vp->val.bitstring = (u_char *) malloc(vp->val_len);
+ if (vp->val.bitstring == NULL) {
+- return -1;
++ goto fail;
+ }
+ p = asn_parse_bitstring(var_val, &len, &vp->type,
+ vp->val.bitstring, &vp->val_len);
+@@ -4640,12 +4625,28 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char
+ break;
+ default:
+ snmp_log(LOG_ERR, "bad type returned (%x)\n", vp->type);
+- badtype = -1;
++ goto fail;
+ break;
+ }
+ DEBUGINDENTADD(-4);
++
++ if (NULL == vplast) {
++ pdu->variables = vp;
++ } else {
++ vplast->next_variable = vp;
++ }
++ vplast = vp;
++ vp = NULL;
+ }
+- return badtype;
++ return 0;
++
++ fail:
++ DEBUGMSGTL(("recv", "error while parsing VarBindList\n"));
++ /** if we were parsing a var, remove it from the pdu and free it */
++ if (vp)
++ snmp_free_var(vp);
++
++ return -1;
+ }
+
+ /*
Modified: trunk/net-mgmt/net-snmp/files/pkg-message.in
===================================================================
--- trunk/net-mgmt/net-snmp/files/pkg-message.in 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/pkg-message.in 2016-10-30 18:36:33 UTC (rev 22046)
@@ -1,7 +1,7 @@
-**** This port installs snmpd, header files and libraries but does not
- start snmpd by default.
- If you want to auto-start snmpd and snmptrapd:, add the following to
- /etc/rc.conf:
+**** This port installs snmp daemon, header files and libraries but don't
+ invokes snmpd by default.
+ If you want to invoke snmpd and/or snmptrapd at startup, put these
+ lines into /etc/rc.conf.
snmpd_enable="YES"
snmpd_flags="-a"
@@ -9,7 +9,7 @@
snmptrapd_enable="YES"
snmptrapd_flags="-a -p /var/run/snmptrapd.pid"
-**** You may also specify the following make variables:
+**** You may specify the following make variables:
NET_SNMP_SYS_CONTACT="zi at FreeBSD.org"
NET_SNMP_SYS_LOCATION="USA"
@@ -18,10 +18,10 @@
NET_SNMP_LOGFILE=/var/log/snmpd.log
NET_SNMP_PERSISTENTDIR=/var/net-snmp
- to define default values (or to override the defaults). To avoid being
- prompted during the configuration process, you should (minimally) define
- the first two variables. (NET_SNMP_SYS_*)
+ to define default values (or overwriting defaults). At least
+ setting first two variables, you will not be prompted during
+ configuration process. You may also set
- You may also define the following to avoid all interactive configuration:
+ BATCH="yes"
- BATCH="yes"
+ to avoid interactive configuration.
Modified: trunk/net-mgmt/net-snmp/files/snmpd.in
===================================================================
--- trunk/net-mgmt/net-snmp/files/snmpd.in 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/snmpd.in 2016-10-30 18:36:33 UTC (rev 22046)
@@ -1,6 +1,6 @@
#!/bin/sh
-# $FreeBSD: head/net-mgmt/net-snmp/files/snmpd.in 340872 2014-01-24 00:14:07Z mat $
+# $FreeBSD$
#
# PROVIDE: snmpd
# REQUIRE: DAEMON
Modified: trunk/net-mgmt/net-snmp/files/snmptrapd.in
===================================================================
--- trunk/net-mgmt/net-snmp/files/snmptrapd.in 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/files/snmptrapd.in 2016-10-30 18:36:33 UTC (rev 22046)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: head/net-mgmt/net-snmp/files/snmptrapd.in 340872 2014-01-24 00:14:07Z mat $
+# $FreeBSD$
#
# PROVIDE: snmptrapd
# REQUIRE: DAEMON
Modified: trunk/net-mgmt/net-snmp/pkg-descr
===================================================================
--- trunk/net-mgmt/net-snmp/pkg-descr 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/pkg-descr 2016-10-30 18:36:33 UTC (rev 22046)
@@ -6,7 +6,7 @@
An SNMP library
tools to request or set information from SNMP agents
tools to generate and handle SNMP traps
- a version of the Unix 'netstat' command using SNMP
+ a version of the unix 'netstat' command using SNMP
a graphical Perl/Tk/SNMP based mib browser
WWW: http://net-snmp.sourceforge.net/
Modified: trunk/net-mgmt/net-snmp/pkg-plist
===================================================================
--- trunk/net-mgmt/net-snmp/pkg-plist 2016-10-30 18:35:43 UTC (rev 22045)
+++ trunk/net-mgmt/net-snmp/pkg-plist 2016-10-30 18:36:33 UTC (rev 22046)
@@ -29,7 +29,6 @@
bin/snmpwalk
%%WITH_TKMIB%%bin/tkmib
bin/traptoemail
-etc/newsyslog.conf.d/net-snmp.conf
include/net-snmp/agent/agent_callbacks.h
include/net-snmp/agent/agent_handler.h
include/net-snmp/agent/agent_index.h
@@ -79,7 +78,7 @@
include/net-snmp/agent/util_funcs/header_generic.h
include/net-snmp/agent/util_funcs/header_simple_table.h
include/net-snmp/agent/util_funcs/MIB_STATS_CACHE_TIMEOUT.h
- at dir include/net-snmp/agent/util_funcs
+ at dirrmtry include/net-snmp/agent/util_funcs
include/net-snmp/agent/var_struct.h
include/net-snmp/agent/watcher.h
include/net-snmp/config_api.h
@@ -184,8 +183,6 @@
include/net-snmp/system/freebsd8.h
include/net-snmp/system/freebsd9.h
include/net-snmp/system/freebsd10.h
-include/net-snmp/system/freebsd11.h
-include/net-snmp/system/freebsd12.h
include/net-snmp/system/generic.h
include/net-snmp/system/hpux.h
include/net-snmp/system/irix.h
@@ -211,189 +208,61 @@
include/net-snmp/varbind_api.h
include/net-snmp/version.h
lib/libnetsnmp.a
-lib/libnetsnmp.so
+lib/libnetsnmp.la
lib/libnetsnmp.so.%%SHLIB_VERSION%%
-lib/libnetsnmp.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%%
+ at exec ln -fs libnetsnmp.so.%%SHLIB_VERSION%% %B/libnetsnmp.so
+ at unexec rm -f %B/libnetsnmp.so 2> /dev/null || true
lib/libnetsnmpagent.a
-lib/libnetsnmpagent.so
+lib/libnetsnmpagent.la
lib/libnetsnmpagent.so.%%SHLIB_VERSION%%
-lib/libnetsnmpagent.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%%
+ at exec ln -fs libnetsnmpagent.so.%%SHLIB_VERSION%% %B/libnetsnmpagent.so
+ at unexec rm -f %B/libnetsnmpagent.so 2> /dev/null || true
lib/libnetsnmphelpers.a
-lib/libnetsnmphelpers.so
+lib/libnetsnmphelpers.la
lib/libnetsnmphelpers.so.%%SHLIB_VERSION%%
-lib/libnetsnmphelpers.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%%
+ at exec ln -fs libnetsnmphelpers.so.%%SHLIB_VERSION%% %B/libnetsnmphelpers.so
+ at unexec rm -f %B/libnetsnmphelpers.so 2> /dev/null || true
lib/libnetsnmpmibs.a
-lib/libnetsnmpmibs.so
+lib/libnetsnmpmibs.la
lib/libnetsnmpmibs.so.%%SHLIB_VERSION%%
-lib/libnetsnmpmibs.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%%
+ at exec ln -fs libnetsnmpmibs.so.%%SHLIB_VERSION%% %B/libnetsnmpmibs.so
+ at unexec rm -f %B/libnetsnmpmibs.so 2> /dev/null || true
lib/libnetsnmptrapd.a
-lib/libnetsnmptrapd.so
+lib/libnetsnmptrapd.la
lib/libnetsnmptrapd.so.%%SHLIB_VERSION%%
-lib/libnetsnmptrapd.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%%
-man/man1/agentxtrap.1.gz
-man/man1/encode_keychange.1.gz
-man/man1/fixproc.1.gz
-man/man1/mib2c-update.1.gz
-man/man1/mib2c.1.gz
-man/man1/net-snmp-config.1.gz
-man/man1/net-snmp-create-v3-user.1.gz
-man/man1/snmp-bridge-mib.1.gz
-man/man1/snmpbulkget.1.gz
-man/man1/snmpbulkwalk.1.gz
-man/man1/snmpcmd.1.gz
-man/man1/snmpconf.1.gz
-man/man1/snmpdelta.1.gz
-man/man1/snmpdf.1.gz
-man/man1/snmpget.1.gz
-man/man1/snmpgetnext.1.gz
-man/man1/snmpinform.1.gz
-man/man1/snmpnetstat.1.gz
-man/man1/snmpset.1.gz
-man/man1/snmpstatus.1.gz
-man/man1/snmptable.1.gz
-man/man1/snmptest.1.gz
-man/man1/snmptranslate.1.gz
-man/man1/snmptrap.1.gz
-man/man1/snmpusm.1.gz
-man/man1/snmpvacm.1.gz
-man/man1/snmpwalk.1.gz
-man/man1/tkmib.1.gz
-man/man1/traptoemail.1.gz
-man/man3/add_mibdir.3.gz
-man/man3/add_module_replacement.3.gz
-man/man3/config_perror.3.gz
-man/man3/config_pwarn.3.gz
-man/man3/default_store.3.gz
-man/man3/fprint_description.3.gz
-man/man3/fprint_objid.3.gz
-man/man3/fprint_value.3.gz
-man/man3/fprint_variable.3.gz
-man/man3/get_module_node.3.gz
-man/man3/netsnmp_agent_api.3.gz
-man/man3/netsnmp_config_api.3.gz
-man/man3/netsnmp_init_mib.3.gz
-man/man3/netsnmp_mib_api.3.gz
-man/man3/netsnmp_pdu_api.3.gz
-man/man3/netsnmp_read_module.3.gz
-man/man3/netsnmp_sess_api.3.gz
-man/man3/netsnmp_session_api.3.gz
-man/man3/netsnmp_trap_api.3.gz
-man/man3/netsnmp_varbind_api.3.gz
-man/man3/print_description.3.gz
-man/man3/print_mib.3.gz
-man/man3/print_objid.3.gz
-man/man3/print_value.3.gz
-man/man3/print_variable.3.gz
-man/man3/read_all_mibs.3.gz
-man/man3/read_config_print_usage.3.gz
-man/man3/read_configs.3.gz
-man/man3/read_mib.3.gz
-man/man3/read_objid.3.gz
-man/man3/read_premib_configs.3.gz
-man/man3/register_app_config_handler.3.gz
-man/man3/register_app_prenetsnmp_mib_handler.3.gz
-man/man3/register_config_handler.3.gz
-man/man3/register_const_config_handler.3.gz
-man/man3/register_mib_handlers.3.gz
-man/man3/register_prenetsnmp_mib_handler.3.gz
-man/man3/send_easy_trap.3.gz
-man/man3/send_trap_vars.3.gz
-man/man3/send_v2trap.3.gz
-man/man3/shutdown_mib.3.gz
-man/man3/snmp_add_null_var.3.gz
-man/man3/snmp_alarm.3.gz
-man/man3/snmp_alarm_register.3.gz
-man/man3/snmp_alarm_register_hr.3.gz
-man/man3/snmp_alarm_unregister.3.gz
-man/man3/snmp_api_errstring.3.gz
-man/man3/snmp_async_send.3.gz
-man/man3/snmp_clone_pdu.3.gz
-man/man3/snmp_clone_varbind.3.gz
-man/man3/snmp_close.3.gz
-man/man3/snmp_error.3.gz
-man/man3/snmp_fix_pdu.3.gz
-man/man3/snmp_free_pdu.3.gz
-man/man3/snmp_free_var.3.gz
-man/man3/snmp_free_varbind.3.gz
-man/man3/snmp_open.3.gz
-man/man3/snmp_parse_oid.3.gz
-man/man3/snmp_pdu_add_variable.3.gz
-man/man3/snmp_pdu_create.3.gz
-man/man3/snmp_perror.3.gz
-man/man3/snmp_read.3.gz
-man/man3/snmp_select_info.3.gz
-man/man3/snmp_send.3.gz
-man/man3/snmp_sess_async_send.3.gz
-man/man3/snmp_sess_close.3.gz
-man/man3/snmp_sess_error.3.gz
-man/man3/snmp_sess_init.3.gz
-man/man3/snmp_sess_open.3.gz
-man/man3/snmp_sess_perror.3.gz
-man/man3/snmp_sess_read.3.gz
-man/man3/snmp_sess_select_info.3.gz
-man/man3/snmp_sess_send.3.gz
-man/man3/snmp_sess_session.3.gz
-man/man3/snmp_sess_synch_response.3.gz
-man/man3/snmp_sess_timeout.3.gz
-man/man3/snmp_set_mib_errors.3.gz
-man/man3/snmp_set_mib_warnings.3.gz
-man/man3/snmp_set_save_descriptions.3.gz
-man/man3/snmp_set_var_objid.3.gz
-man/man3/snmp_set_var_typed_integer.3.gz
-man/man3/snmp_set_var_typed_value.3.gz
-man/man3/snmp_set_var_value.3.gz
-man/man3/snmp_synch_response.3.gz
-man/man3/snmp_timeout.3.gz
-man/man3/snmp_varlist_add_variable.3.gz
-man/man3/snprint_description.3.gz
-man/man3/snprint_objid.3.gz
-man/man3/snprint_value.3.gz
-man/man3/snprint_variable.3.gz
-man/man3/unregister_all_config_handlers.3.gz
-man/man3/unregister_app_config_handler.3.gz
-man/man3/unregister_config_handler.3.gz
-man/man5/mib2c.conf.5.gz
-man/man5/snmp.conf.5.gz
-man/man5/snmp_config.5.gz
-man/man5/snmpd.conf.5.gz
-man/man5/snmpd.examples.5.gz
-man/man5/snmpd.internal.5.gz
-man/man5/snmptrapd.conf.5.gz
-man/man5/variables.5.gz
-man/man8/snmpd.8.gz
-man/man8/snmptrapd.8.gz
-%%WITH_PERL%%man/man3/NetSNMP::ASN.3.gz
-%%WITH_PERL%%man/man3/NetSNMP::OID.3.gz
-%%WITH_PERL%%man/man3/NetSNMP::TrapReceiver.3.gz
-%%WITH_PERL%%man/man3/NetSNMP::agent.3.gz
-%%WITH_PERL%%man/man3/NetSNMP::agent::default_store.3.gz
-%%WITH_PERL%%man/man3/NetSNMP::default_store.3.gz
-%%WITH_PERL%%man/man3/NetSNMP::netsnmp_request_infoPtr.3.gz
-%%WITH_PERL%%man/man3/SNMP.3.gz
-%%WITH_PERL%%%%SITE_ARCH%%/Bundle/Makefile.subs.pl
-%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/ASN.pm
-%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/OID.pm
-%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/TrapReceiver.pm
-%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/agent.pm
-%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/agent/Support.pm
-%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/agent/default_store.pm
-%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/agent/netsnmp_request_infoPtr.pm
-%%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/default_store.pm
-%%WITH_PERL%%%%SITE_ARCH%%/SNMP.pm
-%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/ASN/ASN.so
-%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/ASN/autosplit.ix
-%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/OID/OID.so
-%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/OID/autosplit.ix
-%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/TrapReceiver/TrapReceiver.so
-%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/TrapReceiver/autosplit.ix
-%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/agent/agent.so
-%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/agent/autosplit.ix
-%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/agent/default_store/autosplit.ix
-%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/agent/default_store/default_store.so
-%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/default_store/autosplit.ix
-%%WITH_PERL%%%%SITE_ARCH%%/auto/NetSNMP/default_store/default_store.so
-%%WITH_PERL%%%%SITE_ARCH%%/auto/SNMP/SNMP.so
-%%WITH_PERL%%%%SITE_ARCH%%/auto/SNMP/autosplit.ix
+ at exec ln -fs libnetsnmptrapd.so.%%SHLIB_VERSION%% %B/libnetsnmptrapd.so
+ at unexec rm -f %B/libnetsnmptrapd.so 2> /dev/null || true
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Makefile.subs.pl
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/ASN.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/OID.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/TrapReceiver.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/Support.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent/default_store.pm
+%%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/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
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/OID.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID/autosplit.ix
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver/TrapReceiver.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver/TrapReceiver.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver/autosplit.ix
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/agent.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/autosplit.ix
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/autosplit.ix
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store/default_store.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/autosplit.ix
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store/default_store.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/SNMP.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP/autosplit.ix
sbin/snmpd
sbin/snmptrapd
%%PORTDOCS%%%%DOCSDIR%%/AGENT.txt
@@ -542,8 +411,6 @@
%%DATADIR%%/mibs/SNMP-NOTIFICATION-MIB.txt
%%DATADIR%%/mibs/SNMP-PROXY-MIB.txt
%%DATADIR%%/mibs/SNMP-TARGET-MIB.txt
-%%DATADIR%%/mibs/SNMP-TLS-TM-MIB.txt
-%%DATADIR%%/mibs/SNMP-TSM-MIB.txt
%%DATADIR%%/mibs/SNMP-USER-BASED-SM-MIB.txt
%%DATADIR%%/mibs/SNMP-USM-AES-MIB.txt
%%DATADIR%%/mibs/SNMP-USM-DH-OBJECTS-MIB.txt
@@ -583,21 +450,34 @@
%%DATADIR%%/snmpconf-data/snmptrapd-data/runtime
%%DATADIR%%/snmpconf-data/snmptrapd-data/snmpconf-config
%%DATADIR%%/snmpconf-data/snmptrapd-data/traphandle
- at dir /var/agentx
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__init__.py
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__init__.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__init__.pyo
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client.py
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client.pyo
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client_intf.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__init__.py
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__init__.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__init__.pyo
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/test.py
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/test.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/test.pyo
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp_python-%%PYDISTUTILS_PKGVERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp_python-%%PYDISTUTILS_PKGVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp_python-%%PYDISTUTILS_PKGVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp_python-%%PYDISTUTILS_PKGVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
+ at dirrm %%DATADIR%%/mib2c-data/
+ at dirrm %%DATADIR%%/snmpconf-data/snmptrapd-data
+ at dirrm %%DATADIR%%/snmpconf-data/snmpd-data
+ at dirrm %%DATADIR%%/snmpconf-data/snmp-data
+ at dirrm %%DATADIR%%/snmpconf-data
+ at dirrmtry %%DATADIR%%/mibs
+ at dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent/default_store
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/agent
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/TrapReceiver
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/OID
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP
+%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP
+%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
+%%WITH_PYTHON%%%%PYINSTALL%%
+%%WITH_PYTHON%%%%PYUNINSTALL%%
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp_python-%%PYDISTUTILS_PKGVERSION%%-py%%PYTHON_VER%%.egg
+ at exec mkdir /var/agentx
+ at dirrm include/net-snmp/system
+ at dirrm include/net-snmp/machine
+ at dirrm include/net-snmp/library
+ at dirrm include/net-snmp/agent
+ at dirrm include/net-snmp
+ at unexec rmdir /var/agentx 2>/dev/null || true
More information about the Midnightbsd-cvs
mailing list