Version bump to fix security issue, bug #225105, thank Matthias Geerdsen and Robert Buchholz for report.

Package-Manager: portage-2.1.4.4

3 files changed, 208 insertions, 13 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 64350f135675..e66dca147bd4 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.169 2008/06/07 14:54:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.170 2008/06/16 13:48:22 pva Exp $
+
+*net-snmp-5.4.1.1 (16 Jun 2008)
+
+  16 Jun 2008; Peter Volkov <pva@gentoo.org> +net-snmp-5.4.1.1.ebuild:
+  Version bump to fix security issue, bug #225105, thank Matthias Geerdsen
+  and Robert Buchholz for report.
 
   07 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
   +files/net-snmp-5.4.1-perl-asneeded.patch, net-snmp-5.4.1-r4.ebuild:
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 70d14b98f3d3..ebeed6ef0ba7 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.2.1-conf-elf-rpm-bz2.patch 4734 RMD160 904d195cafa4334f9d8116a3d13eff4181e06d3b SHA1 0101a446e217a95f621e634544b19490fa01c072 SHA256 893180ba84ef69381d270286f042852a200c35b7792f55fe23920a0bcb1d8fb9
 AUX net-snmp-5.2.2-asneeded.patch 3014 RMD160 4394ac08e2ab0a4c57036b61b554e1bdc7c29ff2 SHA1 9c2f1e4ac9ffab8f604740b47dce9914dd0200f6 SHA256 2caa3beb56a0087e1800d875988ceaf11da0ba1eb5121804f2827d4b53a682b7
@@ -26,6 +23,7 @@ AUX snmptrapd.conf 635 RMD160 aba7b7196835bd359174156a527e13188f76e248 SHA1 0d29
 AUX snmptrapd.rc7 557 RMD160 e67117fbcb0a6f8668cb1abbc8fcfcb548ebfdb5 SHA1 dcaac6c0f9e086e49f653f100e0c3f9a7f65db1d SHA256 3594345cdf3c9a5a04073ec11a54e4a19881b27288cdbf22874cca5d0a0f624c
 DIST net-snmp-5.2.2.tar.gz 3919826 RMD160 54c0bcc34ca6462aaab9ba69b06955dd7c11670f SHA1 2c45d24c5784b8b469e9ba3fde9eeeeabbcb7ab0 SHA256 ed5cc617e4cfe38af64a3ded8542c4e61d045dbeec00d5b93a31afc3337135fd
 DIST net-snmp-5.3.1.tar.gz 4210843 RMD160 7bcdd213fb2517d0927b030deab5146522b58b3d SHA1 8ddb5122769814f04a7d3d352dcc640df7c89d41 SHA256 fb6d5113ccdd8c4661fe5d825160e45a7c5035b145e24ec18f71a509ecb0fe43
+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.tar.gz 5031685 RMD160 8ad1f9a3def8022eea48d9b74ae71d8efb59ca61 SHA1 8edb17509eba9f8c9cfb015fe35a1024048129eb SHA256 2f43cd6f3c4066f8c17fdc47931a96c1fce808c9d1dd74bcb5a79d9d29d5f947
 EBUILD net-snmp-5.2.2-r3.ebuild 5371 RMD160 ce0b64e18b1f60045091047cff6051f6a9beae89 SHA1 59693088230ee9feff991aacf5331c4459d038c2 SHA256 4939f3f8c543b21b7b20ff1543e3344061c4efbfd1ef8572ae89eac051695828
@@ -33,14 +31,7 @@ EBUILD net-snmp-5.3.1-r1.ebuild 5639 RMD160 1c306b4f98731c42483865680b6eb9b35883
 EBUILD net-snmp-5.4.1-r1.ebuild 5670 RMD160 b7a7fb02917d33e0aa9b8e6c800456ebd1fe5746 SHA1 ae78f95d700847e26d516deaebba9a5e909773a4 SHA256 0943f4874fff61fa71bf20fd15d08f17f12f091c8a95fdeb4e331e39570966e0
 EBUILD net-snmp-5.4.1-r3.ebuild 5233 RMD160 cdc347694ba85101740a13dbd0bb7d1faf6743cd SHA1 50d17561fea856948dc1192078a4368bea55ee3b SHA256 3277a5ce9ee7333d39d2e792387bbf969dbcab1b5833e0ab87c0c248b8b702a3
 EBUILD net-snmp-5.4.1-r4.ebuild 5998 RMD160 3dd7262108af3535c4bf5818938fe2a7216d560f SHA1 0900bfe3bee41f6d3b02cee7d1743ebb956ad5ad SHA256 6549a47ddbca499d6639e6ca06f70881419c21e31ec2b932380ea063597709c8
+EBUILD net-snmp-5.4.1.1.ebuild 6066 RMD160 7abd5dd7db2939a2dc3f37efcd2c8d750e9f6ffc SHA1 f24891ab7765c8f098253775172982f5f0468b96 SHA256 e93ba44e967968da1d01a7d24aeb87bb787522ed93dfad7b37ab6011010be373
 EBUILD net-snmp-5.4.ebuild 4979 RMD160 079fc223fedf18de1781c875ea2b401661258010 SHA1 9fd47d05498cfac287ce7386a5e2b49c706c9946 SHA256 c49ceced1464a7b00f745e05f80cceb18c94bdcfe92aacefbe78e2493cacfc08
-MISC ChangeLog 28458 RMD160 b202ed2376124de4d5712759f5d187bbd11f3db9 SHA1 0a2269b6c4a24fc25a19459fd55e0b7aed8640bb SHA256 0601d817625a644d9094941cdc469fd6f7975217f75d5a2107a949d02c5c9fad
+MISC ChangeLog 28666 RMD160 62ef286703546104a8cb9f9f8b0a00ade8c11986 SHA1 5218417682c8a1e3601f29bb385b07265308ed02 SHA256 27d26d826923f22d195531e53c9839d0d270ef404f75054c5303fdc424aca8cb
 MISC metadata.xml 160 RMD160 2738573ec519cbef4b293bc132f7dd9d02291137 SHA1 29b8b234e0f3a475b50bd4df1ef8b4e5749823ce SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b
-MISC net-snmp-5.4.1-r4.ebuild.rej 383 RMD160 e14cb798d11eed433293742c1158cb501208ea76 SHA1 2088f5ba408fd578616e471d2728cdc886b581b0 SHA256 81547782407afa0074145aa3115ed2935431568393d784299682200d54fcb819
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhKoRoACgkQAiZjviIA2XiQQACggIP21/b8uteUn7VYjVEhDJEg
-/l8An2IUoZ2Ij7srfNh1WHk1uJvVwwqv
-=1xeY
------END PGP SIGNATURE-----
diff --git a/net-analyzer/net-snmp/net-snmp-5.4.1.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.1.1.ebuild
new file mode 100644
index 000000000000..d26e3476a811
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.4.1.1.ebuild
@@ -0,0 +1,198 @@
+# 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.1.1.ebuild,v 1.1 2008/06/16 13:48:22 pva 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 )
+	python? ( dev-python/setuptools )"
+
+RDEPEND="${DEPEND}
+	perl? (
+		X? ( dev-perl/perl-tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmpd )"
+
+DEPEND="${DEPEND}
+	>=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
+
+	# snmpd crashes when snmpd.conf contains more than one "exec shelltest" line
+	epatch "${FILESDIR}"/${PN}-5.4-exec-crash.patch
+	# agent: suppress annoying "registration != duplicate" warning for root oids
+	epatch "${FILESDIR}"/${PN}-5.4.1-suppresssuppress-annoying.patch
+	# Crash when more then one interface have the same IP, bug 203127
+	epatch "${FILESDIR}"/${PN}-5.4.1-ipAddressTable-crash-with-double-free.patch
+	# snmpconf generates config files with proper selinux context
+	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+	epatch "${FILESDIR}"/${PN}-5.4.1-clientaddr-fix.patch #180266
+	epatch "${FILESDIR}"/${PN}-5.4.1-CVE-2008-2292.patch #222265
+	epatch "${FILESDIR}"/${PN}-5.4.1-process-count-race.patch #213415
+	epatch "${FILESDIR}"/${PN}-5.4.1-incorrect-hrFSStorageIndex.patch #211660
+	epatch "${FILESDIR}"/${PN}-5.4.1-perl-asneeded.patch #224251
+
+	# Fix version number to report 5.4.1.1:
+	sed -i -e 's:NetSnmpVersionInfo = "5.4.1":NetSnmpVersionInfo = "5.4.1.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."
+}