Remove CFLAGS from net-snmp-config script (bug #257622).

Package-Manager: portage-2.2_rc56/cvs/Linux i686

3 files changed, 206 insertions, 2 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 1d810e4a6364..0f9f946088cc 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.200 2009/10/16 08:51:06 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.201 2009/12/08 05:24:42 jer Exp $
+
+*net-snmp-5.4.2.1-r3 (08 Dec 2009)
+
+  08 Dec 2009; Jeroen Roovers <jer@gentoo.org> +net-snmp-5.4.2.1-r3.ebuild:
+  Remove CFLAGS from net-snmp-config script (bug #257622).
 
 *net-snmp-5.4.2.1-r2 (16 Oct 2009)
 
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 6601331280b4..3859fe3505ca 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -9,5 +9,6 @@ AUX snmptrapd.init 624 RMD160 799faf488a62bc219d3765ed6d6283ca7764ad1c SHA1 1fde
 DIST net-snmp-5.4.2.1.tar.gz 5185390 RMD160 2148c42d486ed88f9cfc3ca1d50c68abcd7e3d63 SHA1 4f2df9ea62344fe840f493d0e08abe5de3697862 SHA256 11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c
 EBUILD net-snmp-5.4.2.1-r1.ebuild 5441 RMD160 ae8abc07b3e42b5612d657ac9946db762337062f SHA1 0b78a0437fd2bf40f5ee2556d24c71260f77947e SHA256 9257d6068ce843604358aac868dc51c8968fb10068c836744e4c443b8cdec174
 EBUILD net-snmp-5.4.2.1-r2.ebuild 5526 RMD160 9ecc995f9f78032ea2431cd6df98617cbcfb09d1 SHA1 40095e1d7c2e8af5e70ea2a604dba0ad92a5ebf3 SHA256 76ee0059c0dd39a4eec875316c20f50f83bdc0afe8d3db977e826d2d7ae037b0
-MISC ChangeLog 33559 RMD160 c5d9c4bcb5edd91b71f5eafef03e2e050eacec4d SHA1 e9d0a12222091dfb01353b0c9b9ed04656380361 SHA256 ff1e39fe15480d626dc436c4a38c2190851197da5fb138dfd248c5e8b4313320
+EBUILD net-snmp-5.4.2.1-r3.ebuild 5631 RMD160 8e1760d0b6b7b4324f332a4bc8b79172ed6923d0 SHA1 9a8b13aabfe42ec5af79e525a1be30a7745d811c SHA256 c73ddc0cb8994054aa07c458c7472c46ea99166c7432a2091b8eeb0520d11c21
+MISC ChangeLog 33728 RMD160 1f7e7874d0da5f09057220a973e3a09d60c5a5a9 SHA1 3a0b3aa605f3b9b9a9ad8decfd0bf67c29afa716 SHA256 229ce7deddf4a3cf68816c094801d04554205e8ae0c3792329013e4575ab0f30
 MISC metadata.xml 674 RMD160 102cd7df943ef25f0f462f2520fa77ceac3b5680 SHA1 90b51daab27e161a48feed336a348a8ecf0865c2 SHA256 233feade72f1b013bb5b0739478ab7200727db25a1d06977d0d122862565de24
diff --git a/net-analyzer/net-snmp/net-snmp-5.4.2.1-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r3.ebuild
new file mode 100644
index 000000000000..d233176af1f1
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.4.2.1-r3.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2009 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-r3.ebuild,v 1.1 2009/12/08 05:24:42 jer Exp $
+
+EAPI=2
+
+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="bzip2 diskio doc elf extensible ipv6 kernel_linux lm_sensors mfd-rewrites minimal perl python rpm selinux sendmail smux ssl tcpd X zlib"
+
+COMMON="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
+	)
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	elf? ( dev-libs/elfutils )
+	lm_sensors? (
+		kernel_linux? ( sys-apps/lm_sensors )
+	)
+	python? ( dev-python/setuptools )"
+
+RDEPEND="${COMMON}
+	perl? (
+		X? ( dev-perl/perl-tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmpd )"
+
+# Dependency on autoconf due to bug #225893
+DEPEND="${COMMON}
+	>=sys-devel/autoconf-2.61-r2
+	>=sys-apps/sed-4
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	# Fix CVE-2008-6123
+	epatch "${FILESDIR}"/CVE-2008-6123.patch
+
+	# lm_sensors-3 support
+	if use lm_sensors ; then
+		epatch "${FILESDIR}"/${PN}-5.4.1-sensors3.patch \
+			"${FILESDIR}"/${PN}-5.4.1-sensors3-version_detect.patch
+	fi
+
+	# 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
+
+	# remove CFLAGS from net-snmp-config script (bug #257622):
+	sed -i -e 's|@CFLAGS@ ||g' net-snmp-config.in
+
+	# Fix version number:
+	sed -i -e "s:NetSnmpVersionInfo = \".*\":NetSnmpVersionInfo = \"${PV}\":" snmplib/snmp_version.c
+
+	eautoreconf
+
+	ht_fix_all
+}
+
+src_configure() {
+	strip-flags
+
+	local mibs="host ucd-snmp/dlmod"
+	use diskio && mibs="${mibs} ucd-snmp/diskio"
+	use extensible && mibs="${mibs} ucd-snmp/extensible"
+	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use sendmail && mibs="${mibs} mibII/mta_sendmail"
+	use smux && mibs="${mibs} smux"
+
+	local myconf="$(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) \
+			$(use_with python python-modules) \
+			$(use_with ssl openssl) \
+			$(use_with tcpd libwrap)"
+	if use rpm ; then
+		myconf="${myconf} \
+			--with-rpm \
+			--with-bzip2 \
+			--with-zlib"
+	else
+		myconf="${myconf} \
+			$(use_with bzip2) \
+			$(use_with zlib)"
+	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" \
+		--enable-ucd-snmp-compatibility \
+		--enable-shared \
+		--enable-as-needed \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+
+	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
+		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 || die
+	newdoc EXAMPLE.conf.def EXAMPLE.conf || die
+
+	use doc && { dohtml docs/html/* || die ; }
+
+	keepdir /etc/snmp /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init snmpd || die
+	newconfd "${FILESDIR}"/snmpd.conf snmpd || die
+
+	newinitd "${FILESDIR}"/snmptrapd.init snmptrapd || die
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd || die
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		elog "USE='minimal' is set. Removing excess/non-minimal components."
+		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 || die
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup
+}
+
+pkg_postinst() {
+	elog "An example configuration file has been installed in"
+	elog "/etc/snmp/snmpd.conf.example."
+}