Add an USE flag to make picutils dependency optional (bug #432926), as well as a netlink one to use libnl instead of parsing /proc/net/tcp.

Package-Manager: portage-2.2.0_alpha122/cvs/Linux x86_64

4 files changed, 215 insertions, 12 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index e4296ad4f191..cf943e7efe61 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.238 2012/08/26 14:14:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.239 2012/08/27 15:28:20 flameeyes Exp $
+
+*net-snmp-5.7.2_rc1-r1 (27 Aug 2012)
+
+  27 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +net-snmp-5.7.2_rc1-r1.ebuild, metadata.xml:
+  Add an USE flag to make picutils dependency optional (bug #432926), as well as
+  a netlink one to use libnl instead of parsing /proc/net/tcp.
 
   26 Aug 2012; Raúl Porcel <armin76@gentoo.org> net-snmp-5.7.2_rc1.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #431752
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index f06ac1bfb6dc..7c8afa683aba 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX CVE-2008-6123.patch 867 SHA256 31a9b72b252582cd84e7f673b670ebbd2153dc719894aa668a48b24d6ba516f6 SHA512 385cd5d5801dc00de5e0c06d685452b049f1250c08d71ab37bc254887ef9c12839e466af7c2f12a98ac23e962d86cb5c878d00dce4eaecab072811db1769828b WHIRLPOOL 1606ff9abe2a294d9502e604454de4b9503a353eccce0360ab1ff8239c13b4154ac36ff859f16e693c43f3cc4a37b5c553e39261f6c0ce77648b90b89ab4391b
 AUX net-snmp-5.1.2-snmpconf-selinux.patch 286 SHA256 70b4bdaa243efd5ae5703b3272063314fc56b6e2333f7c650b635ddab141f874 SHA512 704b6366c797e2c114b111869f920fd608ba75cdea2854de29f2df0d453906225e9af71318920465bd94a991f771c4a3ab4cf5efc8ee67c65053efa2113d7ee4 WHIRLPOOL b4e0ccc9d8fe3db265aef90ff11e054594e0de75fc2e503d09a64a770de27514d6e1948ead207b4ffa561cd94a82371f20d47dacd90ed6cc59beb72e2b7915d2
@@ -16,13 +16,18 @@ DIST net-snmp-5.4.2.1.tar.gz 5185390 SHA256 11a8baf167f7bfff60d2590e050991400a3a
 DIST net-snmp-5.7.2.rc1-patches-1.tar.xz 2268 SHA256 0ac134d9f7f205437b23f9eddb65f861273490cbe91fee16598e51a4a96e6072 SHA512 4ff405fa76edcfbd5001e7bed0022fa074b72c0b06fa8f4227b1d678620e0776cd5d52ac3ae65ce18d64389231571642426aa63d9677bad73723433f181c9e25 WHIRLPOOL 9ba93c3e7529493a28b86b6afc5098e69dd77695bed7f3ebfde4ec3d9e10f3ed3f5f437d2c2a6d90d03b7f77de42361a97920943ee73d0208c2f5f4bd4d06949
 DIST net-snmp-5.7.2.rc1.tar.gz 6277186 SHA256 ac6ffb1468d5d651e446ded30f8aea3efe80925be5794100c3d0e8c21c04b784 SHA512 905375b707909a164943d7394fa5cc6997101e64f3f641f29e2cf309d5572c8cea9c53be4b2f79893c9c00407a3bec44b495f90f4af5663d5da58f2dafc30fc7 WHIRLPOOL 1656b0e9d591d39e47b9a46943bc975d1c1d175799b1656ca877f57285db44ab54bc42ff31b3c9b13d1b60767c90b3af1a99d3c13ed8745106e0b79d97cc31af
 EBUILD net-snmp-5.4.2.1-r5.ebuild 5999 SHA256 62a759577eed35b6c9ed6014abfd11336a0988999380aa695cd7ccf60bb8752e SHA512 49bc7b9f5ffa9dd302fc60fcd54cd83675951d970732175f1f5c4b744b1f282f0955302f4c10b8a7eee8d9e5e3fd47733bd912cc798fd3304197d8f85f1290b4 WHIRLPOOL cf455a67870da7aeb0d4859abe2d7ac496a5bf94215e5c6c3730a35f03c6088840db5c88ad0a70925196c62cf66299d4902e8e19a6aac8ed94d050b985133dbf
+EBUILD net-snmp-5.7.2_rc1-r1.ebuild 4499 SHA256 5305e0aedcb4945ecde19e39b987bec955e0e0d1e78afe306a484e74b20eeb23 SHA512 7f572aec0efa84e18d217cfb87ef0e4ab8e5755c6516dfc8ad0f3acc26d78269bb5a404b2f4272786d8e0ee16494663d214d89000a6aaf71e42b7633a5fd6928 WHIRLPOOL ad48543c7ebf021a3b85c3f042f867fb18cdf547bebb6da3a9fb894a46e85f535ffbdd2ea076754a8e27e4e4666cbd69f250c8647128085e257f07d3e1b2341c
 EBUILD net-snmp-5.7.2_rc1.ebuild 4288 SHA256 6027e440eaf3a2136cbaf4bc1c5b20451555ffc47be755f0389424002563c6db SHA512 b3f5643f7b713830ebf2d955bdf14dd9ba07d86fdf758f54283b26ee8e091127feb68646aaf179aa1d7ada4b6aa097ad661b20be10f2b8329351afa009a2410f WHIRLPOOL 87df52a7e63a2272959f7dd64e271902cb1b59c440b452ffd0fc3e413553fc68ab4f9f3b8b6b1fe9d2f897762e63e17134604cccd10ad2a8b3fdfc6433986c50
-MISC ChangeLog 39585 SHA256 7441930da699da521cf9b731a743f3f54fd566026602afacfcc0e4d2b40a6991 SHA512 880a030a1f608d8bcfb23dffbaadec40baae125c39574e4c6515719519bbf3d11cbdb9265893a77026ac6dce04b728b5b5b3a892a510f0d591bc054626183bd1 WHIRLPOOL 826704df205c5926b28b22bf2b6184dd76fd0173617a710baf3eaed7370247afa82aa4f2860add966282fddc4afe0ed5f02041d8204c95331997fa52c41e5c0c
-MISC metadata.xml 820 SHA256 8854a29ad89206b3686e27c2935e53d947ae2ca0fd098dfbf85cf2cec8db4893 SHA512 0d736e5e654ecffbfb68b851e25fd3038c6da3a82406471e7ba3c2e6f0b2e58a908cc6f24e592b666e7242bba4d13d8da8978e47f0d446575b150402a22ac6d8 WHIRLPOOL 844cec6bd9ff7bd82118093e2d88b71ecee65bdbe2b25fea2ae8e4518cf3a8213668d1c1f57385caf5c0457d5a42400ec8d0e2e4aeefd9041e7ab3ca3b72e769
+MISC ChangeLog 39873 SHA256 ecd7e7392279e3cac00071c0a74149ac73e0f4d8c523188063ebedb718ff43bf SHA512 3b7772fc0114dccff1957c43638fbaae8276e7d149e317c4ef5cef96dfe655464708a5eacd9b8349fb97dac855a37544c814cfdd02cf046cf2fa6bcfcd3e5611 WHIRLPOOL 9053db0065a6704331a12b1c564ced2ee50f41dc9680ad5afc4eb03d570a72502b529204fe1018f3a791691b4377a9bc115d5d9ea9d4cdca94dd22bce63b2e44
+MISC metadata.xml 1452 SHA256 0edd0d03c80b596668dded75f8b7da25a681f6c05b0bf28a84eceb71239742be SHA512 93fe206eaf444250b0f9de29affaa75943b0092e2fe27b9436b9d764156fb392bd32fa82a1bfa638d6f20d20901a0625ac0618c801c4c34aee7e44a23452d419 WHIRLPOOL 5dce71e6609d011c472621b47c10d90d21057f23455286b7f99257f1eced93ed66215104836a55af05898e899493be73a930ea40f4529d9d104abbe82190e15e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlA6L1kACgkQuQc30/atMkC2aACcDZDcVMpwU7WWZRYeIiIJdTLd
-LEcAn1kwZBBE7waU1RJsTPqYhRz70Jur
-=M/Ij
+iQEcBAEBCAAGBQJQO5JcAAoJEBzRPIrUMBNCxV0H/RXWzSYKIWCtWLAaIEKpcaYq
+0is8TSNClAdZF7SX2xpX3a4IbJRSXi8IMJxX9DK+HIlRk1k5n1yCnF604u/PCNJC
+xFvH94o26uPDfn+nydxCecmX2QK7Vh/SMczHi7CZcGYg7MUeY6MtlZsoPDeZMBFB
+FPtP/q1FHQY+8GWUODc1kuiCbrFo+ZMvSeP5LEZRmfiZhvHRpkqUsa2hkdXXlGpN
+olMclJnYjEapRKUg+gxkUCI7zpvHzUv4t+wFFb2TWyMyA8UM3ASTLxM7jpFHfJ+N
+EPs7TxDihNNuUvt9ALb91N87m0cKFQCE8Fy8Vvxh1Fh3ABVAlHRcohKAiYjDKeE=
+=ukfT
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/net-snmp/metadata.xml b/net-analyzer/net-snmp/metadata.xml
index ab2197bd9760..47613f67094d 100644
--- a/net-analyzer/net-snmp/metadata.xml
+++ b/net-analyzer/net-snmp/metadata.xml
@@ -3,16 +3,34 @@
 <pkgmetadata>
   <herd>netmon</herd>
   <use>
-    <flag name='diskio'>Enable the use of diskio mibs</flag>
+    <flag name='diskio' restrict='&lt;net-analyzer/net-snmp-5.7.2_rc1'>
+      Enable the use of diskio MIBs.
+    </flag>
     <flag name='elf'>Enable the use of elf utils to check uptime on some systems</flag>
-    <flag name='extensible'>build deprecated extensible mib module (extend is successor)</flag>
+    <flag name='extensible' restrict='&lt;net-analyzer/net-snmp-5.7.2_rc1'>
+      Build deprecated extensible mib module (extend is successor)
+    </flag>
     <flag name='mfd-rewrites'>Use MFD rewrites of mib modules where available</flag>
-    <flag name='rpm'>Enable the rpm snmp probing</flag>
+    <flag name='rpm'>
+      Enable monitoring of <pkg>app-arch/rpm</pkg>. This flag requires
+      the bzip2 and zlib flags to be enabled as well.
+    </flag>
     <flag name='sendmail'>Enable sendmail statistics monitoring</flag>
-    <flag name='smux'>Enable the smux MIBS module</flag>
+    <flag name='smux' restrict='&lt;net-analyzer/net-snmp-5.7.2_rc1'>
+      Enable the SNMP multiplexing (smux) MIBs module
+    </flag>
     <flag name='ucd-compat'>
       Build UCD compatibility library. Increases significantly the
       install size.
     </flag>
+    <flag name='pci'>
+      Use libpci (from <pkg>sys-apps/pciutils</pkg>) to look up
+      network interface description. This feature is only available on
+      Linux.
+    </flag>
+    <flag name='netlink'>
+      Use <pkg>dev-libs/libnl</pkg> to fetch TCP statistics instead of
+      using /proc/net/tcp (Linux only).
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.2_rc1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.2_rc1-r1.ebuild
new file mode 100644
index 000000000000..ec85b6f337f8
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.7.2_rc1-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.7.2_rc1-r1.ebuild,v 1.1 2012/08/27 15:28:20 flameeyes Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+
+WANT_AUTOMAKE=none
+
+PATCHSET=1
+
+inherit eutils perl-module python autotools
+
+MY_P="${P/_rc/.rc}"
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://net-snmp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+	http://dev.gentoo.org/~flameeyes/${PN}/${MY_P}-patches-${PATCHSET}.tar.xz"
+
+# GPL-2 for the init scripts
+LICENSE="as-is BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bzip2 doc elf ipv6 mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink"
+
+COMMON="ssl? ( >=dev-libs/openssl-0.9.6d )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	elf? ( dev-libs/elfutils )
+	python? ( dev-python/setuptools )
+	pci? ( sys-apps/pciutils )
+	lm_sensors? ( sys-apps/lm_sensors )
+	netlink? ( dev-libs/libnl:1.1 )"
+
+RDEPEND="${COMMON}
+	perl? (
+		X? ( dev-perl/perl-tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+	sys-apps/openrc"
+
+# Dependency on autoconf due to bug #225893
+DEPEND="${COMMON}
+	>=sys-apps/sed-4
+	doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="rpm? ( bzip2 zlib )"
+
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	epatch "${WORKDIR}"/patches/*.patch
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail smux"
+	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+
+	use python && export PYTHON_DIR="$(python_get_sitedir)"
+
+	if ! use pci; then
+		export ac_cv_header_pci_pci_h=no
+		export netsnmp_cv_func_pci_lookup_name_LMIBLIBS=no
+	fi
+
+	econf \
+		--with-install-prefix="${D}" \
+		--with-sys-location="Unknown" \
+		--with-sys-contact="root@Unknown" \
+		--with-default-snmp-version="3" \
+		--with-mib-modules="${mibs}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		--enable-shared --disable-static \
+		--with-ldflags="${LDFLAGS}" \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable !ssl internal-md5) \
+		$(use_with elf) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with bzip2) \
+		$(use_with zlib) \
+		$(use_with rpm) \
+		$(use_with netlink libnl)
+}
+
+src_compile() {
+	emake OTHERLDFLAGS="${LDFLAGS}"
+
+	if use doc ; then
+		einfo "Building HTML Documentation"
+		emake docsdox
+	fi
+}
+
+src_install () {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	if use perl ; then
+		fixlocalpod
+		use X || rm -f "${D}"/usr/bin/tkmib
+	else
+		rm -f "${D}"/usr/bin/mib2c "${D}"/usr/bin/snmpcheck "${D}"/usr/bin/tkmib
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	use doc && dohtml docs/html/*
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/**/*.pl
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize netsnmp
+	fi
+
+	elog "An example configuration file has been installed in"
+	elog "/etc/snmp/snmpd.conf.example."
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup netsnmp
+	fi
+}