Version bump (bug #245306).

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.25-gentoo-r7-JeR i686

3 files changed, 198 insertions, 12 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 0e7aaf161739..628a9771c76b 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.180 2008/08/04 19:47:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.181 2008/11/13 17:46:48 jer Exp $
+
+*net-snmp-5.4.2.1 (13 Nov 2008)
+
+  13 Nov 2008; Jeroen Roovers <jer@gentoo.org> +net-snmp-5.4.2.1.ebuild:
+  Version bump (bug #245306).
 
   04 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Describe local USE flags for GLEP 56.
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index dc23ba56dde2..634bfdbbbb96 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX net-snmp-5.1.2-snmpconf-selinux.patch 286 RMD160 c78fd9d2a563ebafd21aa85a582b989a805eb645 SHA1 159990e855cfeb50ac3657d1b97eda181d4ffb9e SHA256 70b4bdaa243efd5ae5703b3272063314fc56b6e2333f7c650b635ddab141f874
 AUX net-snmp-5.4-exec-crash.patch 567 RMD160 fe110ace0ae451a8cf25d18d4133fb0d85dcaf5c SHA1 4a4538958e4c805981e1f0da4d6f1980a03aeab6 SHA256 2c4d3d281380d394d0d349c37839bb89f3d82d3e1c43513e042d24126441741c
 AUX net-snmp-5.4-makefile.patch 597 RMD160 90f8e6db0a05fd21c06e98b65b4bbd377f931fe9 SHA1 2ff51b2ab2df2224dd34ca1af16430fbf0b97927 SHA256 fd8c6ceda9c5d99cd92f81a7977d2134960ee14fac3ab9f1f8c6d03c6a69edb1
@@ -18,18 +15,13 @@ AUX snmptrapd.conf 635 RMD160 aba7b7196835bd359174156a527e13188f76e248 SHA1 0d29
 AUX snmptrapd.rc7 557 RMD160 e67117fbcb0a6f8668cb1abbc8fcfcb548ebfdb5 SHA1 dcaac6c0f9e086e49f653f100e0c3f9a7f65db1d SHA256 3594345cdf3c9a5a04073ec11a54e4a19881b27288cdbf22874cca5d0a0f624c
 DIST net-snmp-5.4.1.1.tar.gz 5123861 RMD160 870b6a3e4eb28df3cbdf0df34d23f46bd7de8961 SHA1 cfeef748f242a7b25ad8eea95977ff277984e368 SHA256 b22ecb5e7f0907c20cc7fc9f1e1f31b1b4b2dd81abdc3e2e0bfddf8d060008a2
 DIST net-snmp-5.4.1.tar.gz 5122455 RMD160 3723488dab8d164702a7d55c9c72eeaec07dd50c SHA1 ac5ba033c10d53d3057415121f8c4936c643c208 SHA256 0ea976722c993c87dede8eb6348e6feb059e3851bbef2de824bf18ac97cdb565
+DIST net-snmp-5.4.2.1.tar.gz 5185390 RMD160 2148c42d486ed88f9cfc3ca1d50c68abcd7e3d63 SHA1 4f2df9ea62344fe840f493d0e08abe5de3697862 SHA256 11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c
 DIST net-snmp-5.4.tar.gz 5031685 RMD160 8ad1f9a3def8022eea48d9b74ae71d8efb59ca61 SHA1 8edb17509eba9f8c9cfb015fe35a1024048129eb SHA256 2f43cd6f3c4066f8c17fdc47931a96c1fce808c9d1dd74bcb5a79d9d29d5f947
 EBUILD net-snmp-5.4.1-r1.ebuild 5670 RMD160 b7a7fb02917d33e0aa9b8e6c800456ebd1fe5746 SHA1 ae78f95d700847e26d516deaebba9a5e909773a4 SHA256 0943f4874fff61fa71bf20fd15d08f17f12f091c8a95fdeb4e331e39570966e0
 EBUILD net-snmp-5.4.1-r3.ebuild 5229 RMD160 e8015361b1c1d8a2f489ad15fe2d4459f69c5122 SHA1 6d2af2ba11fcb7ab2e0637fcacebb776da9e6f84 SHA256 1cfbb7d5b6574aedd6f86056478a48280461e1a57e859b3ac8197bf9cfe2b05a
 EBUILD net-snmp-5.4.1-r4.ebuild 5998 RMD160 3dd7262108af3535c4bf5818938fe2a7216d560f SHA1 0900bfe3bee41f6d3b02cee7d1743ebb956ad5ad SHA256 6549a47ddbca499d6639e6ca06f70881419c21e31ec2b932380ea063597709c8
 EBUILD net-snmp-5.4.1.1.ebuild 6133 RMD160 853adb353de08af2ae99262e0899137919a472a7 SHA1 894ffc15f1f950ece2dec28760f4cdadf5f586bc SHA256 5d98c3123a02e001757ee8eb1635915be5eab26e14ad650ad960beb702ae68c3
+EBUILD net-snmp-5.4.2.1.ebuild 5399 RMD160 f1e3b58e0d088a1e89de3dc0be34e262341ec7a1 SHA1 2dec0356a3f4198e1b20cf29153955577b10b75b SHA256 6aed913d24fbfbb8eb1e3233a70a336ed27cfa23a58d2b5412f1119cd7339744
 EBUILD net-snmp-5.4.ebuild 4979 RMD160 079fc223fedf18de1781c875ea2b401661258010 SHA1 9fd47d05498cfac287ce7386a5e2b49c706c9946 SHA256 c49ceced1464a7b00f745e05f80cceb18c94bdcfe92aacefbe78e2493cacfc08
-MISC ChangeLog 30329 RMD160 bae453b1340aeed203c12bb7431c89f64ed9d90a SHA1 66007bcbf8594293d5a7e7561ce5ed7fda785cfb SHA256 075abce0113f6c73852ee3525ba5492b61d63ec47e716a3975db3a0a6d3efd34
+MISC ChangeLog 30466 RMD160 9b328608939da1a5df813ee5cf98fe773e9a71aa SHA1 6cb880af41c0c467523cb498dd12747914363e46 SHA256 c761974fd34d4f27e53fb6d2c8756128a8969e76d0514d29cf519ff15774f2d0
 MISC metadata.xml 674 RMD160 102cd7df943ef25f0f462f2520fa77ceac3b5680 SHA1 90b51daab27e161a48feed336a348a8ecf0865c2 SHA256 233feade72f1b013bb5b0739478ab7200727db25a1d06977d0d122862565de24
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkQ6tcACgkQ67wieSYcaxc0HwCg2ZceZT24yj6QHQZoATEQ2/FV
-wsQAnjO0gdhPd3psjrjfnihnfAyxdLr2
-=uuDj
------END PGP SIGNATURE-----
diff --git a/net-analyzer/net-snmp/net-snmp-5.4.2.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.2.1.ebuild
new file mode 100644
index 000000000000..157a82cdaeed
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.4.2.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2008 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.4.2.1.ebuild,v 1.1 2008/11/13 17:46:48 jer Exp $
+
+inherit fixheadtails flag-o-matic perl-module python autotools
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://net-snmp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="as-is BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="diskio doc elf ipv6 lm_sensors mfd-rewrites minimal perl python rpm selinux smux ssl tcpd X sendmail extensible"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+		app-arch/bzip2
+		>=sys-libs/zlib-1.1.4
+	)
+	elf? ( dev-libs/elfutils )
+	lm_sensors? ( =sys-apps/lm_sensors-2* )
+	python? ( dev-python/setuptools )"
+
+RDEPEND="${DEPEND}
+	perl? (
+		X? ( dev-perl/perl-tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmpd )"
+
+# Dependency on autoconf due to bug #225893
+DEPEND="${DEPEND}
+	>=sys-devel/autoconf-2.61-r2
+	>=sys-apps/sed-4
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fix access violation in make check
+	sed -i -e 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
+		die "sed eval_tools.sh failed"
+	# fix path in fixproc
+	sed -i -e 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
+		die "sed fixproc failed"
+
+	if use python ; then
+		python_version
+		PYTHON_MODNAME="netsnmp"
+		PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}/site-packages
+		sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${D}':" Makefile.in || die "sed python failed"
+	fi
+
+	# snmpconf generates config files with proper selinux context
+	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	# Fix version number to report 5.4.2.1:
+	sed -i -e 's:NetSnmpVersionInfo = "5.4.1":NetSnmpVersionInfo = "5.4.2.1":' snmplib/snmp_version.c
+
+	eautoreconf
+
+	ht_fix_all
+}
+
+src_compile() {
+	local mibs
+
+	strip-flags
+
+	mibs="host ucd-snmp/dlmod"
+	use smux && mibs="${mibs} smux"
+	use sendmail && mibs="${mibs} mibII/mta_sendmail"
+	use lm_sensors && mibs="${mibs} ucd-snmp/lmSensors"
+	use diskio && mibs="${mibs} ucd-snmp/diskio"
+	use extensible && mibs="${mibs} ucd-snmp/extensible"
+
+	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" \
+		--enable-ucd-snmp-compatibility \
+		--enable-shared \
+		--enable-as-needed \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ipv6) \
+		$(use_enable !ssl internal-md5) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with rpm) \
+		$(use_with rpm bzip2) \
+		$(use_with rpm zlib) \
+		$(use_with elf) \
+		$(use_with python python-modules) \
+		|| die "econf failed"
+
+	emake -j1 || die "emake failed"
+
+	if use perl ; then
+		emake perlmodules || die "compile perl modules problem"
+	fi
+
+	if use python ; then
+		emake pythonmodules || die "compile python modules problem"
+	fi
+
+	if use doc ; then
+		einfo "Building HTML Documentation"
+		make docsdox || die "failed to build docs"
+	fi
+}
+
+src_test() {
+	cd testing
+	if ! make test ; then
+		echo
+		einfo "Don't be alarmed if a few tests FAIL."
+		einfo "This could happen for several reasons:"
+		einfo "    - You don't already have a working configuration."
+		einfo "    - Your ethernet interface isn't properly configured."
+		echo
+	fi
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	if use perl ; then
+		make DESTDIR="${D}" perlinstall || die "make perlinstall failed"
+		fixlocalpod
+
+		use X || rm -f "${D}/usr/bin/tkmib"
+	else
+		rm -f "${D}/usr/bin/mib2c" "${D}/usr/bin/tkmib" "${D}/usr/bin/snmpcheck"
+	fi
+
+	if use python ; then
+		mkdir -p "${D}/${PYTHON_DIR}" || die "Couldn't make $PYTHON_DIR"
+		make pythoninstall || die "make pythoninstall failed"
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	use doc && dohtml docs/html/*
+
+	keepdir /etc/snmp /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.rc7 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.rc7 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	# Remove everything, keeping only the snmpd, snmptrapd, MIBs, libs, and includes.
+	if use minimal; then
+		elog "USE=minimal is set. Cleaning up excess cruft for a embedded/minimal/server only install."
+		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,snmpcheck}}
+		rm -rf "${D}"/usr/share/snmp/snmpconf-data "${D}"/usr/share/snmp/*.conf
+		rm -rf "${D}"/usr/bin/{fixproc,traptoemail} "${D}"/usr/bin/snmpc{heck,onf}
+		find "${D}" -name '*.pl' -exec rm -f '{}' \;
+		use ipv6 || rm -rf "${D}"/usr/share/snmp/mibs/IPV6*
+	fi
+
+	# bug 113788, install example config
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+}
+
+pkg_postrm() {
+	if use python ; then
+		python_mod_cleanup
+	fi
+}
+
+pkg_postinst() {
+	elog "An example configuration file has been installed in"
+	elog "/etc/snmp/snmpd.conf.example."
+}