net-analyzer/net-snmp: Bump rpm patch

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2181 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2010-05-09 08:09:58 +00:00
parent 4d6e7ea36f
commit 5fd50588fa
5 changed files with 20 additions and 410 deletions

View File

@ -1,7 +1,12 @@
# ChangeLog for net-analyzer/net-snmp
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
09 May 2010; Mario Fetka <mario.fetka@gmail.com>
-net-snmp-5.4.1.1-r1.ebuild, -net-snmp-5.4.2.1-r1.ebuild,
-net-snmp-5.4.2.1-r2.ebuild, +net-snmp-5.4.2.1-r4.ebuild:
Bump rpm patch
22 Nov 2008; Mario Fetka <mario.fetka@gmail.com>
+files/rpm514-netsnmp-5.4.1.1.patch, +net-snmp-5.4.2.1-r1.ebuild:
Bump

View File

@ -20,10 +20,7 @@ AUX snmpd.rc7 706 RMD160 137d85e5f2b7cae62e214141aabcec495777007e SHA1 8d94d3bb2
AUX snmptrapd.conf 635 RMD160 aba7b7196835bd359174156a527e13188f76e248 SHA1 0d296caa01c789455c3cd4c67cd81aca5547681d SHA256 902d73cb44446df060bf20e0c8ef0f8815d5b846f96d93894913d3309a3841b3
AUX snmptrapd.init 624 RMD160 799faf488a62bc219d3765ed6d6283ca7764ad1c SHA1 1fdef5a0a29f181c2df31b9d7adc4d4ebb8b018c SHA256 0e6dae4ca0213be9f9311c8dacdf36e7fea05150db48d15660506d53abda5a39
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.2.1.tar.gz 5185390 RMD160 2148c42d486ed88f9cfc3ca1d50c68abcd7e3d63 SHA1 4f2df9ea62344fe840f493d0e08abe5de3697862 SHA256 11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c
EBUILD net-snmp-5.4.1.1-r1.ebuild 6268 RMD160 25fec5abaf38e6e75d14e4f939f4357b0c69303f SHA1 37fdffe833d285f3ea7aaddecfe65b02df58c831 SHA256 90f3bbdfce52ded6cae0435f7b7a703765740110562838f5be94dfdf72be8f0b
EBUILD net-snmp-5.4.2.1-r1.ebuild 5507 RMD160 cbd1e959c886c16b2f6b10b0630d9962d851feec SHA1 cc2e52453d6bef2348f4bc61389d1214a10cefe3 SHA256 458fd9137cb1f72e616e164aac6d36264c774edd845ffdf1e67f7a323253b3cd
EBUILD net-snmp-5.4.2.1-r2.ebuild 5664 RMD160 5feb893b6971136f47447969a66cb26b2a58f18d SHA1 9df0e863983a93841737805444b559309b74250f SHA256 07e36b6e0c18a58440a452c0ffb73899c33e0397145306a0706f3705ae2cd2ef
MISC ChangeLog 330 RMD160 f08e45d855cbc97dc85d92d8b0b623d0af5fa7dc SHA1 3bcbbb0443295101f405c034bbe35981589743a0 SHA256 00f865659c797c793f6a316b93c821f819f5ff3c36c982d23280ade6d95a5e9c
EBUILD net-snmp-5.4.2.1-r4.ebuild 5843 RMD160 54ca0282db67d877bda09bfab8396e4bddb24bc9 SHA1 18cb85f3b53b6ebc20abf94ad57f5acb2e844f4a SHA256 c24133c4ae84ac0705680f7d853abed3e6608e4073eb5d2e4e5045ca0620e81f
MISC ChangeLog 519 RMD160 91ab2308122a2cefaf60350866c60fdd186d5ec5 SHA1 1b81f13fc245938bef551e25bdc9d7245a1ca3be SHA256 f84e6afeaacf242683c69acb3e26f3f91818459591e61e1e048da12bd6733938
MISC metadata.xml 674 RMD160 102cd7df943ef25f0f462f2520fa77ceac3b5680 SHA1 90b51daab27e161a48feed336a348a8ecf0865c2 SHA256 233feade72f1b013bb5b0739478ab7200727db25a1d06977d0d122862565de24

View File

@ -1,204 +0,0 @@
# 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.9 2008/06/23 18:59:58 ranger 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 )"
# 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
# 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
use rpm && epatch "${FILESDIR}"/${PN}-5.4.1.1-rpm5-1.patch #202399
# 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"
use rpm && export CPPFLAGS="-I /usr/include/rpm ${CPPFLAGS}"
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."
}

View File

@ -1,193 +0,0 @@
# 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.7 2008/11/15 15:00:05 armin76 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
use rpm && epatch "${FILESDIR}"/${PN}-5.4.1.1-rpm5-1.patch #202399
# Fix version number:
sed -i -e "s:NetSnmpVersionInfo = \".*\":NetSnmpVersionInfo = \"${PV}\":" 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"
use rpm && export CPPFLAGS="-I /usr/include/rpm ${CPPFLAGS}"
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."
}

View File

@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# 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.2.1-r2.ebuild,v 1.1 2009/10/16 08:51:06 gengor Exp $
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.4.2.1-r4.ebuild,v 1.2 2010/05/01 00:20:04 flameeyes Exp $
EAPI=2
@ -18,7 +18,7 @@ IUSE="bzip2 diskio doc elf extensible ipv6 kernel_linux lm_sensors mfd-rewrites
COMMON="ssl? ( >=dev-libs/openssl-0.9.6d )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
rpm? (
>=app-arch/rpm-5.0
app-arch/rpm
dev-libs/popt
app-arch/bzip2
>=sys-libs/zlib-1.1.4
@ -72,10 +72,15 @@ src_prepare() {
# 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"
use rpm && epatch "${FILESDIR}"/${PN}-5.4.1.1-rpm5-1.patch #202399
# Fix version number:
sed -i -e "s:NetSnmpVersionInfo = \".*\":NetSnmpVersionInfo = \"${PV}\":" snmplib/snmp_version.c
sed -i -e "s:NetSnmpVersionInfo = \".*\":NetSnmpVersionInfo = \"${PV}\":" \
snmplib/snmp_version.c || die "sedding version failed"
eautoreconf
@ -108,12 +113,11 @@ src_configure() {
--with-zlib"
else
myconf="${myconf} \
--without-rpm \
$(use_with bzip2) \
$(use_with zlib)"
fi
use rpm && export CPPFLAGS="-I /usr/include/rpm ${CPPFLAGS}"
econf \
--with-install-prefix="${D}" \
--with-sys-location="Unknown" \
@ -150,7 +154,8 @@ src_test() {
}
src_install () {
make DESTDIR="${D}" install || die "make install failed"
# bug #317965
emake -j1 DESTDIR="${D}" install || die "make install failed"
if use perl ; then
fixlocalpod