Date: Sat, 12 Sep 2020 12:57:29 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548358 - in head/net-mgmt/net-snmp: . files Message-ID: <202009121257.08CCvTS6036908@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Sat Sep 12 12:57:29 2020 New Revision: 548358 URL: https://svnweb.freebsd.org/changeset/ports/548358 Log: - Update to 5.9 - Add OPTION to disable libpkg support Deleted: head/net-mgmt/net-snmp/files/extra-patch-local_Makefile.in head/net-mgmt/net-snmp/files/extra-patch-openssl11 head/net-mgmt/net-snmp/files/patch-Makefile.in head/net-mgmt/net-snmp/files/patch-agent_Makefile.in head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu_sysctl.c head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_memory_memory__freebsd.c 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_mibII_icmp.h 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_ucd-snmp_diskio.c head/net-mgmt/net-snmp/files/patch-agent_mibgroup_udp-mib_data__access_udp__endpoint__freebsd4.c 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_system_freebsd13.h head/net-mgmt/net-snmp/files/patch-kthreads head/net-mgmt/net-snmp/files/patch-perl5.23 head/net-mgmt/net-snmp/files/patch-snmplib_snmp__api.c head/net-mgmt/net-snmp/files/patch-snmpusm.c head/net-mgmt/net-snmp/files/patch-tcpTable.c head/net-mgmt/net-snmp/files/patch-transform_oids.h head/net-mgmt/net-snmp/files/patch-udpTable.c Modified: head/net-mgmt/net-snmp/Makefile head/net-mgmt/net-snmp/distinfo head/net-mgmt/net-snmp/pkg-plist Modified: head/net-mgmt/net-snmp/Makefile ============================================================================== --- head/net-mgmt/net-snmp/Makefile Sat Sep 12 12:55:03 2020 (r548357) +++ head/net-mgmt/net-snmp/Makefile Sat Sep 12 12:57:29 2020 (r548358) @@ -2,8 +2,7 @@ # $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} \ @@ -22,7 +21,7 @@ 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 @@ -36,6 +35,7 @@ UNPRIVILEGED_DESC= Allow unprivileged users to execute 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 @@ -74,10 +74,6 @@ TLS_CONFIGURE_ON= --with-security-modules=tsm --with-t .include <bsd.port.options.mk> -.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 @@ -100,7 +96,6 @@ 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 @@ -150,8 +145,8 @@ PLIST_SUB+= WITH_IPV6="@comment " 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} @@ -196,7 +191,8 @@ CONFIGURE_ARGS+=--with-out-mib-modules="${NET_SNMP_WIT 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} \ @@ -242,11 +238,6 @@ pre-everything:: @${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} @@ -255,7 +246,20 @@ post-patch: .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|' @@ -294,7 +298,7 @@ post-install: strip-files install-config-files install @(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: Modified: head/net-mgmt/net-snmp/distinfo ============================================================================== --- head/net-mgmt/net-snmp/distinfo Sat Sep 12 12:55:03 2020 (r548357) +++ head/net-mgmt/net-snmp/distinfo Sat Sep 12 12:57:29 2020 (r548358) @@ -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 Modified: head/net-mgmt/net-snmp/pkg-plist ============================================================================== --- head/net-mgmt/net-snmp/pkg-plist Sat Sep 12 12:55:03 2020 (r548357) +++ head/net-mgmt/net-snmp/pkg-plist Sat Sep 12 12:57:29 2020 (r548358) @@ -1,4 +1,5 @@ bin/agentxtrap +bin/checkbandwidth bin/encode_keychange bin/fixproc bin/ipf-mod.pl @@ -10,6 +11,7 @@ bin/net-snmp-create-v3-user bin/snmp-bridge-mib bin/snmpbulkget bin/snmpbulkwalk +bin/snmppcap bin/snmpcheck bin/snmpconf bin/snmpdelta @@ -18,10 +20,13 @@ 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 @@ -30,7 +35,8 @@ 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 @@ -53,6 +59,7 @@ 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 @@ -110,6 +117,7 @@ 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 @@ -119,6 +127,7 @@ 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 @@ -177,6 +186,13 @@ 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 @@ -192,16 +208,20 @@ 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 @@ -236,6 +256,8 @@ 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 @@ -254,10 +276,12 @@ 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 @@ -376,7 +400,7 @@ man/man8/snmptrapd.8.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 @@ -431,6 +455,7 @@ sbin/snmptrapd %%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 @@ -553,6 +578,7 @@ sbin/snmptrapd %%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 @@ -568,7 +594,7 @@ sbin/snmptrapd %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009121257.08CCvTS6036908>