Index: head/net-mgmt/net-snmp/Makefile =================================================================== --- head/net-mgmt/net-snmp/Makefile (revision 548357) +++ head/net-mgmt/net-snmp/Makefile (revision 548358) @@ -1,320 +1,324 @@ # Created by: gpalmer # $FreeBSD$ PORTNAME= snmp -PORTVERSION= 5.7.3 -PORTREVISION= 20 +PORTVERSION= 5.9 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION} \ ZI PKGNAMEPREFIX= net- DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} MAINTAINER= zi@FreeBSD.org COMMENT= Extendable SNMP implementation LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING NOT_FOR_ARCHS= mips mips64 NOT_FOR_ARCHS_REASON= SSP is currently broken on MIPS OPTIONS_DEFINE= IPV6 MFD_REWRITES PERL PERL_EMBEDDED PYTHON DUMMY TKMIB \ MYSQL AX_SOCKONLY UNPRIVILEGED SMUX DOCS JAIL AX_DISABLE_TRAP \ - TLS NEWSYSLOG + TLS NEWSYSLOG NOLIBPKG OPTIONS_DEFAULT=PERL PERL_EMBEDDED DUMMY SMUX NEWSYSLOG OPTIONS_SUB= yes MFD_REWRITES_DESC= Use new MFD rewrites of mib modules PERL_EMBEDDED_DESC= Build embedded perl DUMMY_DESC= Enable dummy values as placeholders TKMIB_DESC= Install graphical MIB browser AX_SOCKONLY_DESC= Disable UDP/TCP transports for agentx AX_DISABLE_TRAP_DESC= Disable agentx subagent code in snmptrapd UNPRIVILEGED_DESC= Allow unprivileged users to execute net-snmp SMUX_DESC= Build with SNMP multiplexing (SMUX) support JAIL_DESC= Options for running snmpd within a jail(8) NEWSYSLOG_DESC= Automatically rotate snmpd.log via newsyslog +NOLIBPKG_DESC= Build without libpkg MAKE_JOBS_UNSAFE= yes PORTSCOUT= skipv:5.7.2.1 GNU_CONFIGURE= yes USE_RC_SUBR= snmpd snmptrapd USE_LDCONFIG= yes USES= cpe libtool perl5 ssl CPE_VENDOR= net-snmp USE_PERL5= build run USE_CSTD= c99 CFLAGS+= -I${LOCALBASE}/include -I${PKG_PREFIX}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= PERLPROG="${PERL}" PSPROG="${PS_CMD}" SED="${SED}" CONFIGURE_ARGS+=--enable-shared --enable-internal-md5 \ --with-default-snmp-version="${DEFAULT_SNMP_VERSION}" \ --with-sys-contact="${NET_SNMP_SYS_CONTACT}" \ --with-sys-location="${NET_SNMP_SYS_LOCATION}" \ --with-logfile="${NET_SNMP_LOGFILE}" \ --with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" \ --with-gnu-ld --without-libwrap \ --with-ldflags="-lm -lkvm -ldevstat -L${PKG_PREFIX}/lib -L${LOCALBASE}/lib ${LCRYPTO}" SUB_FILES= pkg-message .if !defined(WITHOUT_SSP) CONFIGURE_ARGS+=--with-libs="-lssp_nonshared" .endif .if defined(BATCH) CONFIGURE_ARGS+=--with-defaults .endif TLS_CONFIGURE_ON= --with-security-modules=tsm --with-transports=TLSTCP,DTLSUDP .include -.if (${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085) || ${SSL_DEFAULT:Mopenssl} -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-openssl11 -.endif - .if ${PORT_OPTIONS:MPYTHON} PYDISTUTILS_PKGNAME?= netsnmp-python PYDISTUTILS_PKGVERSION?= 1.0a1 USES+= python:2.7 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} CONFIGURE_ARGS+=--with-python-modules CONFIGURE_ENV+= PYTHONPROG="${PYTHON_CMD}" MAKE_ENV+= PYDISTUTILS_INSTALLARGS="${PYDISTUTILS_INSTALLARGS}" STAGEDIR="${STAGEDIR}" PLIST_SUB+= WITH_PYTHON="" PYTHON_VER=${PYTHON_VER} PLIST_SUB+= PYDISTUTILS_PKGVERSION=${PYDISTUTILS_PKGVERSION} .else PLIST_SUB+= WITH_PYTHON="@comment " .endif CONFIGURE_ARGS+=--with-openssl="${OPENSSLBASE}" .if ${PORT_OPTIONS:MDUMMY} CONFIGURE_ARGS+=--with-dummy-values .endif .if ! ${PORT_OPTIONS:MTKMIB} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-local_Makefile.in PLIST_SUB+= WITH_TKMIB="@comment " .else RUN_DEPENDS+= p5-Tk>=0:x11-toolkits/p5-Tk PLIST_SUB+= WITH_TKMIB="" .endif .if ${PORT_OPTIONS:MPERL} CONFIGURE_ARGS+=--with-perl-modules .if ! ${PORT_OPTIONS:MPERL_EMBEDDED} CONFIGURE_ARGS+=--disable-embedded-perl PLIST_SUB+= WITH_PERL_EMBEDDED="@comment " .else CONFIGURE_ARGS+=--enable-embedded-perl PLIST_SUB+= WITH_PERL_EMBEDDED="" .endif PLIST_SUB+= WITH_PERL="" .else USE_PERL5= build CONFIGURE_ARGS+=--disable-embedded-perl --without-perl-modules PLIST_SUB+= WITH_PERL_EMBEDDED="@comment " PLIST_SUB+= WITH_PERL="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} USES+= mysql CONFIGURE_ARGS+=--with-mysql CONFIGURE_ENV+= MYSQLCONFIG=${LOCALBASE}/bin/mysql_config .endif .if ${PORT_OPTIONS:MAX_DISABLE_TRAP} CONFIGURE_ARGS+=--disable-snmptrapd-subagent .endif .if ${PORT_OPTIONS:MAX_SOCKONLY} CONFIGURE_ARGS+=--enable-agentx-dom-sock-only .endif .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+=--enable-ipv6 # --with-transport="UDPIPv6 TCPIPv6" --with-modules=mibII/ipv6" PLIST_SUB+= WITH_IPV6="" .else PLIST_SUB+= WITH_IPV6="@comment " .endif .if ${PORT_OPTIONS:MUNPRIVILEGED} CONFIGURE_ARGS+=--without-root-access .endif -SHLIB_VERSION= 30 -SHLIB_VERSION2= .0.3 +SHLIB_VERSION= 40 +SHLIB_VERSION2= .0.0 PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} SHLIB_VERSION2=${SHLIB_VERSION2} SCRIPTS_SUB= PREFIX=${PREFIX} PERL=${PERL} DEFAULT_SNMP_VERSION?= 3 NET_SNMP_SYS_CONTACT?= nobody@nowhere.invalid NET_SNMP_SYS_LOCATION?= somewhere NET_SNMP_LOGFILE?= /var/log/snmpd.log NET_SNMP_PERSISTENTDIR?=/var/net-snmp NET_SNMP_WITH_MIB_MODULE_LIST+= host disman/event-mib mibII/mta_sendmail mibII/tcpTable ucd-snmp/diskio sctp-mib .if ${OPSYS} == FreeBSD NET_SNMP_WITHOUT_MIB_MODULE_LIST+= mibII/ipv6 .endif .if ${PORT_OPTIONS:MMFD_REWRITES} CONFIGURE_ARGS+=--enable-mfd-rewrites NET_SNMP_WITH_MIB_MODULE_LIST+= if-mib .endif .if ${PORT_OPTIONS:MJAIL} NET_SNMP_WITHOUT_MIB_MODULE_LIST+= host NET_SNMP_WITHOUT_MIB_MODULE_LIST+= ucd-snmp/memory CONFIGURE_ARGS+= --without-kmem-usage .endif .if ${PORT_OPTIONS:MSMUX} NET_SNMP_WITH_MIB_MODULE_LIST+= smux .else NET_SNMP_WITHOUT_MIB_MODULE_LIST+= smux .endif .if defined(NET_SNMP_WITH_MIB_MODULE_LIST) && \ !empty(NET_SNMP_WITH_MIB_MODULE_LIST) CONFIGURE_ARGS+=--with-mib-modules="${NET_SNMP_WITH_MIB_MODULE_LIST}" .endif .if defined(NET_SNMP_WITHOUT_MIB_MODULE_LIST) && \ !empty(NET_SNMP_WITHOUT_MIB_MODULE_LIST) CONFIGURE_ARGS+=--with-out-mib-modules="${NET_SNMP_WITHOUT_MIB_MODULE_LIST}" .endif BIN_FILES= snmpbulkwalk snmpget snmpgetnext snmpset \ snmpstatus snmptest snmptranslate snmptrap snmpwalk \ snmptable snmpbulkget snmpdelta snmpdf agentxtrap \ - snmpvacm snmpusm encode_keychange snmpnetstat + snmpps snmpping snmppcap snmpvacm snmpusm \ + encode_keychange snmpnetstat LIB_FILES= libnetsnmp.so.${SHLIB_VERSION}${SHLIB_VERSION2} \ libnetsnmpagent.so.${SHLIB_VERSION}${SHLIB_VERSION2} \ libnetsnmpmibs.so.${SHLIB_VERSION}${SHLIB_VERSION2} \ libnetsnmphelpers.so.${SHLIB_VERSION}${SHLIB_VERSION2} \ libnetsnmptrapd.so.${SHLIB_VERSION}${SHLIB_VERSION2} SBIN_FILES= snmpd snmptrapd STARTUP_DIR= ${PREFIX}/etc/rc.d SCRIPT_FILES= snmpcheck.def mib2c fixproc ipf-mod.pl traptoemail .if ${PORT_OPTIONS:MTKMIB} SCRIPT_FILES+= tkmib .endif DOC_FILES= AGENT.txt COPYING FAQ NEWS README \ README.agentx README.krb5 README.snmpv3 README.thread \ agent/mibgroup/README.smux CONFLICTS= ucd-snmp-4.* net-snmp-5.3.* .include .if ${SSL_DEFAULT} != base LCRYPTO= -lcrypto .else LCRYPTO= .endif pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "You may use the following build options:" @${ECHO_MSG} @${ECHO_MSG} "DEFAULT_SNMP_VERSION=\"3\" Default version of SNMP to use." @${ECHO_MSG} "NET_SNMP_SYS_CONTACT=\"${NET_SNMP_SYS_CONTACT}\"" @${ECHO_MSG} " Default system contact." @${ECHO_MSG} "NET_SNMP_SYS_LOCATION=\"${NET_SNMP_SYS_LOCATION}\"" @${ECHO_MSG} " Default system location." @${ECHO_MSG} "NET_SNMP_LOGFILE=\"${NET_SNMP_LOGFILE}\"" @${ECHO_MSG} " Default log file location for snmpd." @${ECHO_MSG} "NET_SNMP_PERSISTENTDIR=\"${NET_SNMP_PERSISTENTDIR}\"" @${ECHO_MSG} " Default directory for persistent data storage." @${ECHO_MSG} "NET_SNMP_WITH_MIB_MODULE_LIST=\"${NET_SNMP_WITH_MIB_MODULE_LIST}\"" @${ECHO_MSG} " MIBs to add to the build." @${ECHO_MSG} "NET_SNMP_WITHOUT_MIB_MODULE_LIST=\"${NET_SNMP_WITHOUT_MIB_MODULE_LIST}\"" @${ECHO_MSG} " MIBs to omit from the build." @${ECHO_MSG} post-patch: -.for filename in ${SCRIPT_FILES} - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/local/${filename} -.endfor - @${REINPLACE_CMD} -e 's!utmp_p->ut_name!utmp_p->ut_user!' \ - ${WRKSRC}/agent/mibgroup/host/hr_system.c @${REINPLACE_CMD} -E -e 's|return pci_lookup_name|disabled broken|g' \ ${WRKSRC}/configure .if (${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085) || ${SSL_DEFAULT:Mopenssl} @${REINPLACE_CMD} -E -e 's|SSL_library_init|OPENSSL_init_ssl|g' \ ${WRKSRC}/configure .endif @${CP} ${WRKSRC}/include/net-snmp/system/freebsd12.h \ ${WRKSRC}/include/net-snmp/system/freebsd13.h +.for header in darwin7.h darwin8.h darwin9.h darwin10.h darwin11.h darwin12.h \ + darwin13.h darwin14.h darwin15.h darwin16.h darwin17.h + @${CP} ${WRKSRC}/include/net-snmp/system/darwin.h \ + ${WRKSRC}/include/net-snmp/system/${header} +.endfor +.if ${PORT_OPTIONS:MNOLIBPKG} +pre-configure: + ${REINPLACE_CMD} \ + -e 's|pkg[.]h|ignore-pkg.h|g' \ + -e 's|in pkg ;|in ignore-pkg ;|' \ + ${WRKSRC}/configure +.endif + post-configure: @${FIND} ${WRKSRC} -name Makefile | \ ${XARGS} ${REINPLACE_CMD} -E -e '/^INSTALL[ ]+=/s|$$| -m 755|' .for hdr in sys/mbuf.h netinet/in_pcb.h netinet/in_var.h netinet/ip6.h pkg.h @${REINPLACE_CMD} -E -e '\ s!^.*#undef.*(HAVE_${hdr:tu:S/./_/g:S/\//_/g}).*$$!#define \1 1!g' \ ${WRKSRC}/include/net-snmp/net-snmp-config.h .endfor .if ${PORT_OPTIONS:MPYTHON} @(cd ${WRKSRC}/python; \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist_egg \ -o plat-name -s "" --basedir=${WRKSRC}; \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist \ -o plat-name -s "" --basedir=${WRKSRC}) .endif post-build: .if ${PORT_OPTIONS:MPERL} ${FIND} ${WRKSRC}/perl -name Makefile | \ ${XARGS} ${REINPLACE_CMD} -E -e '\ s!^(PREFIX) = .*!\1 = ${PREFIX}!; \ s!^(INSTALLMAN3DIR|INSTALLSITEMAN3DIR) = .*!\1 = ${PREFIX}/man/man3!; \ s!^(INSTALLSITELIB|INSTALLSITEARCH) = /usr/local/(.*)!\1 = ${PREFIX}/\2!; \ s! doc_(perl|site|\$$\(INSTALLDIRS\))_install$$!!; \ ' .else ${REINPLACE_CMD} -e 's| perlinstall||' ${WRKSRC}/Makefile .endif post-install: strip-files install-config-files install-doc-files @${MKDIR} ${STAGEDIR}/var/agentx @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmp.so.${SHLIB_VERSION} libnetsnmp.so) @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmpagent.so.${SHLIB_VERSION} libnetsnmpagent.so) @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmphelpers.so.${SHLIB_VERSION} libnetsnmphelpers.so) @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmpmibs.so.${SHLIB_VERSION} libnetsnmpmibs.so) @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmptrapd.so.${SHLIB_VERSION} libnetsnmptrapd.so) .if ${PORT_OPTIONS:MNEWSYSLOG} @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d - ${INSTALL_DATA} ${FILESDIR}/net-snmp.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/ + ${INSTALL_DATA} ${FILESDIR}/net-snmp.conf ${STAGEDIR}${DATADIR}/newsyslog.conf.sample .endif strip-files: (cd ${STAGEDIR}${PREFIX}/bin; ${STRIP_CMD} ${BIN_FILES}) (cd ${STAGEDIR}${PREFIX}/lib; ${STRIP_CMD} ${LIB_FILES}) (cd ${STAGEDIR}${PREFIX}/sbin; ${STRIP_CMD} ${SBIN_FILES}) install-config-files: ${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf ${STAGEDIR}${DATADIR}/snmpd.conf.example install-doc-files: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} . for filename in ${DOC_FILES} ${INSTALL_DATA} ${WRKSRC}/${filename} ${STAGEDIR}${DOCSDIR} . endfor .endif # Maintainer's note: # Don't forget to bump library version in these ports. # french/plgrenouille,graphics/hpoj,lang/php4,lang/php5,mail/cyrus-imapd22,mail/cyrus-imapd23,misc/kdeutils3,net-mgmt/braa,net-mgmt/docsis,net-mgmt/mbrowse,net-mgmt/nagios-snmp-plugins,net-mgmt/p5-SNMP-Info,net-mgmt/py-yapsnmp,net-mgmt/sdig,net-mgmt/zabbix,net/cactid,net/wireshark,net/ifstat,net/quagga,net/rtg,print/hplip,security/libfwbuilder,sysutils/apcupsd,sysutils/jailadmin,sysutils/nut .include Index: head/net-mgmt/net-snmp/distinfo =================================================================== --- head/net-mgmt/net-snmp/distinfo (revision 548357) +++ head/net-mgmt/net-snmp/distinfo (revision 548358) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538855961 -SHA256 (net-snmp-5.7.3.tar.gz) = 12ef89613c7707dc96d13335f153c1921efc9d61d3708ef09f3fc4a7014fb4f0 -SIZE (net-snmp-5.7.3.tar.gz) = 6382428 +TIMESTAMP = 1599226037 +SHA256 (net-snmp-5.9.tar.gz) = 04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071 +SIZE (net-snmp-5.9.tar.gz) = 6690435 Index: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_udp-mib_data__access_udp__endpoint__freebsd4.c =================================================================== --- head/net-mgmt/net-snmp/files/patch-agent_mibgroup_udp-mib_data__access_udp__endpoint__freebsd4.c (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-agent_mibgroup_udp-mib_data__access_udp__endpoint__freebsd4.c (nonexistent) @@ -1,58 +0,0 @@ ---- agent/mibgroup/udp-mib/data_access/udp_endpoint_freebsd4.c.orig 2014-12-08 12:23:22.000000000 -0800 -+++ agent/mibgroup/udp-mib/data_access/udp_endpoint_freebsd4.c 2017-04-07 16:05:05.752849000 -0700 -@@ -153,7 +153,11 @@ - #endif - - #if !defined(NETSNMP_ENABLE_IPV6) -+#if __FreeBSD_version >= 1200026 -+ if (pcb.inp_vflag & INP_IPV6) -+#else - if (pcb.xi_inp.inp_vflag & INP_IPV6) -+#endif - continue; - #endif - -@@ -164,9 +168,24 @@ - } - - /** oddly enough, these appear to already be in network order */ -+#if __FreeBSD_version >= 1200026 -+ entry->loc_port = htons(pcb.inp_lport); -+ entry->rmt_port = htons(pcb.inp_fport); -+ -+ /** the addr string may need work */ -+ if (pcb.inp_vflag & INP_IPV6) { -+ entry->loc_addr_len = entry->rmt_addr_len = 16; -+ memcpy(entry->loc_addr, &pcb.in6p_laddr, 16); -+ memcpy(entry->rmt_addr, &pcb.in6p_faddr, 16); -+ } -+ else { -+ entry->loc_addr_len = entry->rmt_addr_len = 4; -+ memcpy(entry->loc_addr, &pcb.inp_laddr, 4); -+ memcpy(entry->rmt_addr, &pcb.inp_faddr, 4); -+ } -+#else - entry->loc_port = htons(pcb.xi_inp.inp_lport); - entry->rmt_port = htons(pcb.xi_inp.inp_fport); -- entry->pid = 0; - - /** the addr string may need work */ - if (pcb.xi_inp.inp_vflag & INP_IPV6) { -@@ -179,6 +198,8 @@ - memcpy(entry->loc_addr, &pcb.xi_inp.inp_laddr, 4); - memcpy(entry->rmt_addr, &pcb.xi_inp.inp_faddr, 4); - } -+#endif -+ entry->pid = 0; - - /* - * add entry to container -@@ -187,6 +208,8 @@ - CONTAINER_INSERT(container, entry); - } - -+ free(udpcb_buf); -+ - if(rc<0) - return rc; - Property changes on: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_udp-mib_data__access_udp__endpoint__freebsd4.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-transform_oids.h =================================================================== --- head/net-mgmt/net-snmp/files/patch-transform_oids.h (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-transform_oids.h (nonexistent) @@ -1,11 +0,0 @@ ---- include/net-snmp/library/transform_oids.h.orig 2006-10-28 05:19:44.000000000 +0900 -+++ include/net-snmp/library/transform_oids.h 2008-03-26 07:50:45.393507729 +0900 -@@ -23,6 +23,8 @@ - /* XXX: OIDs not defined yet */ - NETSNMP_IMPORT oid usmAESPrivProtocol[10]; /* == { 1,3,6,1,6,3,10,1,2,4 }; */ - NETSNMP_IMPORT oid *usmAES128PrivProtocol; /* backwards compat */ -+NETSNMP_IMPORT oid *usmAES192PrivProtocol; /* backwards compat */ -+NETSNMP_IMPORT oid *usmAES256PrivProtocol; /* backwards compat */ - - #define USM_AUTH_PROTO_NOAUTH_LEN 10 - #define USM_AUTH_PROTO_MD5_LEN 10 Property changes on: head/net-mgmt/net-snmp/files/patch-transform_oids.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-include__net-snmp__net-snmp-config.h.in =================================================================== --- head/net-mgmt/net-snmp/files/patch-include__net-snmp__net-snmp-config.h.in (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-include__net-snmp__net-snmp-config.h.in (nonexistent) @@ -1,11 +0,0 @@ ---- ./include/net-snmp/net-snmp-config.h.in.orig 2012-10-09 18:28:58.000000000 -0400 -+++ ./include/net-snmp/net-snmp-config.h.in 2012-10-14 11:37:35.000000000 -0400 -@@ -2106,7 +2106,7 @@ - #define UCD_SNMP_LIBRARY 1 - - /* final conclusion on nlist usage */ --#if defined(HAVE_NLIST) && defined(HAVE_STRUCT_NLIST_N_VALUE) && !defined(NETSNMP_DONT_USE_NLIST) && defined(HAVE_KMEM) && !defined(NETSNMP_NO_KMEM_USAGE) -+#if defined(HAVE_NLIST) && defined(HAVE_STRUCT_NLIST_N_VALUE) && !defined(NETSNMP_DONT_USE_NLIST) && !defined(NETSNMP_NO_KMEM_USAGE) - #define NETSNMP_CAN_USE_NLIST - #endif - Property changes on: head/net-mgmt/net-snmp/files/patch-include__net-snmp__net-snmp-config.h.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-agent_Makefile.in =================================================================== --- head/net-mgmt/net-snmp/files/patch-agent_Makefile.in (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-agent_Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- 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@ Property changes on: head/net-mgmt/net-snmp/files/patch-agent_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c =================================================================== --- head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c (nonexistent) @@ -1,11 +0,0 @@ ---- agent/mibgroup/hardware/fsys/fsys_getfsstats.c.orig 2017-03-22 16:28:29 UTC -+++ agent/mibgroup/hardware/fsys/fsys_getfsstats.c -@@ -116,7 +116,7 @@ netsnmp_fsys_arch_load( void ) - /* - * Retrieve information about the currently mounted filesystems... - */ -- n = NSFS_GETFSSTAT( NULL, 0, 0 ); -+ n = NSFS_GETFSSTAT( NULL, 0, MNT_NOWAIT ); - if ( n==0 ) - return; - stats = (struct NSFS_STATFS *)malloc( n * sizeof( struct NSFS_STATFS )); Property changes on: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-Makefile.in =================================================================== --- head/net-mgmt/net-snmp/files/patch-Makefile.in (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-Makefile.in (nonexistent) @@ -1,20 +0,0 @@ ---- Makefile.in.orig 2014-12-08 20:23:22 UTC -+++ Makefile.in -@@ -21,7 +21,7 @@ INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi - darwin.h darwin7.h darwin8.h darwin9.h darwin10.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 \ -- freebsd12.h freebsd.h \ -+ freebsd12.h freebsd13.h freebsd.h \ - generic.h \ - hpux.h irix.h linux.h mingw32.h mips.h netbsd.h osf5.h \ - openbsd.h openbsd5.h openbsd4.h \ -@@ -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 Property changes on: head/net-mgmt/net-snmp/files/patch-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-tcpTable.c =================================================================== --- head/net-mgmt/net-snmp/files/patch-tcpTable.c (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-tcpTable.c (nonexistent) @@ -1,46 +0,0 @@ ---- agent/mibgroup/mibII/tcpTable.c.orig 2017-03-15 17:46:37.000000000 +0000 -+++ agent/mibgroup/mibII/tcpTable.c 2017-03-15 17:46:37.000000000 +0000 -@@ -96,7 +96,11 @@ - - typedef struct netsnmp_inpcb_s netsnmp_inpcb; - struct netsnmp_inpcb_s { -+#if __FreeBSD_version >= 1200026 -+ struct xinpcb pcb; -+#else - struct inpcb pcb; -+#endif - int state; - netsnmp_inpcb *inp_next; - }; -@@ -301,8 +305,10 @@ - #ifndef NETSNMP_FEATURE_REMOVE_TCP_COUNT_CONNECTIONS - int - TCP_Count_Connections( void ) { -+#if (defined(CAN_USE_SYSCTL) && defined(TCPCTL_PCBLIST)) - tcpTable_load(NULL, NULL); - return tcp_estab; -+#endif - } - #endif /* NETSNMP_FEATURE_REMOVE_TCP_COUNT_CONNECTIONS */ - -@@ -923,12 +929,20 @@ - nnew = SNMP_MALLOC_TYPEDEF(netsnmp_inpcb); - if (!nnew) - break; -+#if __FreeBSD_version >= 1200026 -+ nnew->state = StateMap[((NS_ELEM *) xig)->t_state]; -+#else - nnew->state = StateMap[((NS_ELEM *) xig)->xt_tp.t_state]; -+#endif - if (nnew->state == 5 /* established */ || - nnew->state == 8 /* closeWait */ ) - tcp_estab++; - memcpy(&(nnew->pcb), &(((NS_ELEM *) xig)->xt_inp), -+#if __FreeBSD_version >= 1200026 -+ sizeof(struct xinpcb)); -+#else - sizeof(struct inpcb)); -+#endif - - if (nnew->pcb.inp_vflag & INP_IPV6) - free(nnew); Property changes on: head/net-mgmt/net-snmp/files/patch-tcpTable.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-udpTable.c =================================================================== --- head/net-mgmt/net-snmp/files/patch-udpTable.c (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-udpTable.c (nonexistent) @@ -1,26 +0,0 @@ ---- agent/mibgroup/mibII/udpTable.c.orig 2017-03-15 18:08:43.000000000 +0000 -+++ agent/mibgroup/mibII/udpTable.c 2017-03-15 18:08:43.000000000 +0000 -@@ -71,7 +71,11 @@ - #if defined(freebsd4) || defined(darwin) || defined(osf5) - typedef struct netsnmp_inpcb_s netsnmp_inpcb; - struct netsnmp_inpcb_s { -+#if __FreeBSD_version >= 1200026 -+ struct xinpcb pcb; -+#else - struct inpcb pcb; -+#endif - int state; - netsnmp_inpcb *inp_next; - }; -@@ -670,7 +674,11 @@ - nnew = SNMP_MALLOC_TYPEDEF(UDPTABLE_ENTRY_TYPE); - if (!nnew) - break; -+#if __FreeBSD_version >= 1200026 -+ memcpy(&nnew->pcb, xig, sizeof(struct xinpcb)); -+#else - memcpy(&nnew->pcb, &((struct xinpcb *) xig)->xi_inp, sizeof(struct inpcb)); -+#endif - nnew->inp_next = udp_head; - udp_head = nnew; - #if defined(dragonfly) Property changes on: head/net-mgmt/net-snmp/files/patch-udpTable.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-snmpusm.c =================================================================== --- head/net-mgmt/net-snmp/files/patch-snmpusm.c (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-snmpusm.c (nonexistent) @@ -1,11 +0,0 @@ ---- snmplib/snmpusm.c.orig 2011-07-27 09:58:24.000000000 -0300 -+++ snmplib/snmpusm.c 2011-07-27 09:57:48.000000000 -0300 -@@ -91,6 +91,8 @@ - oid usmAESPrivProtocol[10] = { 1, 3, 6, 1, 6, 3, 10, 1, 2, 4 }; - /* backwards compat */ - oid *usmAES128PrivProtocol = usmAESPrivProtocol; -+oid *usmAES192PrivProtocol = usmAESPrivProtocol; -+oid *usmAES256PrivProtocol = usmAESPrivProtocol; - - static u_int dummy_etime, dummy_eboot; /* For ISENGINEKNOWN(). */ - Property changes on: head/net-mgmt/net-snmp/files/patch-snmpusm.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_memory_memory__freebsd.c =================================================================== --- head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_memory_memory__freebsd.c (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_memory_memory__freebsd.c (nonexistent) @@ -1,11 +0,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; - } - Property changes on: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_memory_memory__freebsd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_tcp-mib_data__access_tcpConn__freebsd4.c =================================================================== --- head/net-mgmt/net-snmp/files/patch-agent_mibgroup_tcp-mib_data__access_tcpConn__freebsd4.c (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-agent_mibgroup_tcp-mib_data__access_tcpConn__freebsd4.c (nonexistent) @@ -1,23 +0,0 @@ ---- agent/mibgroup/tcp-mib/data_access/tcpConn_freebsd4.c.orig 2017-03-15 18:15:07.000000000 +0000 -+++ agent/mibgroup/tcp-mib/data_access/tcpConn_freebsd4.c 2017-03-15 18:15:07.000000000 +0000 -@@ -163,7 +163,11 @@ - #else - xig = (struct xinpgen *) ((char *) xig + xig->xig_len); - #endif -+#if __FreeBSD_version >= 1200026 -+ state = StateMap[pcb.t_state]; -+#else - state = StateMap[pcb.xt_tp.t_state]; -+#endif - - if (load_flags) { - if (state == TCPCONNECTIONSTATE_LISTEN) { -@@ -215,6 +219,8 @@ - entry->arbitrary_index = CONTAINER_SIZE(container) + 1; - CONTAINER_INSERT(container, entry); - } -+ -+ free(tcpcb_buf); - - if(rc<0) - return rc; Property changes on: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_tcp-mib_data__access_tcpConn__freebsd4.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd13.h =================================================================== --- head/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd13.h (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd13.h (nonexistent) @@ -1,6 +0,0 @@ ---- include/net-snmp/system/freebsd13.h.orig 2018-12-25 15:35:28 UTC -+++ include/net-snmp/system/freebsd13.h -@@ -0,0 +1,3 @@ -+/* freebsd13 is a superset of freebsd12 */ -+#include "freebsd12.h" -+#define freebsd13 freebsd13 Property changes on: head/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd13.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu_sysctl.c =================================================================== --- head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu_sysctl.c (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu_sysctl.c (nonexistent) @@ -1,49 +0,0 @@ ---- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig 2014-12-08 12:23:22.000000000 -0800 -+++ agent/mibgroup/hardware/cpu/cpu_sysctl.c 2017-04-20 15:05:11.607496000 -0700 -@@ -130,8 +130,21 @@ - #endif /* VM_UVMEXP2 || VM_UVMEXP */ - - #elif defined(__FreeBSD__) /* FreeBSD */ -+#if __FreeBSD_version >= 1200028 -+#define VMMETER_TYPE uint64_t -+#else -+#define VMMETER_TYPE u_int -+#endif -+struct __vmmeter { -+ VMMETER_TYPE v_intr; -+ VMMETER_TYPE v_swtch; -+ VMMETER_TYPE v_swappgsin; -+ VMMETER_TYPE v_swappgsout; -+ VMMETER_TYPE v_swapin; -+ VMMETER_TYPE v_swapout; -+}; - #define NETSNMP_VM_STATS VM_METER --#define NETSNMP_VM_STATS_TYPE struct vmmeter -+#define NETSNMP_VM_STATS_TYPE struct __vmmeter - #define NS_VM_INTR v_intr - #define NS_VM_SWTCH v_swtch - #define NS_VM_PAGEIN v_swappgsin -@@ -206,7 +219,23 @@ - * Interrupt/Context Switch statistics - * XXX - Do these really belong here ? - */ -+#ifdef __FreeBSD__ -+#define GET_VM_STATS(space, name) sysctlbyname("vm.stats." #space "." #name, &mem_stats.name, &len, NULL, 0) -+ { -+ size_t len; -+ -+ len = sizeof(VMMETER_TYPE); -+ GET_VM_STATS(sys, v_intr); -+ GET_VM_STATS(sys, v_swtch); -+ GET_VM_STATS(vm, v_swappgsin); -+ GET_VM_STATS(vm, v_swappgsout); -+ GET_VM_STATS(vm, v_swapin); -+ GET_VM_STATS(vm, v_swapout); -+ } -+#undef GET_VM_STATS -+#else - sysctl(mem_mib, 2, &mem_stats, &mem_size, NULL, 0); -+#endif - cpu->nInterrupts = mem_stats.NS_VM_INTR; - cpu->nCtxSwitches = mem_stats.NS_VM_SWTCH; - cpu->swapIn = mem_stats.NS_VM_SWAPIN; Property changes on: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu_sysctl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-kthreads =================================================================== --- head/net-mgmt/net-snmp/files/patch-kthreads (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-kthreads (nonexistent) @@ -1,96 +0,0 @@ -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 - #include -+#include - - #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 ); - Property changes on: head/net-mgmt/net-snmp/files/patch-kthreads ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_ucd-snmp_diskio.c =================================================================== --- head/net-mgmt/net-snmp/files/patch-agent_mibgroup_ucd-snmp_diskio.c (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-agent_mibgroup_ucd-snmp_diskio.c (nonexistent) @@ -1,54 +0,0 @@ ---- 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 Property changes on: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_ucd-snmp_diskio.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_icmp.h =================================================================== --- head/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_icmp.h (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_icmp.h (nonexistent) @@ -1,12 +0,0 @@ ---- agent/mibgroup/mibII/icmp.h.orig 2014-12-08 20:23:22 UTC -+++ agent/mibgroup/mibII/icmp.h -@@ -14,6 +14,9 @@ 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(freebsd13, mibII/kernel_sysctl) - config_arch_require(netbsd, mibII/kernel_netbsd) - config_arch_require(netbsdelf, mibII/kernel_netbsd) - config_arch_require(openbsd4, mibII/kernel_sysctl) Property changes on: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_icmp.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_if-mib_data__access_interface__sysctl.c =================================================================== --- head/net-mgmt/net-snmp/files/patch-agent_mibgroup_if-mib_data__access_interface__sysctl.c (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-agent_mibgroup_if-mib_data__access_interface__sysctl.c (nonexistent) @@ -1,24 +0,0 @@ ---- agent/mibgroup/if-mib/data_access/interface_sysctl.c.orig 2018-07-16 16:33:40 UTC -+++ agent/mibgroup/if-mib/data_access/interface_sysctl.c -@@ -531,8 +531,11 @@ - } - } - adl = (struct sockaddr_dl *) a; -- if_name = (char *) adl->sdl_data; -- if_name[adl->sdl_nlen] = '\0'; -+ if_name = malloc(adl->sdl_nlen + 1); -+ if (if_name) { -+ memcpy(if_name, adl->sdl_data, adl->sdl_nlen); -+ if_name[adl->sdl_nlen] = '\0'; -+ } - } - if (!(ifp->ifm_addrs & RTA_IFP) || if_name == NULL) { - snmp_log(LOG_ERR, "ifm_index %u: no interface name in message, " -@@ -541,6 +544,7 @@ - } - - entry = netsnmp_access_interface_entry_create(if_name, ifp->ifm_index); -+ free(if_name); - if(NULL == entry) { - netsnmp_access_interface_container_free(container, - NETSNMP_ACCESS_INTERFACE_FREE_NOFLAGS); Property changes on: head/net-mgmt/net-snmp/files/patch-agent_mibgroup_if-mib_data__access_interface__sysctl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/extra-patch-openssl11 =================================================================== --- head/net-mgmt/net-snmp/files/extra-patch-openssl11 (revision 548357) +++ head/net-mgmt/net-snmp/files/extra-patch-openssl11 (nonexistent) @@ -1,223 +0,0 @@ ---- apps/snmpusm.c -+++ apps/snmpusm.c -@@ -125,6 +125,32 @@ char *usmUserPublic_val = NULL - int docreateandwait = 0; - - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+ -+#include -+#include -+ -+void DH_get0_pqg(const DH *dh, -+ const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) -+{ -+ if (p != NULL) -+ *p = dh->p; -+ if (q != NULL) -+ *q = dh->q; -+ if (g != NULL) -+ *g = dh->g; -+} -+ -+void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key) -+{ -+ if (pub_key != NULL) -+ *pub_key = dh->pub_key; -+ if (priv_key != NULL) -+ *priv_key = dh->priv_key; -+} -+ -+#endif -+ - void - usage(void) - { -@@ -190,7 +216,7 @@ get_USM_DH_key(netsnmp_variable_list *va - oid *keyoid, size_t keyoid_len) { - u_char *dhkeychange; - DH *dh; -- BIGNUM *other_pub; -+ BIGNUM *p, *g, *pub_key, *other_pub; - u_char *key; - size_t key_len; - -@@ -205,25 +231,29 @@ get_USM_DH_key(netsnmp_variable_list *va - dh = d2i_DHparams(NULL, &cp, dhvar->val_len); - } - -- if (!dh || !dh->g || !dh->p) { -+ if (dh) -+ DH_get0_pqg(dh, &p, NULL, &g); -+ -+ if (!dh || !g || !p) { - SNMP_FREE(dhkeychange); - return SNMPERR_GENERR; - } - -- DH_generate_key(dh); -- if (!dh->pub_key) { -+ if (!DH_generate_key(dh)) { - SNMP_FREE(dhkeychange); - return SNMPERR_GENERR; - } - -- if (vars->val_len != (unsigned int)BN_num_bytes(dh->pub_key)) { -+ DH_get0_key(dh, &pub_key, NULL); -+ -+ if (vars->val_len != (unsigned int)BN_num_bytes(pub_key)) { - SNMP_FREE(dhkeychange); - fprintf(stderr,"incorrect diffie-helman lengths (%lu != %d)\n", -- (unsigned long)vars->val_len, BN_num_bytes(dh->pub_key)); -+ (unsigned long)vars->val_len, BN_num_bytes(pub_key)); - return SNMPERR_GENERR; - } - -- BN_bn2bin(dh->pub_key, dhkeychange + vars->val_len); -+ BN_bn2bin(pub_key, dhkeychange + vars->val_len); - - key_len = DH_size(dh); - if (!key_len) { ---- configure.d/config_os_libs2 -+++ configure.d/config_os_libs2 -@@ -291,12 +291,6 @@ if test "x$tryopenssl" != "xno" -a "x$tr - AC_CHECK_LIB(${CRYPTO}, AES_cfb128_encrypt, - AC_DEFINE(HAVE_AES_CFB128_ENCRYPT, 1, - [Define to 1 if you have the `AES_cfb128_encrypt' function.])) -- -- AC_CHECK_LIB(${CRYPTO}, EVP_MD_CTX_create, -- AC_DEFINE([HAVE_EVP_MD_CTX_CREATE], [], -- [Define to 1 if you have the `EVP_MD_CTX_create' function.]) -- AC_DEFINE([HAVE_EVP_MD_CTX_DESTROY], [], -- [Define to 1 if you have the `EVP_MD_CTX_destroy' function.])) - fi - if echo " $transport_result_list " | $GREP "DTLS" > /dev/null; then - AC_CHECK_LIB(ssl, DTLSv1_method, ---- snmplib/keytools.c -+++ snmplib/keytools.c -@@ -149,13 +149,13 @@ generate_Ku(const oid * hashtype, u_int - */ - #ifdef NETSNMP_USE_OPENSSL - --#ifdef HAVE_EVP_MD_CTX_CREATE -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - ctx = EVP_MD_CTX_create(); - #else -- ctx = malloc(sizeof(*ctx)); -- if (!EVP_MD_CTX_init(ctx)) -- return SNMPERR_GENERR; -+ ctx = EVP_MD_CTX_new(); - #endif -+ if (!ctx) -+ return SNMPERR_GENERR; - #ifndef NETSNMP_DISABLE_MD5 - if (ISTRANSFORM(hashtype, HMACMD5Auth)) { - if (!EVP_DigestInit(ctx, EVP_md5())) -@@ -259,11 +259,10 @@ generate_Ku(const oid * hashtype, u_int - memset(buf, 0, sizeof(buf)); - #ifdef NETSNMP_USE_OPENSSL - if (ctx) { --#ifdef HAVE_EVP_MD_CTX_DESTROY -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - EVP_MD_CTX_destroy(ctx); - #else -- EVP_MD_CTX_cleanup(ctx); -- free(ctx); -+ EVP_MD_CTX_free(ctx); - #endif - } - #endif ---- snmplib/scapi.c -+++ snmplib/scapi.c -@@ -486,15 +486,10 @@ sc_hash(const oid * hashtype, size_t has - } - - /** initialize the pointer */ --#ifdef HAVE_EVP_MD_CTX_CREATE -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - cptr = EVP_MD_CTX_create(); - #else -- cptr = malloc(sizeof(*cptr)); --#if defined(OLD_DES) -- memset(cptr, 0, sizeof(*cptr)); --#else -- EVP_MD_CTX_init(cptr); --#endif -+ cptr = EVP_MD_CTX_new(); - #endif - if (!EVP_DigestInit(cptr, hashfn)) { - /* requested hash function is not available */ -@@ -507,13 +502,11 @@ sc_hash(const oid * hashtype, size_t has - /** do the final pass */ - EVP_DigestFinal(cptr, MAC, &tmp_len); - *MAC_len = tmp_len; --#ifdef HAVE_EVP_MD_CTX_DESTROY -+ -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - EVP_MD_CTX_destroy(cptr); - #else --#if !defined(OLD_DES) -- EVP_MD_CTX_cleanup(cptr); --#endif -- free(cptr); -+ EVP_MD_CTX_free(cptr); - #endif - return (rval); - - ---- snmplib/snmp_openssl.c 2014-12-08 21:23:22.000000000 +0100 -+++ snmplib/snmp_openssl.c 2017-02-20 12:46:00.059727928 +0100 -@@ -47,7 +47,7 @@ void netsnmp_init_openssl(void) { - DEBUGMSGTL(("snmp_openssl", "initializing\n")); - - /* Initializing OpenSSL */ -- SSL_library_init(); -+ OPENSSL_init_ssl(0, NULL); - SSL_load_error_strings(); - ERR_load_BIO_strings(); - OpenSSL_add_all_algorithms(); -@@ -164,11 +164,11 @@ netsnmp_openssl_cert_dump_names(X509 *oc - oname_entry = X509_NAME_get_entry(osubj_name, i); - netsnmp_assert(NULL != oname_entry); - -- if (oname_entry->value->type != V_ASN1_PRINTABLESTRING) -+ if (X509_NAME_ENTRY_get_data(oname_entry)->type != V_ASN1_PRINTABLESTRING) - continue; - - /** get NID */ -- onid = OBJ_obj2nid(oname_entry->object); -+ onid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(oname_entry)); - if (onid == NID_undef) { - prefix_long = prefix_short = "UNKNOWN"; - } -@@ -179,9 +179,9 @@ netsnmp_openssl_cert_dump_names(X509 *oc - - DEBUGMSGT(("9:cert:dump:names", - "[%02d] NID type %d, ASN type %d\n", i, onid, -- oname_entry->value->type)); -+ X509_NAME_ENTRY_get_data(oname_entry)->type)); - DEBUGMSGT(("9:cert:dump:names", "%s/%s: '%s'\n", prefix_long, -- prefix_short, ASN1_STRING_data(oname_entry->value))); -+ prefix_short, ASN1_STRING_data(X509_NAME_ENTRY_get_data(oname_entry)))); - } - } - #endif /* NETSNMP_FEATURE_REMOVE_CERT_DUMP_NAMES */ -@@ -470,7 +470,7 @@ netsnmp_openssl_cert_get_hash_type(X509 - if (NULL == ocert) - return 0; - -- return _nid2ht(OBJ_obj2nid(ocert->sig_alg->algorithm)); -+ return _nid2ht(X509_get_signature_nid(ocert)); - } - - /** -@@ -487,7 +487,7 @@ netsnmp_openssl_cert_get_fingerprint(X50 - if (NULL == ocert) - return NULL; - -- nid = OBJ_obj2nid(ocert->sig_alg->algorithm); -+ nid = X509_get_signature_nid(ocert); - DEBUGMSGT(("9:openssl:fingerprint", "alg %d, cert nid %d (%d)\n", alg, nid, - _nid2ht(nid))); - - Property changes on: head/net-mgmt/net-snmp/files/extra-patch-openssl11 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-perl5.23 =================================================================== --- head/net-mgmt/net-snmp/files/patch-perl5.23 (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-perl5.23 (nonexistent) @@ -1,135 +0,0 @@ ---- agent/snmp_perl.c.orig 2015-08-11 13:07:06 UTC -+++ agent/snmp_perl.c -@@ -5,6 +5,10 @@ - #include - #include "perl.h" - -+#ifdef U64TYPE -+#define U64 U64pairU32 -+#endif -+ - #include - #include - #include ---- 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 - #include - ---- 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 - #include - #include ---- 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 - #include - #include ---- perl/agent/agent.xs.orig 2015-08-11 13:07:48 UTC -+++ perl/agent/agent.xs -@@ -9,6 +9,10 @@ - #include - #include - -+#ifdef U64TYPE -+#define U64 U64pairU32 -+#endif -+ - #include - #include - #include ---- 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. Property changes on: head/net-mgmt/net-snmp/files/patch-perl5.23 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/patch-snmplib_snmp__api.c =================================================================== --- head/net-mgmt/net-snmp/files/patch-snmplib_snmp__api.c (revision 548357) +++ head/net-mgmt/net-snmp/files/patch-snmplib_snmp__api.c (nonexistent) @@ -1,117 +0,0 @@ ---- 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; - } - - /* Property changes on: head/net-mgmt/net-snmp/files/patch-snmplib_snmp__api.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/files/extra-patch-local_Makefile.in =================================================================== --- head/net-mgmt/net-snmp/files/extra-patch-local_Makefile.in (revision 548357) +++ head/net-mgmt/net-snmp/files/extra-patch-local_Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- 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 \ Property changes on: head/net-mgmt/net-snmp/files/extra-patch-local_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/net-snmp/pkg-plist =================================================================== --- head/net-mgmt/net-snmp/pkg-plist (revision 548357) +++ head/net-mgmt/net-snmp/pkg-plist (revision 548358) @@ -1,609 +1,635 @@ bin/agentxtrap +bin/checkbandwidth bin/encode_keychange bin/fixproc bin/ipf-mod.pl bin/mib2c bin/mib2c-update bin/net-snmp-cert bin/net-snmp-config bin/net-snmp-create-v3-user bin/snmp-bridge-mib bin/snmpbulkget bin/snmpbulkwalk +bin/snmppcap bin/snmpcheck bin/snmpconf bin/snmpdelta bin/snmpdf bin/snmpget bin/snmpgetnext bin/snmpinform bin/snmpnetstat +bin/snmpping +bin/snmpps bin/snmpset bin/snmpstatus bin/snmptable bin/snmptest +bin/snmptop %%TLS%%bin/snmptls bin/snmptranslate bin/snmptrap bin/snmpusm bin/snmpvacm bin/snmpwalk %%WITH_TKMIB%%bin/tkmib bin/traptoemail -%%NEWSYSLOG%%etc/newsyslog.conf.d/net-snmp.conf +%%NEWSYSLOG%%@dir etc/newsyslog.conf.d +%%NEWSYSLOG%%@sample %%DATADIR%%/newsyslog.conf.sample 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 include/net-snmp/agent/agent_module_config.h include/net-snmp/agent/agent_read_config.h include/net-snmp/agent/agent_registry.h include/net-snmp/agent/agent_sysORTable.h include/net-snmp/agent/agent_trap.h include/net-snmp/agent/all_helpers.h include/net-snmp/agent/auto_nlist.h include/net-snmp/agent/baby_steps.h include/net-snmp/agent/bulk_to_next.h include/net-snmp/agent/cache_handler.h include/net-snmp/agent/debug_handler.h include/net-snmp/agent/ds_agent.h include/net-snmp/agent/instance.h include/net-snmp/agent/mfd.h include/net-snmp/agent/mib_module_config.h 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/null.h include/net-snmp/agent/old_api.h include/net-snmp/agent/read_only.h include/net-snmp/agent/row_merge.h include/net-snmp/agent/scalar.h include/net-snmp/agent/scalar_group.h include/net-snmp/agent/serialize.h include/net-snmp/agent/set_helper.h include/net-snmp/agent/snmp_agent.h include/net-snmp/agent/snmp_get_statistic.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/struct.h include/net-snmp/agent/sysORTable.h include/net-snmp/agent/table.h include/net-snmp/agent/table_array.h include/net-snmp/agent/table_container.h include/net-snmp/agent/table_data.h 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/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 include/net-snmp/definitions.h 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 include/net-snmp/library/container_iterator.h include/net-snmp/library/container_list_ssll.h 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 include/net-snmp/library/int64.h include/net-snmp/library/keytools.h include/net-snmp/library/large_fd_set.h include/net-snmp/library/lcd_time.h 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_stash.h include/net-snmp/library/parse.h include/net-snmp/library/read_config.h include/net-snmp/library/scapi.h include/net-snmp/library/snmp-tc.h 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/snmpTCPDomain.h %%WITH_IPV6%%include/net-snmp/library/snmpTCPIPv6Domain.h %%TLS%%include/net-snmp/library/snmpTLSBaseDomain.h %%TLS%%include/net-snmp/library/snmpTLSTCPDomain.h include/net-snmp/library/snmpUDPDomain.h %%WITH_IPV6%%include/net-snmp/library/snmpUDPIPv6Domain.h include/net-snmp/library/snmpUnixDomain.h include/net-snmp/library/snmp_alarm.h include/net-snmp/library/snmp_api.h include/net-snmp/library/snmp_assert.h include/net-snmp/library/snmp_client.h include/net-snmp/library/snmp_debug.h include/net-snmp/library/snmp_enum.h include/net-snmp/library/snmp_impl.h include/net-snmp/library/snmp_logging.h include/net-snmp/library/snmp_parse_args.h include/net-snmp/library/snmp_secmod.h include/net-snmp/library/snmp_service.h include/net-snmp/library/snmp_transport.h %%TLS%%include/net-snmp/library/snmptsm.h include/net-snmp/library/snmpusm.h include/net-snmp/library/snmpv3-security-includes.h include/net-snmp/library/snmpv3.h %%WITH_IPV6%%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 include/net-snmp/library/transform_oids.h include/net-snmp/library/types.h include/net-snmp/library/ucd_compat.h include/net-snmp/library/vacm.h include/net-snmp/library/winpipe.h include/net-snmp/library/winservice.h include/net-snmp/machine/generic.h include/net-snmp/mib_api.h include/net-snmp/net-snmp-config.h include/net-snmp/net-snmp-features.h include/net-snmp/net-snmp-includes.h include/net-snmp/output_api.h include/net-snmp/pdu_api.h include/net-snmp/session_api.h include/net-snmp/snmpv3_api.h include/net-snmp/system/aix.h include/net-snmp/system/bsd.h include/net-snmp/system/bsdi.h include/net-snmp/system/bsdi3.h include/net-snmp/system/bsdi4.h include/net-snmp/system/cygwin.h include/net-snmp/system/darwin.h include/net-snmp/system/darwin7.h include/net-snmp/system/darwin8.h include/net-snmp/system/darwin9.h include/net-snmp/system/darwin10.h +include/net-snmp/system/darwin11.h +include/net-snmp/system/darwin12.h +include/net-snmp/system/darwin13.h +include/net-snmp/system/darwin14.h +include/net-snmp/system/darwin15.h +include/net-snmp/system/darwin16.h +include/net-snmp/system/darwin17.h include/net-snmp/system/dragonfly.h include/net-snmp/system/dynix.h include/net-snmp/system/freebsd.h include/net-snmp/system/freebsd2.h include/net-snmp/system/freebsd3.h 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/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/generic.h include/net-snmp/system/hpux.h include/net-snmp/system/irix.h include/net-snmp/system/linux.h include/net-snmp/system/mingw32.h +include/net-snmp/system/mingw32msvc.h include/net-snmp/system/mips.h include/net-snmp/system/netbsd.h +include/net-snmp/system/nto-qnx6.h include/net-snmp/system/openbsd.h include/net-snmp/system/openbsd4.h include/net-snmp/system/openbsd5.h +include/net-snmp/system/openbsd6.h include/net-snmp/system/osf5.h include/net-snmp/system/solaris.h include/net-snmp/system/solaris2.3.h include/net-snmp/system/solaris2.4.h include/net-snmp/system/solaris2.5.h include/net-snmp/system/solaris2.6.h include/net-snmp/system/sunos.h include/net-snmp/system/svr5.h include/net-snmp/system/sysv.h include/net-snmp/system/ultrix4.h include/net-snmp/types.h include/net-snmp/utilities.h include/net-snmp/varbind_api.h include/net-snmp/version.h lib/libnetsnmp.a lib/libnetsnmp.so lib/libnetsnmp.so.%%SHLIB_VERSION%% lib/libnetsnmp.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%% lib/libnetsnmpagent.a lib/libnetsnmpagent.so lib/libnetsnmpagent.so.%%SHLIB_VERSION%% lib/libnetsnmpagent.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%% lib/libnetsnmphelpers.a lib/libnetsnmphelpers.so lib/libnetsnmphelpers.so.%%SHLIB_VERSION%% lib/libnetsnmphelpers.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%% lib/libnetsnmpmibs.a lib/libnetsnmpmibs.so lib/libnetsnmpmibs.so.%%SHLIB_VERSION%% lib/libnetsnmpmibs.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%% lib/libnetsnmptrapd.a lib/libnetsnmptrapd.so lib/libnetsnmptrapd.so.%%SHLIB_VERSION%% lib/libnetsnmptrapd.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%% +libdata/pkgconfig/netsnmp-agent.pc +libdata/pkgconfig/netsnmp.pc 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/snmpps.1.gz man/man1/snmpset.1.gz man/man1/snmpstatus.1.gz man/man1/snmptable.1.gz man/man1/snmptest.1.gz +man/man1/snmptop.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%%/Bundle/MakefileSubs.pm %%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 sbin/snmpd sbin/snmptrapd %%PORTDOCS%%%%DOCSDIR%%/AGENT.txt %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/FAQ %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.agentx %%PORTDOCS%%%%DOCSDIR%%/README.krb5 %%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 %%DATADIR%%/mib2c-data/details-table.m2i %%DATADIR%%/mib2c-data/generic-ctx-copy.m2i %%DATADIR%%/mib2c-data/generic-ctx-get.m2i %%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-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 %%DATADIR%%/mib2c-data/generic-table-constants.m2c %%DATADIR%%/mib2c-data/generic-table-enums.m2c %%DATADIR%%/mib2c-data/generic-table-indexes-from-oid.m2i %%DATADIR%%/mib2c-data/generic-table-indexes-set.m2i %%DATADIR%%/mib2c-data/generic-table-indexes-to-oid.m2i %%DATADIR%%/mib2c-data/generic-table-indexes-varbind-setup.m2i %%DATADIR%%/mib2c-data/generic-table-indexes.m2i %%DATADIR%%/mib2c-data/generic-table-oids.m2c %%DATADIR%%/mib2c-data/generic-value-map-func.m2i %%DATADIR%%/mib2c-data/generic-value-map-reverse.m2i %%DATADIR%%/mib2c-data/generic-value-map.m2i %%DATADIR%%/mib2c-data/m2c-internal-warning.m2i %%DATADIR%%/mib2c-data/m2c_setup_enum.m2i %%DATADIR%%/mib2c-data/m2c_setup_node.m2i %%DATADIR%%/mib2c-data/m2c_setup_table.m2i %%DATADIR%%/mib2c-data/m2c_table_save_defaults.m2i %%DATADIR%%/mib2c-data/mfd-access-container-cached-defines.m2i %%DATADIR%%/mib2c-data/mfd-access-unsorted-external-defines.m2i %%DATADIR%%/mib2c-data/mfd-data-access.m2c %%DATADIR%%/mib2c-data/mfd-data-get.m2c %%DATADIR%%/mib2c-data/mfd-data-set.m2c %%DATADIR%%/mib2c-data/mfd-doxygen.m2c %%DATADIR%%/mib2c-data/mfd-interactive-setup.m2c %%DATADIR%%/mib2c-data/mfd-interface.m2c %%DATADIR%%/mib2c-data/mfd-makefile.m2m %%DATADIR%%/mib2c-data/mfd-persistence.m2i %%DATADIR%%/mib2c-data/mfd-readme.m2c %%DATADIR%%/mib2c-data/mfd-top.m2c %%DATADIR%%/mib2c-data/node-get.m2i %%DATADIR%%/mib2c-data/node-set.m2i %%DATADIR%%/mib2c-data/node-storage.m2i %%DATADIR%%/mib2c-data/node-validate.m2i %%DATADIR%%/mib2c-data/node-varbind-validate.m2i %%DATADIR%%/mib2c-data/parent-dependencies.m2i %%DATADIR%%/mib2c-data/parent-set.m2i %%DATADIR%%/mib2c-data/subagent.m2c %%DATADIR%%/mib2c-data/syntax-COUNTER64-get.m2i %%DATADIR%%/mib2c-data/syntax-DateAndTime-get.m2d %%DATADIR%%/mib2c-data/syntax-DateAndTime-get.m2i %%DATADIR%%/mib2c-data/syntax-DateAndTime-readme.m2i %%DATADIR%%/mib2c-data/syntax-InetAddress-get.m2i %%DATADIR%%/mib2c-data/syntax-InetAddress-set.m2i %%DATADIR%%/mib2c-data/syntax-InetAddressType-get.m2i %%DATADIR%%/mib2c-data/syntax-InetAddressType-set.m2i %%DATADIR%%/mib2c-data/syntax-RowStatus-dependencies.m2i %%DATADIR%%/mib2c-data/syntax-RowStatus-get.m2i %%DATADIR%%/mib2c-data/syntax-RowStatus-varbind-validate.m2i %%DATADIR%%/mib2c-data/syntax-StorageType-dependencies.m2i %%DATADIR%%/mib2c-data/syntax-TestAndIncr-get.m2i %%DATADIR%%/mibs/AGENTX-MIB.txt %%DATADIR%%/mibs/BRIDGE-MIB.txt %%DATADIR%%/mibs/DISMAN-EVENT-MIB.txt %%DATADIR%%/mibs/DISMAN-SCHEDULE-MIB.txt %%DATADIR%%/mibs/DISMAN-SCRIPT-MIB.txt %%DATADIR%%/mibs/EtherLike-MIB.txt %%DATADIR%%/mibs/HCNUM-TC.txt %%DATADIR%%/mibs/HOST-RESOURCES-MIB.txt %%DATADIR%%/mibs/HOST-RESOURCES-TYPES.txt %%DATADIR%%/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt %%DATADIR%%/mibs/IANA-LANGUAGE-MIB.txt %%DATADIR%%/mibs/IANA-RTPROTO-MIB.txt %%DATADIR%%/mibs/IANAifType-MIB.txt %%DATADIR%%/mibs/IF-INVERTED-STACK-MIB.txt %%DATADIR%%/mibs/IF-MIB.txt %%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-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 %%DATADIR%%/mibs/NET-SNMP-MIB.txt %%DATADIR%%/mibs/NET-SNMP-PASS-MIB.txt %%DATADIR%%/mibs/NET-SNMP-TC.txt %%DATADIR%%/mibs/NET-SNMP-VACM-MIB.txt %%DATADIR%%/mibs/NOTIFICATION-LOG-MIB.txt %%DATADIR%%/mibs/RFC-1215.txt %%DATADIR%%/mibs/RFC1155-SMI.txt %%DATADIR%%/mibs/RFC1213-MIB.txt %%DATADIR%%/mibs/RMON-MIB.txt %%DATADIR%%/mibs/SCTP-MIB.txt %%DATADIR%%/mibs/SMUX-MIB.txt %%DATADIR%%/mibs/SNMP-COMMUNITY-MIB.txt %%DATADIR%%/mibs/SNMP-FRAMEWORK-MIB.txt %%DATADIR%%/mibs/SNMP-MPD-MIB.txt %%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 +%%DATADIR%%/mibs/SNMP-USM-HMAC-SHA2-MIB.txt %%DATADIR%%/mibs/SNMP-VIEW-BASED-ACM-MIB.txt %%DATADIR%%/mibs/SNMPv2-CONF.txt %%DATADIR%%/mibs/SNMPv2-MIB.txt %%DATADIR%%/mibs/SNMPv2-SMI.txt %%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/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 -@unexec rm -f %D/%%DATADIR%%/mibs/.index 2>/dev/null || true +@postunexec rm -f %D/%%DATADIR%%/mibs/.index 2>/dev/null || true %%WITH_PERL_EMBEDDED%%%%DATADIR%%/snmp_perl.pl %%DATADIR%%/snmpconf-data/snmp-data/authopts %%DATADIR%%/snmpconf-data/snmp-data/debugging %%DATADIR%%/snmpconf-data/snmp-data/mibs %%DATADIR%%/snmpconf-data/snmp-data/output %%DATADIR%%/snmpconf-data/snmp-data/snmpconf-config %%DATADIR%%/snmpconf-data/snmpd-data/acl %%DATADIR%%/snmpconf-data/snmpd-data/basic_setup %%DATADIR%%/snmpconf-data/snmpd-data/extending %%DATADIR%%/snmpconf-data/snmpd-data/monitor %%DATADIR%%/snmpconf-data/snmpd-data/operation %%DATADIR%%/snmpconf-data/snmpd-data/snmpconf-config %%DATADIR%%/snmpconf-data/snmpd-data/system %%DATADIR%%/snmpconf-data/snmpd-data/trapsinks %%DATADIR%%/snmpconf-data/snmptrapd-data/authentication %%DATADIR%%/snmpconf-data/snmptrapd-data/formatting %%DATADIR%%/snmpconf-data/snmptrapd-data/logging %%DATADIR%%/snmpconf-data/snmptrapd-data/runtime %%DATADIR%%/snmpconf-data/snmptrapd-data/snmpconf-config %%DATADIR%%/snmpconf-data/snmptrapd-data/traphandle @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