Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 13 Oct 2012 01:07:33 +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: r305803 - in head/net-mgmt/net-snmp: . files
Message-ID:  <201210130107.q9D17Xje010666@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zi
Date: Sat Oct 13 01:07:32 2012
New Revision: 305803
URL: http://svn.freebsd.org/changeset/ports/305803

Log:
  - Update to 5.7.2
  - Convert to OptionsNG
  
  Feature safe:	yes

Added:
  head/net-mgmt/net-snmp/files/pkg-message.in
     - copied, changed from r301561, head/net-mgmt/net-snmp/pkg-message
Deleted:
  head/net-mgmt/net-snmp/files/patch-Makefile.in
  head/net-mgmt/net-snmp/files/patch-agent-mibgroup-hardware-fsys-fsys_getfsstats.c
  head/net-mgmt/net-snmp/files/patch-agent__Makefile.in
  head/net-mgmt/net-snmp/files/patch-agent__helpers__old_api.c
  head/net-mgmt/net-snmp/files/patch-agent__mibgroup__agent__extend.c
  head/net-mgmt/net-snmp/files/patch-agent__mibgroup__hardware__fsys__hw_fsys.c
  head/net-mgmt/net-snmp/files/patch-agent__mibgroup__host__data_access__swinst_apt.c
  head/net-mgmt/net-snmp/files/patch-agent__mibgroup__host__data_access__swrun_kinfo.c
  head/net-mgmt/net-snmp/files/patch-agent__mibgroup__sctp-mib__sctpTables_freebsd.c
  head/net-mgmt/net-snmp/files/patch-agent__mibgroup__ucd-snmp__disk_hw.c
  head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c
  head/net-mgmt/net-snmp/files/patch-auto_nlist.c
  head/net-mgmt/net-snmp/files/patch-configure
  head/net-mgmt/net-snmp/files/patch-freebsd10.h
  head/net-mgmt/net-snmp/files/patch-freebsd8.h
  head/net-mgmt/net-snmp/files/patch-freebsd9.h
  head/net-mgmt/net-snmp/files/patch-generic.h
  head/net-mgmt/net-snmp/files/patch-hr_storage.h
  head/net-mgmt/net-snmp/files/patch-hr_system.c
  head/net-mgmt/net-snmp/files/patch-include-net-snmp_net-snmp-config.h.in
  head/net-mgmt/net-snmp/files/patch-local:fixproc
  head/net-mgmt/net-snmp/files/patch-local:ipf-mod.pl
  head/net-mgmt/net-snmp/files/patch-local:mib2c
  head/net-mgmt/net-snmp/files/patch-local:snmpcheck.def
  head/net-mgmt/net-snmp/files/patch-local:snmpconf
  head/net-mgmt/net-snmp/files/patch-local:tkmib
  head/net-mgmt/net-snmp/files/patch-local:traptoemail
  head/net-mgmt/net-snmp/files/patch-ltmain.sh
  head/net-mgmt/net-snmp/files/patch-net-snmp-includes.h
  head/net-mgmt/net-snmp/files/patch-sctpScalars.h
  head/net-mgmt/net-snmp/files/patch-sctpTables.h
  head/net-mgmt/net-snmp/files/patch-sctpTables_common.h
  head/net-mgmt/net-snmp/files/patch-snmplib__snmp_api.c
  head/net-mgmt/net-snmp/files/patch-snmplib__system.c
  head/net-mgmt/net-snmp/pkg-message
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/pkg-descr
  head/net-mgmt/net-snmp/pkg-plist

Modified: head/net-mgmt/net-snmp/Makefile
==============================================================================
--- head/net-mgmt/net-snmp/Makefile	Sat Oct 13 00:57:04 2012	(r305802)
+++ head/net-mgmt/net-snmp/Makefile	Sat Oct 13 01:07:32 2012	(r305803)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	snmp
-PORTVERSION=	5.7.1
-PORTREVISION=	7
+PORTVERSION=	5.7.2
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	net-
@@ -17,18 +16,19 @@ MAINTAINER=	zi@FreeBSD.org
 COMMENT=	An extendable SNMP implementation
 
 LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS=	IPV6 "Build with IPv6 support" on \
-		MFD_REWRITES "Build with 64-bit Interface Counters" off \
-		PERL "Install additional perl modules" on \
-		PERL_EMBEDDED "Build embedded perl" on \
-		PYTHON "Install additional python modules" off \
-		DUMMY "Enable dummy values as placeholders" on \
-		TKMIB "Install graphical MIB browser" off \
-		DMALLOC "Enable dmalloc debug memory allocator" off \
-		MYSQL "Enable logging of traps to MySQL" off \
-		AX_SOCKONLY "Disable UDP/TCP transports for agentx" off \
-		UNPRIVILEGED "Allow unprivileged users to execute net-snmp" off
+OPTIONS_DEFINE=	IPV6 MFD_REWRITES PERL PERL_EMBEDDED PYTHON DUMMY TKMIB \
+		DMALLOC MYSQL AX_SOCKONLY UNPRIVILEGED
+OPTIONS_DEFAULT=IPV6 PERL PERL_EMBEDDED DUMMY
+
+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
+AX_SOCKONLY_DESC=	Disable UDP/TCP transports for agentx
+UNPRIVILEGED_DESC=	Allow unprivileged users to execute net-snmp
 
 .include <bsd.port.options.mk>
 
@@ -48,12 +48,13 @@ 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"
+SUB_FILES=	pkg-message
 
 .if defined(BATCH)
 CONFIGURE_ARGS+=--with-defaults
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 # borrowed from bsd.python.mk and adapted for our needs
 PYEASYINSTALL_CMD?=		${LOCALBASE}/bin/easy_install-${PYTHON_VER}
 PYEASYINSTALL_BINDIR?=		${PREFIX}/bin
@@ -83,11 +84,11 @@ PLIST_SUB+=	WITH_PYTHON="@comment "
 .include <bsd.port.pre.mk>
 CONFIGURE_ARGS+=	--with-openssl="${OPENSSLBASE}"
 
-.if defined(WITH_DUMMY)
+.if ${PORT_OPTIONS:MDUMMY}
 CONFIGURE_ARGS+=--with-dummy-values
 .endif
 
-.if !defined(WITH_TKMIB)
+.if empty(${PORT_OPTIONS:MTKMIB})
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-local:Makefile.in
 PLIST_SUB+=	WITH_TKMIB="@comment "
 .else
@@ -95,10 +96,10 @@ RUN_DEPENDS+=	p5-Tk>=0:${PORTSDIR}/x11-t
 PLIST_SUB+=	WITH_TKMIB=""
 .endif
 
-.if defined(WITH_PERL)
+.if ${PORT_OPTIONS:MPERL}
 USE_PERL5=	yes
 CONFIGURE_ARGS+=--with-perl-modules
-.if defined(WITHOUT_PERL_EMBEDDED)
+.if empty(${PORT_OPTIONS:MPERL_EMBEDDED})
 CONFIGURE_ARGS+=--disable-embedded-perl
 PLIST_SUB+=	WITH_PERL_EMBEDDED="@comment "
 .else
@@ -113,23 +114,23 @@ PLIST_SUB+=	WITH_PERL_EMBEDDED="@comment
 PLIST_SUB+=	WITH_PERL="@comment "
 .endif
 
-.if defined(WITH_DMALLOC)
+.if ${PORT_OPTIONS:MDMALLOC}
 LIB_DEPENDS+=	dmalloc:${PORTSDIR}/devel/dmalloc
 CONFIGURE_ARGS+=--with-dmalloc=${LOCALBASE}
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--with-mysql
 CONFIGURE_ENV+=	MYSQLCONFIG=${LOCALBASE}/bin/mysql_config
 .endif
 
-.if defined(WITH_AX_SOCKONLY)
+.if ${PORT_OPTIONS:MAX_SOCKONLY}
 CONFIGURE_ARGS+=--enable-agentx-dom-sock-only
 .endif
 
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=--enable-ipv6
 # --with-transport="UDPIPv6 TCPIPv6" --with-modules=mibII/ipv6"
 PLIST_SUB+=	WITH_IPV6=""
@@ -137,7 +138,7 @@ PLIST_SUB+=	WITH_IPV6=""
 PLIST_SUB+=	WITH_IPV6="@comment "
 .endif
 
-.if defined(WITH_UNPRIVILEGED)
+.if ${PORT_OPTIONS:MUNPRIVILEGED}
 CONFIGURE_ARGS+=--without-root-access
 .endif
 
@@ -160,7 +161,7 @@ NET_SNMP_WITH_MIB_MODULE_LIST+=	sctp-mib
 CONFIGURE_ARGS+=	--with-libs="-lssp_nonshared"
 .endif
 
-.if defined(WITH_MFD_REWRITES)
+.if ${PORT_OPTIONS:MMFD_REWRITES}
 CONFIGURE_ARGS+=--enable-mfd-rewrites
 NET_SNMP_WITH_MIB_MODULE_LIST+=	if-mib
 .endif
@@ -189,17 +190,15 @@ MAN3=		add_mibdir.3 add_module_replaceme
 		get_module_node.3 \
 		netsnmp_agent_api.3 netsnmp_config_api.3 netsnmp_init_mib.3 \
 		netsnmp_mib_api.3 netsnmp_pdu_api.3 netsnmp_read_module.3 \
-		netsnmp_sess_api.3 netsnmp_session_api.3 netsnmp_trap_api.3 netsnmp_varbind_api.3 \
-		print_description.3 print_mib.3 print_objid.3 print_value.3 \
-		print_variable.3 read_all_mibs.3 \
+		netsnmp_sess_api.3 netsnmp_session_api.3 netsnmp_trap_api.3 \
+		netsnmp_varbind_api.3 print_description.3 print_mib.3 \
+		print_objid.3 print_value.3 print_variable.3 read_all_mibs.3 \
 		read_configs.3 read_config_print_usage.3 \
-		read_mib.3 read_objid.3 \
-		read_premib_configs.3 \
+		read_mib.3 read_objid.3 read_premib_configs.3 \
 		register_app_config_handler.3 \
 		register_config_handler.3 register_mib_handlers.3 \
 		send_easy_trap.3 send_trap_vars.3 send_v2trap.3 \
-		shutdown_mib.3 \
-		snmp_alarm.3 snmp_alarm_register.3 \
+		shutdown_mib.3 snmp_alarm.3 snmp_alarm_register.3 \
 		snmp_alarm_register_hr.3 snmp_alarm_unregister.3 \
 		snmp_api_errstring.3 snmp_close.3 \
 		snmp_error.3 snmp_free_pdu.3 snmp_open.3 snmp_perror.3 \
@@ -210,22 +209,25 @@ MAN3=		add_mibdir.3 add_module_replaceme
 		snmp_sess_read.3 snmp_sess_select_info.3 \
 		snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \
 		snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \
-		snmp_timeout.3 \
-		snprint_objid.3 snprint_value.3 snprint_variable.3 \
-		unregister_app_config_handler.3 \
+		snmp_timeout.3 snprint_objid.3 snprint_value.3 \
+		snprint_variable.3 unregister_app_config_handler.3 \
 		unregister_config_handler.3 \
 		unregister_all_config_handlers.3 \
-		register_prenetsnmp_mib_handler.3 register_const_config_handler.3 register_app_prenetsnmp_mib_handler.3 \
+		register_prenetsnmp_mib_handler.3 \
+		register_const_config_handler.3 \
+		register_app_prenetsnmp_mib_handler.3 \
 		snprint_description.3 \
 		snmp_varlist_add_variable.3 \
 		snmp_set_var_value.3 \
 		snmp_set_var_typed_value.3 \
 		snmp_set_var_typed_integer.3 \
 		snmp_set_var_objid.3 \
-		snmp_set_mib_errors.3 snmp_pdu_create.3 snmp_pdu_add_variable.3 snmp_parse_oid.3 snmp_free_varbind.3 \
-		snmp_free_var.3 snmp_fix_pdu.3 snmp_clone_varbind.3 snmp_clone_pdu.3 snmp_add_null_var.3
+		snmp_set_mib_errors.3 snmp_pdu_create.3 \
+		snmp_pdu_add_variable.3 snmp_parse_oid.3 snmp_free_varbind.3 \
+		snmp_free_var.3 snmp_fix_pdu.3 snmp_clone_varbind.3 \
+		snmp_clone_pdu.3 snmp_add_null_var.3
 
-.if defined(WITH_PERL)
+.if ${PORT_OPTIONS:MPERL}
 MAN3PERL=	NetSNMP::ASN.3 NetSNMP::OID.3 NetSNMP::agent.3 \
 		NetSNMP::TrapReceiver.3 \
 		NetSNMP::agent::default_store.3 \
@@ -246,7 +248,7 @@ SBIN_FILES=	snmpd snmptrapd
 STARTUP_DIR=	${PREFIX}/etc/rc.d
 SCRIPT_FILES=	snmpcheck.def mib2c fixproc ipf-mod.pl snmpconf \
 		traptoemail
-.if defined(WITH_TKMIB)
+.if ${PORT_OPTIONS:MTKMIB}
 SCRIPT_FILES+=	tkmib
 .endif
 DOC_FILES=	AGENT.txt COPYING FAQ NEWS README \
@@ -277,11 +279,11 @@ pre-everything::
 
 post-patch:
 .for filename in ${SCRIPT_FILES}
-	${REINPLACE_CMD} ${SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${WRKSRC}/local/${filename}
+	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/local/${filename}
 .endfor
 .if ${OSVERSION} >= 900007
-	@${REINPLACE_CMD} -e 's!utmp_p->ut_name!utmp_p->ut_user!' ${WRKSRC}/agent/mibgroup/host/hr_system.c
+	@${REINPLACE_CMD} -e 's!utmp_p->ut_name!utmp_p->ut_user!' \
+	    ${WRKSRC}/agent/mibgroup/host/hr_system.c
 .endif
 
 post-configure:
@@ -292,7 +294,7 @@ post-configure:
 		s!^.*#undef.*(HAVE_${hdr:U:S/./_/g:S/\//_/g}).*$$!#define \1 1!g' \
 			${WRKSRC}/include/net-snmp/net-snmp-config.h
 .endfor
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 	@(cd ${WRKSRC}/python; \
 	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist_egg \
 		-o plat-name -s "" --basedir=${WRKSRC}; \
@@ -301,7 +303,7 @@ post-configure:
 .endif
 
 post-build:
-.if defined(WITH_PERL)
+.if ${PORT_OPTIONS:MPERL}
 	${FIND} ${WRKSRC}/perl -name Makefile | \
 	${XARGS} ${REINPLACE_CMD} -E -e '\
 		s!^(PREFIX) = .*!\1 = ${PREFIX}!; \
@@ -314,7 +316,7 @@ post-build:
 .endif
 
 post-install: strip-files install-config-files install-doc-files display-message
-	${MKDIR} /var/agentx ${PREFIX}/etc/snmp
+	${MKDIR} /var/agentx
 
 strip-files:
 	cd ${PREFIX}/bin; ${STRIP_CMD} ${BIN_FILES}

Modified: head/net-mgmt/net-snmp/distinfo
==============================================================================
--- head/net-mgmt/net-snmp/distinfo	Sat Oct 13 00:57:04 2012	(r305802)
+++ head/net-mgmt/net-snmp/distinfo	Sat Oct 13 01:07:32 2012	(r305803)
@@ -1,2 +1,2 @@
-SHA256 (net-snmp-5.7.1.tar.gz) = 7c71c9650c65b715356547e20ca2dbe6313944278af8cc19c32a5337f46b181f
-SIZE (net-snmp-5.7.1.tar.gz) = 6110619
+SHA256 (net-snmp-5.7.2.tar.gz) = 09ed31b4cc1f3c0411ef9a16eff79ef3b30d89c32ca46d5a01a41826c4ceb816
+SIZE (net-snmp-5.7.2.tar.gz) = 6281352

Modified: head/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in
==============================================================================
--- head/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in	Sat Oct 13 00:57:04 2012	(r305802)
+++ head/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in	Sat Oct 13 01:07:32 2012	(r305803)
@@ -1,5 +1,5 @@
---- ./local/Makefile.in.orig	2011-11-24 11:55:41.000000000 -0500
-+++ ./local/Makefile.in	2011-11-24 11:55:48.000000000 -0500
+--- ./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 @@
  #
  SNMPCONFPATH=@SNMPCONFPATH@

Copied and modified: head/net-mgmt/net-snmp/files/pkg-message.in (from r301561, head/net-mgmt/net-snmp/pkg-message)
==============================================================================
--- head/net-mgmt/net-snmp/pkg-message	Thu Jul 26 13:28:58 2012	(r301561, copy source)
+++ head/net-mgmt/net-snmp/files/pkg-message.in	Sat Oct 13 01:07:32 2012	(r305803)
@@ -5,14 +5,14 @@
 
 	snmpd_enable="YES"
 	snmpd_flags="-a"
-	snmpd_conffile="/usr/local/share/snmp/snmpd.conf /etc/snmpd.conf"
+	snmpd_conffile="%%PREFIX%%/share/snmp/snmpd.conf /etc/snmpd.conf"
 	snmptrapd_enable="YES"
 	snmptrapd_flags="-a -p /var/run/snmptrapd.pid"
 
 **** You may specify the following make variables:
 
-	NET_SNMP_SYS_CONTACT="sylvio@FreeBSD.org"
-	NET_SNMP_SYS_LOCATION="Brasilia, BRA"
+	NET_SNMP_SYS_CONTACT="zi@FreeBSD.org"
+	NET_SNMP_SYS_LOCATION="USA"
 	DEFAULT_SNMP_VERSION=3
 	NET_SNMP_MIB_MODULES="host smux mibII/mta_sendmail ucd-snmp/diskio"
 	NET_SNMP_LOGFILE=/var/log/snmpd.log

Modified: head/net-mgmt/net-snmp/pkg-descr
==============================================================================
--- head/net-mgmt/net-snmp/pkg-descr	Sat Oct 13 00:57:04 2012	(r305802)
+++ head/net-mgmt/net-snmp/pkg-descr	Sat Oct 13 01:07:32 2012	(r305803)
@@ -1,12 +1,12 @@
 This is Net-SNMP (previously known as "ucd-snmp").
 
-Various tools relating to the Simple Network Management Protocol including: 
+Various tools relating to the Simple Network Management Protocol including:
 
-    An extensible agent 
-    An SNMP library 
-    tools to request or set information from SNMP agents 
-    tools to generate and handle SNMP traps 
-    a version of the unix 'netstat' command using SNMP 
+    An extensible agent
+    An SNMP library
+    tools to request or set information from SNMP agents
+    tools to generate and handle SNMP traps
+    a version of the unix 'netstat' command using SNMP
     a graphical Perl/Tk/SNMP based mib browser
 
 WWW: http://net-snmp.sourceforge.net/

Modified: head/net-mgmt/net-snmp/pkg-plist
==============================================================================
--- head/net-mgmt/net-snmp/pkg-plist	Sat Oct 13 00:57:04 2012	(r305802)
+++ head/net-mgmt/net-snmp/pkg-plist	Sat Oct 13 01:07:32 2012	(r305803)
@@ -66,6 +66,7 @@ include/net-snmp/agent/snmp_get_statisti
 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
@@ -75,6 +76,10 @@ 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
+@dirrmtry include/net-snmp/agent/util_funcs
 include/net-snmp/agent/var_struct.h
 include/net-snmp/agent/watcher.h
 include/net-snmp/config_api.h



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210130107.q9D17Xje010666>