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.

(Portage version: 2.2.0_alpha122/cvs/Linux x86_64)

3 files changed, 203 insertions, 5 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/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
+}