From fb13c87b6663d7c290cc9dfa750e08a5f9054ff2 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Tue, 13 Jul 2010 21:03:49 +0000 Subject: [PATCH] Version bump (bug #317325). Respect LDFLAGS more (perl still broken). Remove lm_sensors support from 5.5 until there is a patch. Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- net-analyzer/net-snmp/ChangeLog | 10 +- net-analyzer/net-snmp/Manifest | 6 +- net-analyzer/net-snmp/net-snmp-5.4.3.ebuild | 209 ++++++++++++++++++++ net-analyzer/net-snmp/net-snmp-5.5.ebuild | 202 +++++++++++++++++++ 4 files changed, 425 insertions(+), 2 deletions(-) create mode 100644 net-analyzer/net-snmp/net-snmp-5.4.3.ebuild create mode 100644 net-analyzer/net-snmp/net-snmp-5.5.ebuild diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog index a97ca6139175..1a4ea4bf03ca 100644 --- a/net-analyzer/net-snmp/ChangeLog +++ b/net-analyzer/net-snmp/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-analyzer/net-snmp # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.212 2010/07/12 19:56:51 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.213 2010/07/13 21:03:49 jer Exp $ + +*net-snmp-5.5 (13 Jul 2010) +*net-snmp-5.4.3 (13 Jul 2010) + + 13 Jul 2010; Jeroen Roovers +net-snmp-5.4.3.ebuild, + +net-snmp-5.5.ebuild: + Version bump (bug #317325). Respect LDFLAGS more (perl still broken). + Remove lm_sensors support from 5.5 until there is a patch. 12 Jul 2010; Jeroen Roovers net-snmp-5.4.2.1-r4.ebuild: Stable for HPPA (bug #323197). diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest index 560f71a7ff8f..1d8c18be0c86 100644 --- a/net-analyzer/net-snmp/Manifest +++ b/net-analyzer/net-snmp/Manifest @@ -7,9 +7,13 @@ AUX snmpd.init 1054 RMD160 6cc814d19524e1899b4bb9539ee9752304451bc9 SHA1 ed2b1a4 AUX snmptrapd.conf 635 RMD160 aba7b7196835bd359174156a527e13188f76e248 SHA1 0d296caa01c789455c3cd4c67cd81aca5547681d SHA256 902d73cb44446df060bf20e0c8ef0f8815d5b846f96d93894913d3309a3841b3 AUX snmptrapd.init 624 RMD160 799faf488a62bc219d3765ed6d6283ca7764ad1c SHA1 1fdef5a0a29f181c2df31b9d7adc4d4ebb8b018c SHA256 0e6dae4ca0213be9f9311c8dacdf36e7fea05150db48d15660506d53abda5a39 DIST net-snmp-5.4.2.1.tar.gz 5185390 RMD160 2148c42d486ed88f9cfc3ca1d50c68abcd7e3d63 SHA1 4f2df9ea62344fe840f493d0e08abe5de3697862 SHA256 11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c +DIST net-snmp-5.4.3.tar.gz 5199202 RMD160 417f47c301c3221a64f37162b56b4661c9f6d8cb SHA1 849a20ddeaa90b1b0010e487876927e615b5c6bc SHA256 461a7a72acbe5ad13e39f0bae129b49df541b8ea8f9178d2724de7654d4f1c40 +DIST net-snmp-5.5.tar.gz 5531055 RMD160 1699d9cb6bcd5075a565cc8af9913be4dfbc49e2 SHA1 ca03ece79b218af081ee4b273da4e217f459e508 SHA256 95936c6a95bef929e7ae0d9144c3fa20ffe62291dff94835bde88c5b5d2bf347 EBUILD net-snmp-5.4.2.1-r1.ebuild 5379 RMD160 e40be09d8708039178f7f6c38e2552d2962cdfc5 SHA1 117898fecd0dea9a83e97656ca402ac069d7c79c SHA256 444a411dc6592aa16b789c499d44b63bddd52dee655c73449300c02b90f166d0 EBUILD net-snmp-5.4.2.1-r2.ebuild 5597 RMD160 be98f0aaaf645e8978008d0e748ac4708faee929 SHA1 ba6897bb4f057b7c2e80ed411135f1914ef07038 SHA256 52358096842b692188dcd5fd5748fa67a0997ae2d010f77922ae149c7e91bd1f EBUILD net-snmp-5.4.2.1-r3.ebuild 5705 RMD160 a5e6821cf451e79304813766f8e7dc44eb7c8c6c SHA1 35d3c2df290e105386461827c41ab15cbb4f9017 SHA256 08b674a7db63259ebd8ff0ad758c18c8e837810a789ae02604faef5aabd01ea5 EBUILD net-snmp-5.4.2.1-r4.ebuild 5808 RMD160 cb0a9ba6286d2f615f171c521a52b17101b18655 SHA1 93b3125e00949ea63e4cbbff65afcab9f53bbacd SHA256 1be0dd43ad87765976513b478c0fb18cdb94fe564473dc97e8b376e8eeb9562e -MISC ChangeLog 35139 RMD160 1f071460f127cf0d5d22a269f963ed433f4dbdbd SHA1 16d1ea0fc9083e527b6c1ef0dc2cd33d72515336 SHA256 d053800c6d877b5695fcd626bc6bfbc7f5f5eb1f8476fb302b54ba0c04db0c27 +EBUILD net-snmp-5.4.3.ebuild 5905 RMD160 0bd7361681db767061b9e159335868a04f5835c6 SHA1 8e1018de8bb052e4901f6be74e63e34ffe3dad77 SHA256 28a036a02156f01dc231711953e726d33ff00b0ba17c713b5053c0aafb21a618 +EBUILD net-snmp-5.5.ebuild 5580 RMD160 2b0b3f689e3826923c8b7c88cb7ed74273240ce5 SHA1 794968f6bffd7be8b0f1d36b9c57d6fb21bacdf3 SHA256 a12020bd3ccbcd6243e4181c8c1820f052abe5ce820432bb4d6f28f940ae963b +MISC ChangeLog 35427 RMD160 e38cc0e10494593f9a735a6cc16f5ef2f5f3bb06 SHA1 3e5c14c8dc58b7578d091903e1efaa4edca226e5 SHA256 d8789e0051be34749dc2888fcfd3199db6241938b9ba46be6e0f4b9ff610b67e MISC metadata.xml 675 RMD160 3785784fde686fec578c82814a96f295e64c800b SHA1 433d32bd2e67c60324ad401a1b3eeb6b908656d2 SHA256 ed42873349256bf59c84251b140b22c5323a2d3d359fec89217ba50f8cecd9c4 diff --git a/net-analyzer/net-snmp/net-snmp-5.4.3.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.3.ebuild new file mode 100644 index 000000000000..522942567f35 --- /dev/null +++ b/net-analyzer/net-snmp/net-snmp-5.4.3.ebuild @@ -0,0 +1,209 @@ +# Copyright 1999-2010 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.3.ebuild,v 1.1 2010/07/13 21:03:49 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() { + # 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_DIR="$(python_get_sitedir)" + 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' -e 's|@LDFLAGS@||g' \ + net-snmp-config.in || die "sedding CFLAGS/LDFLAGS failed" + + # Respect LDFLAGS + sed -i Makefile.top \ + -e '/^LIB_LD_CMD/{s|$(CFLAGS)|& $(LDFLAGS)|g}' \ + || die "sed LDFLAGS failed" + + # Fix version number: + sed -i -e "s:NetSnmpVersionInfo = \".*\":NetSnmpVersionInfo = \"${PV}\":" \ + snmplib/snmp_version.c || die "sedding version failed" + + 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} \ + --without-rpm \ + $(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 \ + --with-ldflags="${LDFLAGS}" \ + --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 () { + # bug #317965 + emake -j1 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_postinst() { + if use python; then + python_mod_optimize $(python_get_sitedir)/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 $(python_get_sitedir)/netsnmp + fi +} diff --git a/net-analyzer/net-snmp/net-snmp-5.5.ebuild b/net-analyzer/net-snmp/net-snmp-5.5.ebuild new file mode 100644 index 000000000000..9b37b4b6cff6 --- /dev/null +++ b/net-analyzer/net-snmp/net-snmp-5.5.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2010 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.5.ebuild,v 1.1 2010/07/13 21:03:49 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 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 ) + 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 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_DIR="$(python_get_sitedir)" + 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' \ + -e 's|@LDFLAGS@ ||g' \ + net-snmp-config.in || die "sedding CFLAGS failed" + + # Respect LDFLAGS + sed -i Makefile.top \ + -e '/^LIB_LD_CMD/{s|$(CFLAGS)|& $(LDFLAGS)|g}' \ + || die "sed LDFLAGS failed" + + # Fix version number: + sed -i \ + -e "s|PACKAGE_VERSION|\"${PV}\"|g" \ + snmplib/snmp_version.c || die "sedding version failed" + + 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 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} \ + --without-rpm \ + $(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 \ + --with-ldflags="${LDFLAGS}" \ + --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 () { + # bug #317965 + emake -j1 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_postinst() { + if use python; then + python_mod_optimize $(python_get_sitedir)/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 $(python_get_sitedir)/netsnmp + fi +} -- 2.26.2