net-mgmt/net-snmp: Update to 5.9.4

PR: 277436 Submitted by: Ivan Rozhuk <rozhuk.im@gmail.com>
2025-02-05 11:35:01 +00:00 · 2024-03-04 11:08:42 -05:00 · 2024-03-04 11:08:42 -05:00 · 647eff0a34
commit 647eff0a34
parent 2e3d3209da
10 changed files with 79 additions and 91 deletions
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	snmp
-PORTVERSION=	5.9.1
-PORTREVISION=	5
+PORTVERSION=	5.9.4
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION} \
@ -37,15 +36,11 @@ NEWSYSLOG_DESC=		Automatically rotate snmpd.log via newsyslog
 NOLIBPKG_DESC=		Build without libpkg
 SCTP_DESC=		Build with SCTP MIB support

-MAKE_JOBS_UNSAFE=	yes
-
-PORTSCOUT=	skipv:5.7.2.1
-
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+USES=		cpe libtool perl5 ssl
 USE_RC_SUBR=	snmpd snmptrapd
 USE_LDCONFIG=	yes
-USES=		cpe libtool perl5 ssl
 CPE_PRODUCT=	net-snmp
 USE_PERL5=	build run
 USE_CSTD=	c99
@ -147,7 +142,7 @@ CONFIGURE_ARGS+=--without-root-access
 .endif

 SHLIB_VERSION=	40
-SHLIB_VERSION2=	.1.0
+SHLIB_VERSION2=	.2.1
 PLIST_SUB+=	SHLIB_VERSION=${SHLIB_VERSION} SHLIB_VERSION2=${SHLIB_VERSION2}
 SCRIPTS_SUB=	PREFIX=${PREFIX} PERL=${PERL}

@ -275,6 +270,10 @@ post-configure:
 		s!^.*#undef.*(HAVE_${hdr:tu:S/./_/g:S/\//_/g}).*$$!#define \1 1!g' \
 			${WRKSRC}/include/net-snmp/net-snmp-config.h
 .endfor
+	# Fix after:
+	# https://github.com/net-snmp/net-snmp/commit/923cb442bbef360de227fbca565710518b5ee8e5
+	@${REINPLACE_CMD} -e 's|snmpIPv6BaseDomain.h snmpIPBaseDomain.h|snmpIPv6BaseDomain.h|g' \
+		${WRKSRC}/snmplib/Makefile
 .if ${PORT_OPTIONS:MPYTHON}
 	@(cd ${WRKSRC}/python; \
 	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist_egg \
--- a/net-mgmt/net-snmp/distinfo
+++ b/net-mgmt/net-snmp/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1651857991
-SHA256 (net-snmp-5.9.1.tar.gz) = eb7fd4a44de6cddbffd9a92a85ad1309e5c1054fb9d5a7dd93079c8953f48c3f
-SIZE (net-snmp-5.9.1.tar.gz) = 6711774
+TIMESTAMP = 1709374659
+SHA256 (net-snmp-5.9.4.tar.gz) = 8b4de01391e74e3c7014beb43961a2d6d6fa03acc34280b9585f4930745b0544
+SIZE (net-snmp-5.9.4.tar.gz) = 6681606
--- a/net-mgmt/net-snmp/files/patch-Makefile.in
+++ b/net-mgmt/net-snmp/files/patch-Makefile.in
@ -1,6 +1,6 @@
--- Makefile.in.orig	2021-05-25 15:19:35.000000000 -0700
-+++ Makefile.in	2023-09-05 01:13:06.391986000 -0700
-@@ -21,7 +21,7 @@
+--- Makefile.in.orig	2023-08-15 20:32:01 UTC
+++ Makefile.in
+@@ -21,7 +21,7 @@ INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi
 	darwin.h dragonfly.h dynix.h \
 	freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h \
 	freebsd7.h freebsd8.h freebsd9.h freebsd10.h freebsd11.h \
@ -9,7 +9,7 @@
 	generic.h \
 	hpux.h irix.h kfreebsd.h linux.h mingw32.h mingw32msvc.h mips.h \
 	netbsd.h nto-qnx6.h osf5.h \
-@@ -234,7 +234,7 @@
+@@ -234,7 +234,7 @@ pythoninstall:
         fi
 
 pythoninstall:
--- a/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_memory_memory__freebsd.c
+++ b/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_memory_memory__freebsd.c
@ -1,6 +1,6 @@
--- agent/mibgroup/hardware/memory/memory_freebsd.c.orig	2015-02-20 14:44:47 UTC
+--- agent/mibgroup/hardware/memory/memory_freebsd.c.orig	2023-08-15 20:32:01 UTC
 +++ agent/mibgroup/hardware/memory/memory_freebsd.c
-@@ -163,7 +163,7 @@ int netsnmp_mem_arch_load( netsnmp_cache
+@@ -164,7 +164,7 @@ int netsnmp_mem_arch_load( netsnmp_cache *cache, void 
         if (!mem->descr)
              mem->descr = strdup("Cached memory");
         mem->units = pagesize;
--- a/net-mgmt/net-snmp/files/patch-agent_mibgroup_ip-mib_data__access_scalars__sysctl.c
+++ b/net-mgmt/net-snmp/files/patch-agent_mibgroup_ip-mib_data__access_scalars__sysctl.c
@ -1,5 +1,5 @@
--- agent/mibgroup/ip-mib/data_access/scalars_sysctl.c.orig	2021-05-25 15:19:35.000000000 -0700
-+++ agent/mibgroup/ip-mib/data_access/scalars_sysctl.c	2022-09-27 20:25:15.687146000 -0700
+--- agent/mibgroup/ip-mib/data_access/scalars_sysctl.c.orig	2023-08-15 20:32:01 UTC
+++ agent/mibgroup/ip-mib/data_access/scalars_sysctl.c
@@ -9,6 +9,7 @@
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 #include <net-snmp/data_access/ip_scalars.h>
--- a/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_ip.c
+++ b/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_ip.c
@ -1,5 +1,5 @@
--- agent/mibgroup/mibII/ip.c.orig	2021-05-25 15:19:35.000000000 -0700
-+++ agent/mibgroup/mibII/ip.c	2022-09-27 20:25:12.959145000 -0700
+--- agent/mibgroup/mibII/ip.c.orig	2023-08-15 20:32:01 UTC
+++ agent/mibgroup/mibII/ip.c
@@ -5,6 +5,13 @@
 
 #include <net-snmp/net-snmp-config.h>
@ -12,5 +12,5 @@
 +#define PR_FASTHZ	5	/* 5 fast timeouts per second */
 +#endif
 
- #if HAVE_SYS_HASHING_H
+ #ifdef HAVE_SYS_HASHING_H
 #include <sys/hashing.h>
--- a/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_tcp.c
+++ b/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_tcp.c
@ -1,5 +1,5 @@
--- agent/mibgroup/mibII/tcp.c.orig	2021-05-25 15:19:35.000000000 -0700
-+++ agent/mibgroup/mibII/tcp.c	2022-09-27 20:36:22.284180000 -0700
+--- agent/mibgroup/mibII/tcp.c.orig	2023-08-15 20:32:01 UTC
+++ agent/mibgroup/mibII/tcp.c
@@ -8,6 +8,14 @@
 #include <net-snmp/net-snmp-features.h>
 #include "mibII_common.h"
@ -12,6 +12,6 @@
 +#define PR_FASTHZ	5	/* 5 fast timeouts per second */
 +#endif
 +
- #if HAVE_STDLIB_H
+ #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
--- a/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd15.h
+++ b/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd15.h
@ -1,6 +1,6 @@
--- /dev/null	2023-09-03 22:25:19.482823000 -0700
-+++ include/net-snmp/system/freebsd15.h	2023-09-03 22:24:08.956666000 -0700
+--- include/net-snmp/system/freebsd15.h.orig	2024-03-02 16:01:17 UTC
+++ include/net-snmp/system/freebsd15.h
@@ -0,0 +1,3 @@
-+/* freebsd15 is a superset of freebsd14 */
-+#include "freebsd14.h"
-+#define freebsd14 freebsd14
+/* freebsd14 is a superset of freebsd13 */
+#include "freebsd13.h"
+#define freebsd13 freebsd13
--- a/net-mgmt/net-snmp/files/patch-net-snmp-create-v3-user.in
+++ b/net-mgmt/net-snmp/files/patch-net-snmp-create-v3-user.in
@ -1,19 +1,11 @@
--- net-snmp-create-v3-user.in.orig	2021-05-25 22:19:35 UTC
+--- net-snmp-create-v3-user.in.orig	2023-08-15 20:32:01 UTC
 +++ net-snmp-create-v3-user.in
@@ -3,7 +3,7 @@
 # this shell script is designed to add new SNMPv3 users
 # to Net-SNMP config file.
 
-if @PSCMD@ | egrep ' snmpd *$' > /dev/null 2>&1 ; then
+-if @PSCMD@ | @EGREP@ ' snmpd *$' > /dev/null 2>&1 ; then
 +if @PSCMD@ -J 0 | egrep ' snmpd *$' > /dev/null 2>&1 ; then
-     echo "Apparently at least one snmpd demon is already running."
+     echo "Apparently at least one snmpd daemon is already running."
     echo "You must stop them in order to use this command."
     exit 1
-@@ -135,6 +135,7 @@ if test ! -d "$outfile"; then
- fi
- echo "$line" >> "$outfile"
- # Avoid that configure complains that this script ignores @datarootdir@
-+datarootdir="@datarootdir@"
- echo "@datarootdir@" >/dev/null
- outfile="@datadir@/snmp/snmpd.conf"
- line="$token $user"
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@ -11,7 +11,6 @@ bin/net-snmp-create-v3-user
 bin/snmp-bridge-mib
 bin/snmpbulkget
 bin/snmpbulkwalk
-bin/snmppcap
 bin/snmpcheck
 bin/snmpconf
 bin/snmpdelta
@ -20,14 +19,15 @@ bin/snmpget
 bin/snmpgetnext
 bin/snmpinform
 bin/snmpnetstat
+bin/snmppcap
 bin/snmpping
 bin/snmpps
 bin/snmpset
 bin/snmpstatus
 bin/snmptable
 bin/snmptest
-bin/snmptop
 %%TLS%%bin/snmptls
+bin/snmptop
 bin/snmptranslate
 bin/snmptrap
 bin/snmpusm
@ -59,8 +59,8 @@ include/net-snmp/agent/mib_module_includes.h
 include/net-snmp/agent/mib_modules.h
 include/net-snmp/agent/mode_end_call.h
 include/net-snmp/agent/multiplexer.h
-include/net-snmp/agent/netsnmp_close_fds.h
 include/net-snmp/agent/net-snmp-agent-includes.h
+include/net-snmp/agent/netsnmp_close_fds.h
 include/net-snmp/agent/null.h
 include/net-snmp/agent/old_api.h
 include/net-snmp/agent/read_only.h
@ -84,10 +84,9 @@ include/net-snmp/agent/table_dataset.h
 include/net-snmp/agent/table_iterator.h
 include/net-snmp/agent/table_tdata.h
 include/net-snmp/agent/util_funcs.h
+include/net-snmp/agent/util_funcs/MIB_STATS_CACHE_TIMEOUT.h
 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
-@dir 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
@ -96,7 +95,6 @@ include/net-snmp/library/README
 include/net-snmp/library/asn1.h
 include/net-snmp/library/callback.h
 include/net-snmp/library/cert_util.h
-include/net-snmp/library/oid.h
 include/net-snmp/library/check_varbind.h
 include/net-snmp/library/container.h
 include/net-snmp/library/container_binary_array.h
@ -106,7 +104,6 @@ include/net-snmp/library/container_null.h
 include/net-snmp/library/data_list.h
 include/net-snmp/library/default_store.h
 include/net-snmp/library/dir_utils.h
-include/net-snmp/library/factory.h
 include/net-snmp/library/fd_event_manager.h
 include/net-snmp/library/file_utils.h
 include/net-snmp/library/getopt.h
@ -118,6 +115,7 @@ include/net-snmp/library/md5.h
 include/net-snmp/library/mib.h
 include/net-snmp/library/mt_support.h
 include/net-snmp/library/netsnmp-attribute-format.h
+include/net-snmp/library/oid.h
 include/net-snmp/library/oid_stash.h
 include/net-snmp/library/parse.h
 include/net-snmp/library/read_config.h
@ -127,12 +125,17 @@ include/net-snmp/library/snmp.h
 include/net-snmp/library/snmpAliasDomain.h
 include/net-snmp/library/snmpCallbackDomain.h
 %%TLS%%include/net-snmp/library/snmpDTLSUDPDomain.h
-include/net-snmp/library/snmpIPBaseDomain.h
+include/net-snmp/library/snmpIPv4BaseDomain.h
+include/net-snmp/library/snmpIPv6BaseDomain.h
+include/net-snmp/library/snmpSocketBaseDomain.h
+include/net-snmp/library/snmpTCPBaseDomain.h
 include/net-snmp/library/snmpTCPDomain.h
 include/net-snmp/library/snmpTCPIPv6Domain.h
 %%TLS%%include/net-snmp/library/snmpTLSBaseDomain.h
 %%TLS%%include/net-snmp/library/snmpTLSTCPDomain.h
+include/net-snmp/library/snmpUDPBaseDomain.h
 include/net-snmp/library/snmpUDPDomain.h
+include/net-snmp/library/snmpUDPIPv4BaseDomain.h
 include/net-snmp/library/snmpUDPIPv6Domain.h
 include/net-snmp/library/snmpUnixDomain.h
 include/net-snmp/library/snmp_alarm.h
@ -151,12 +154,6 @@ include/net-snmp/library/snmp_transport.h
 include/net-snmp/library/snmpusm.h
 include/net-snmp/library/snmpv3-security-includes.h
 include/net-snmp/library/snmpv3.h
-include/net-snmp/library/snmpIPv6BaseDomain.h
-include/net-snmp/library/snmpUDPBaseDomain.h
-include/net-snmp/library/snmpUDPIPv4BaseDomain.h
-include/net-snmp/library/snmpTCPBaseDomain.h
-include/net-snmp/library/snmpSocketBaseDomain.h
-include/net-snmp/library/snmpIPv4BaseDomain.h
 include/net-snmp/library/system.h
 include/net-snmp/library/text_utils.h
 include/net-snmp/library/tools.h
@ -185,6 +182,12 @@ include/net-snmp/system/darwin.h
 include/net-snmp/system/dragonfly.h
 include/net-snmp/system/dynix.h
 include/net-snmp/system/freebsd.h
+include/net-snmp/system/freebsd10.h
+include/net-snmp/system/freebsd11.h
+include/net-snmp/system/freebsd12.h
+include/net-snmp/system/freebsd13.h
+include/net-snmp/system/freebsd14.h
+include/net-snmp/system/freebsd15.h
 include/net-snmp/system/freebsd2.h
 include/net-snmp/system/freebsd3.h
 include/net-snmp/system/freebsd4.h
@ -193,12 +196,6 @@ include/net-snmp/system/freebsd6.h
 include/net-snmp/system/freebsd7.h
 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/freebsd13.h
-include/net-snmp/system/freebsd14.h
-include/net-snmp/system/freebsd15.h
 include/net-snmp/system/generic.h
 include/net-snmp/system/hpux.h
 include/net-snmp/system/irix.h
@ -249,6 +246,8 @@ lib/libnetsnmptrapd.so.%%SHLIB_VERSION%%
 lib/libnetsnmptrapd.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%%
 libdata/pkgconfig/netsnmp-agent.pc
 libdata/pkgconfig/netsnmp.pc
+sbin/snmpd
+sbin/snmptrapd
 share/man/man1/agentxtrap.1.gz
 share/man/man1/encode_keychange.1.gz
 share/man/man1/fixproc.1.gz
@ -415,8 +414,6 @@ share/man/man8/snmptrapd.8.gz
 %%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
-sbin/snmpd
-sbin/snmptrapd
 %%PORTDOCS%%%%DOCSDIR%%/AGENT.txt
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
@ -427,30 +424,6 @@ sbin/snmptrapd
 %%PORTDOCS%%%%DOCSDIR%%/README.snmpv3
 %%PORTDOCS%%%%DOCSDIR%%/README.thread
 %%PORTDOCS%%%%DOCSDIR%%/README.smux
-%%DATADIR%%/snmpd.conf.example
-%%DATADIR%%/snmp_perl_trapd.pl
-%%DATADIR%%/mib2c.access_functions.conf
-%%DATADIR%%/mib2c.array-user.conf
-%%DATADIR%%/mib2c.check_values.conf
-%%DATADIR%%/mib2c.check_values_local.conf
-%%DATADIR%%/mib2c.column_defines.conf
-%%DATADIR%%/mib2c.column_enums.conf
-%%DATADIR%%/mib2c.column_storage.conf
-%%DATADIR%%/mib2c.conf
-%%DATADIR%%/mib2c.container.conf
-%%DATADIR%%/mib2c.create-dataset.conf
-%%DATADIR%%/mib2c.genhtml.conf
-%%DATADIR%%/mib2c.int_watch.conf
-%%DATADIR%%/mib2c.iterate.conf
-%%DATADIR%%/mib2c.iterate_access.conf
-%%DATADIR%%/mib2c.mfd.conf
-%%DATADIR%%/mib2c.notify.conf
-%%DATADIR%%/mib2c.old-api.conf
-%%DATADIR%%/mib2c.org-mode.conf
-%%DATADIR%%/mib2c.perl.conf
-%%DATADIR%%/mib2c.raw-table.conf
-%%DATADIR%%/mib2c.scalar.conf
-%%DATADIR%%/mib2c.table_data.conf
 %%DATADIR%%/mib2c-data/default-mfd-top.m2c
 %%DATADIR%%/mib2c-data/details-enums.m2i
 %%DATADIR%%/mib2c-data/details-node.m2i
@ -460,12 +433,12 @@ sbin/snmptrapd
 %%DATADIR%%/mib2c-data/generic-ctx-set.m2i
 %%DATADIR%%/mib2c-data/generic-data-allocate.m2i
 %%DATADIR%%/mib2c-data/generic-data-context.m2i
+%%DATADIR%%/mib2c-data/generic-get-U64.m2i
 %%DATADIR%%/mib2c-data/generic-get-char.m2i
 %%DATADIR%%/mib2c-data/generic-get-decl-bot.m2i
 %%DATADIR%%/mib2c-data/generic-get-decl.m2i
 %%DATADIR%%/mib2c-data/generic-get-long.m2i
 %%DATADIR%%/mib2c-data/generic-get-oid.m2i
-%%DATADIR%%/mib2c-data/generic-get-U64.m2i
 %%DATADIR%%/mib2c-data/generic-header-bottom.m2i
 %%DATADIR%%/mib2c-data/generic-header-top.m2i
 %%DATADIR%%/mib2c-data/generic-source-includes.m2i
@ -518,6 +491,28 @@ sbin/snmptrapd
 %%DATADIR%%/mib2c-data/syntax-RowStatus-varbind-validate.m2i
 %%DATADIR%%/mib2c-data/syntax-StorageType-dependencies.m2i
 %%DATADIR%%/mib2c-data/syntax-TestAndIncr-get.m2i
+%%DATADIR%%/mib2c.access_functions.conf
+%%DATADIR%%/mib2c.array-user.conf
+%%DATADIR%%/mib2c.check_values.conf
+%%DATADIR%%/mib2c.check_values_local.conf
+%%DATADIR%%/mib2c.column_defines.conf
+%%DATADIR%%/mib2c.column_enums.conf
+%%DATADIR%%/mib2c.column_storage.conf
+%%DATADIR%%/mib2c.conf
+%%DATADIR%%/mib2c.container.conf
+%%DATADIR%%/mib2c.create-dataset.conf
+%%DATADIR%%/mib2c.genhtml.conf
+%%DATADIR%%/mib2c.int_watch.conf
+%%DATADIR%%/mib2c.iterate.conf
+%%DATADIR%%/mib2c.iterate_access.conf
+%%DATADIR%%/mib2c.mfd.conf
+%%DATADIR%%/mib2c.notify.conf
+%%DATADIR%%/mib2c.old-api.conf
+%%DATADIR%%/mib2c.org-mode.conf
+%%DATADIR%%/mib2c.perl.conf
+%%DATADIR%%/mib2c.raw-table.conf
+%%DATADIR%%/mib2c.scalar.conf
+%%DATADIR%%/mib2c.table_data.conf
 %%DATADIR%%/mibs/AGENTX-MIB.txt
 %%DATADIR%%/mibs/BRIDGE-MIB.txt
 %%DATADIR%%/mibs/DISMAN-EVENT-MIB.txt
@ -536,14 +531,13 @@ sbin/snmptrapd
 %%DATADIR%%/mibs/INET-ADDRESS-MIB.txt
 %%DATADIR%%/mibs/IP-FORWARD-MIB.txt
 %%DATADIR%%/mibs/IP-MIB.txt
-%%DATADIR%%/mibs/IPV6-ICMP-MIB.txt
 %%DATADIR%%/mibs/IPV6-FLOW-LABEL-MIB.txt
+%%DATADIR%%/mibs/IPV6-ICMP-MIB.txt
 %%DATADIR%%/mibs/IPV6-MIB.txt
 %%DATADIR%%/mibs/IPV6-TC.txt
 %%DATADIR%%/mibs/IPV6-TCP-MIB.txt
 %%DATADIR%%/mibs/IPV6-UDP-MIB.txt
 %%DATADIR%%/mibs/MTA-MIB.txt
-%%DATADIR%%/mibs/NETWORK-SERVICES-MIB.txt
 %%DATADIR%%/mibs/NET-SNMP-AGENT-MIB.txt
 %%DATADIR%%/mibs/NET-SNMP-EXAMPLES-MIB.txt
 %%DATADIR%%/mibs/NET-SNMP-EXTEND-MIB.txt
@ -551,6 +545,7 @@ sbin/snmptrapd
 %%DATADIR%%/mibs/NET-SNMP-PASS-MIB.txt
 %%DATADIR%%/mibs/NET-SNMP-TC.txt
 %%DATADIR%%/mibs/NET-SNMP-VACM-MIB.txt
+%%DATADIR%%/mibs/NETWORK-SERVICES-MIB.txt
 %%DATADIR%%/mibs/NOTIFICATION-LOG-MIB.txt
 %%DATADIR%%/mibs/RFC-1215.txt
 %%DATADIR%%/mibs/RFC1155-SMI.txt
@ -577,14 +572,15 @@ sbin/snmptrapd
 %%DATADIR%%/mibs/SNMPv2-TC.txt
 %%DATADIR%%/mibs/SNMPv2-TM.txt
 %%DATADIR%%/mibs/TCP-MIB.txt
-%%DATADIR%%/mibs/TUNNEL-MIB.txt
 %%DATADIR%%/mibs/TRANSPORT-ADDRESS-MIB.txt
+%%DATADIR%%/mibs/TUNNEL-MIB.txt
 %%DATADIR%%/mibs/UCD-DEMO-MIB.txt
 %%DATADIR%%/mibs/UCD-DISKIO-MIB.txt
 %%DATADIR%%/mibs/UCD-DLMOD-MIB.txt
 %%DATADIR%%/mibs/UCD-IPFWACC-MIB.txt
 %%DATADIR%%/mibs/UCD-SNMP-MIB.txt
 %%DATADIR%%/mibs/UDP-MIB.txt
+%%DATADIR%%/snmp_perl_trapd.pl
@postunexec rm -f %D/%%DATADIR%%/mibs/.index 2>/dev/null || true
 %%WITH_PERL_EMBEDDED%%%%DATADIR%%/snmp_perl.pl
 %%DATADIR%%/snmpconf-data/snmp-data/authopts
@ -606,6 +602,7 @@ sbin/snmptrapd
 %%DATADIR%%/snmpconf-data/snmptrapd-data/runtime
 %%DATADIR%%/snmpconf-data/snmptrapd-data/snmpconf-config
 %%DATADIR%%/snmpconf-data/snmptrapd-data/traphandle
+%%DATADIR%%/snmpd.conf.example
@dir /var/agentx
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__init__.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc