Date: Mon, 19 Jan 2015 18:10:32 +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: r377448 - in head/net-mgmt/net-snmp: . files Message-ID: <201501191810.t0JIAWt7061879@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Mon Jan 19 18:10:31 2015 New Revision: 377448 URL: https://svnweb.freebsd.org/changeset/ports/377448 QAT: https://qat.redports.org/buildarchive/r377448/ Log: - Update to 5.7.3 - Add missing PYTHON files into pkg-plist Added: head/net-mgmt/net-snmp/files/patch-agent_Makefile.in (contents, props changed) Deleted: head/net-mgmt/net-snmp/files/patch-agent__auto_nlist.c head/net-mgmt/net-snmp/files/patch-agent__mibgroup__agent__extend.c head/net-mgmt/net-snmp/files/patch-agent__mibgroup__host__data_access__swinst_pkginfo.c head/net-mgmt/net-snmp/files/patch-agent__mibgroup__host__data_access__swrun_kinfo.c head/net-mgmt/net-snmp/files/patch-include-net-snmp-system-freebsd Modified: head/net-mgmt/net-snmp/Makefile head/net-mgmt/net-snmp/distinfo head/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in head/net-mgmt/net-snmp/files/patch-Makefile.in head/net-mgmt/net-snmp/pkg-plist Modified: head/net-mgmt/net-snmp/Makefile ============================================================================== --- head/net-mgmt/net-snmp/Makefile Mon Jan 19 17:52:56 2015 (r377447) +++ head/net-mgmt/net-snmp/Makefile Mon Jan 19 18:10:31 2015 (r377448) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= snmp -PORTVERSION= 5.7.2 -PORTREVISION= 17 +PORTVERSION= 5.7.3 CATEGORIES= net-mgmt ipv6 MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= net- @@ -16,14 +15,14 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING OPTIONS_DEFINE= IPV6 MFD_REWRITES PERL PERL_EMBEDDED PYTHON DUMMY TKMIB \ - DMALLOC MYSQL AX_SOCKONLY UNPRIVILEGED SMUX DOCS + MYSQL AX_SOCKONLY UNPRIVILEGED SMUX DOCS OPTIONS_DEFAULT=IPV6 PERL PERL_EMBEDDED DUMMY SMUX MFD_REWRITES_DESC= Build with 64-bit Interface Counters PERL_EMBEDDED_DESC= Build embedded perl DUMMY_DESC= Enable dummy values as placeholders TKMIB_DESC= Install graphical MIB browser -DMALLOC_DESC= Enable dmalloc debug memory allocator +#DMALLOC_DESC= Enable dmalloc debug memory allocator AX_SOCKONLY_DESC= Disable UDP/TCP transports for agentx UNPRIVILEGED_DESC= Allow unprivileged users to execute net-snmp SMUX_DESC= Build with SNMP multiplexing (SMUX) support @@ -49,7 +48,7 @@ CONFIGURE_ARGS+=--enable-shared --enable --with-logfile="${NET_SNMP_LOGFILE}" \ --with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" \ --with-gnu-ld --with-libwrap \ - --with-ldflags="-lm -lkvm -ldevstat -lpkg -L${LOCALBASE}/lib -L${PKG_PREFIX}/lib ${LCRYPTO}" + --with-ldflags="-lm -lkvm -ldevstat -L${PKG_PREFIX}/lib ${LCRYPTO}" SUB_FILES= pkg-message .if defined(BATCH) @@ -104,10 +103,12 @@ PLIST_SUB+= WITH_PERL_EMBEDDED="@comment PLIST_SUB+= WITH_PERL="@comment " .endif -.if ${PORT_OPTIONS:MDMALLOC} -LIB_DEPENDS+= libdmalloc.so:${PORTSDIR}/devel/dmalloc -CONFIGURE_ARGS+=--with-dmalloc=${LOCALBASE} -.endif +#.if ${PORT_OPTIONS:MDMALLOC} +#LIB_DEPENDS+= libdmalloc.so:${PORTSDIR}/devel/dmalloc +#CONFIGURE_ARGS+=--with-dmalloc=${LOCALBASE} +#.else +#CONFIGURE_ARGS+=--without-dmalloc +#.endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes @@ -132,7 +133,7 @@ CONFIGURE_ARGS+=--without-root-access .endif SHLIB_VERSION= 30 -SHLIB_VERSION2= .0.2 +SHLIB_VERSION2= .0.3 PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} SHLIB_VERSION2=${SHLIB_VERSION2} SCRIPTS_SUB= PREFIX=${PREFIX} PERL=${PERL} @@ -187,8 +188,7 @@ LIB_FILES= libnetsnmp.so.${SHLIB_VERSION 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 snmpconf \ - traptoemail +SCRIPT_FILES= snmpcheck.def mib2c fixproc ipf-mod.pl traptoemail .if ${PORT_OPTIONS:MTKMIB} SCRIPT_FILES+= tkmib .endif @@ -237,7 +237,7 @@ post-patch: 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 +.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 @@ -283,7 +283,7 @@ install-doc-files: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} . for filename in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${filename} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${filename} ${STAGEDIR}${DOCSDIR} . endfor .endif Modified: head/net-mgmt/net-snmp/distinfo ============================================================================== --- head/net-mgmt/net-snmp/distinfo Mon Jan 19 17:52:56 2015 (r377447) +++ head/net-mgmt/net-snmp/distinfo Mon Jan 19 18:10:31 2015 (r377448) @@ -1,2 +1,2 @@ -SHA256 (net-snmp-5.7.2.tar.gz) = 09ed31b4cc1f3c0411ef9a16eff79ef3b30d89c32ca46d5a01a41826c4ceb816 -SIZE (net-snmp-5.7.2.tar.gz) = 6281352 +SHA256 (net-snmp-5.7.3.tar.gz) = 12ef89613c7707dc96d13335f153c1921efc9d61d3708ef09f3fc4a7014fb4f0 +SIZE (net-snmp-5.7.3.tar.gz) = 6382428 Modified: head/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in ============================================================================== --- head/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in Mon Jan 19 17:52:56 2015 (r377447) +++ head/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in Mon Jan 19 18:10:31 2015 (r377448) @@ -1,6 +1,6 @@ ---- ./local/Makefile.in.orig 2012-06-12 10:48:43.000000000 -0400 -+++ ./local/Makefile.in 2012-06-12 10:48:50.000000000 -0400 -@@ -16,7 +16,7 @@ +--- 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@ Modified: head/net-mgmt/net-snmp/files/patch-Makefile.in ============================================================================== --- head/net-mgmt/net-snmp/files/patch-Makefile.in Mon Jan 19 17:52:56 2015 (r377447) +++ head/net-mgmt/net-snmp/files/patch-Makefile.in Mon Jan 19 18:10:31 2015 (r377448) @@ -1,15 +1,6 @@ ---- ./Makefile.in.orig 2012-10-10 01:28:58.000000000 +0300 -+++ ./Makefile.in 2014-04-10 18:31:37.128627539 +0300 -@@ -20,7 +20,7 @@ - INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \ - 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 freebsd.h \ -+ freebsd7.h freebsd8.h freebsd9.h freebsd10.h freebsd11.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 \ -@@ -229,7 +229,7 @@ +--- Makefile.in.orig 2015-01-19 14:39:40 UTC ++++ Makefile.in +@@ -230,7 +230,7 @@ pythonmodules: subdirs fi pythoninstall: Added: head/net-mgmt/net-snmp/files/patch-agent_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/net-snmp/files/patch-agent_Makefile.in Mon Jan 19 18:10:31 2015 (r377448) @@ -0,0 +1,11 @@ +--- agent/Makefile.in.orig 2015-01-19 16:46:08 UTC ++++ agent/Makefile.in +@@ -120,7 +120,7 @@ LMIBLIBS = @LMIBLIBS@ + VAL_LIBS = @VAL_LIBS@ + PERLLDOPTS_FOR_APPS = @PERLLDOPTS_FOR_APPS@ + PERLLDOPTS_FOR_LIBS = @PERLLDOPTS_FOR_LIBS@ +-LIBS = $(USELIBS) @AGENTLIBS@ $(PERLLDOPTS_FOR_APPS) $(VAL_LIBS) ++LIBS = $(USELIBS) @AGENTLIBS@ $(PERLLDOPTS_FOR_APPS) $(VAL_LIBS) -lpkg + OUR_AGENT_LIBS = $(AGENTLIB) $(MIBLIB) $(LIBS) @DLLIBS@ + CPPFLAGS = $(TOP_INCLUDES) -I. $(AGENT_INCLUDES) $(MIBGROUP_INCLUDES) \ + $(SNMPLIB_INCLUDES) @CPPFLAGS@ Modified: head/net-mgmt/net-snmp/pkg-plist ============================================================================== --- head/net-mgmt/net-snmp/pkg-plist Mon Jan 19 17:52:56 2015 (r377447) +++ head/net-mgmt/net-snmp/pkg-plist Mon Jan 19 18:10:31 2015 (r377448) @@ -78,7 +78,7 @@ 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 -@dirrmtry include/net-snmp/agent/util_funcs +@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 @@ -184,6 +184,7 @@ include/net-snmp/system/freebsd8.h include/net-snmp/system/freebsd9.h include/net-snmp/system/freebsd10.h include/net-snmp/system/freebsd11.h +include/net-snmp/system/freebsd12.h include/net-snmp/system/generic.h include/net-snmp/system/hpux.h include/net-snmp/system/irix.h @@ -304,6 +305,7 @@ 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 @@ -330,6 +332,7 @@ 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 @@ -338,6 +341,7 @@ 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 @@ -537,6 +541,8 @@ sbin/snmptrapd %%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 @@ -577,3 +583,20 @@ sbin/snmptrapd %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501191810.t0JIAWt7061879>