summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-analyzer/net-snmp/ChangeLog8
-rw-r--r--net-analyzer/net-snmp/Manifest16
-rw-r--r--net-analyzer/net-snmp/files/net-snmp-5.4.1-perl-asneeded.patch33
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.4.1-r4.ebuild13
4 files changed, 61 insertions, 9 deletions
diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index fad8fb06a412..64350f135675 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.168 2008/06/06 20:06:33 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.169 2008/06/07 14:54:11 flameeyes Exp $
+
+ 07 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+ +files/net-snmp-5.4.1-perl-asneeded.patch, net-snmp-5.4.1-r4.ebuild:
+ Add patch to fix bug #224251, remove filtering of --as-needed as it builds
+ fine with it (plus it's the wrong way to avoid it), and _if there are bugs
+ you can't solve, just ask me_.
*net-snmp-5.4.1-r4 (06 Jun 2008)
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index ceaaa69fa3db..70d14b98f3d3 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -10,6 +13,7 @@ AUX net-snmp-5.4.1-CVE-2008-2292.patch 6212 RMD160 79b2e05df4623972dbaea2dd92dea
AUX net-snmp-5.4.1-clientaddr-fix.patch 4013 RMD160 52c45d7dd34b5aadcfd7ef48c445d47b5491936d SHA1 714fc3fccc65516ae2a6d836ce181edfd4dc83c3 SHA256 15a8f05e47eb337d8963ed2b1fd81ecb00fe9b631d3281507bdc1b17c5d542cb
AUX net-snmp-5.4.1-incorrect-hrFSStorageIndex.patch 16053 RMD160 1d33a23b165946f7dd4e97b329c79d27c42ec913 SHA1 c4a107c35cf96b3c52a3156ab9f999b46582b693 SHA256 2d3aad8d76046e11a520d45bc5d3304b1ceff91c6d5a5510dc020aae47506b3d
AUX net-snmp-5.4.1-ipAddressTable-crash-with-double-free.patch 4740 RMD160 305f962976c6afc39b0ee37706f34d05ea768874 SHA1 93b806c407048cba4f5c63137df1e819c83d0010 SHA256 0872a11f48106f1a2a9c4a8a894abe31b04ee607bdfd44b8207c8e659213ef31
+AUX net-snmp-5.4.1-perl-asneeded.patch 1219 RMD160 caced600c35165603069e62a17a664d7a0180586 SHA1 89bedb2424d65176a9bfba8c9b318b1d50b5b3ed SHA256 42640b545363cd5c6c7eef6b17b10c1d256e189ceb7b7c874baa4041de24e151
AUX net-snmp-5.4.1-process-count-race.patch 1489 RMD160 221f218270b83afec95d1efd260109b8baf05626 SHA1 3986f4789c145dd7182bf5f7d94a1cda0504ce5c SHA256 74a6e001de7a855079be988dd0cb23190095082e1a9adaefb9a9cac677ffa116
AUX net-snmp-5.4.1-suppresssuppress-annoying.patch 800 RMD160 aa23a30241ae64aeed6a08a630326fd7c2e0f9fe SHA1 2b99c56d1f659f324c5676d48ab257ea3b55467f SHA256 f5249b782079be96256ab6e7a0d398c04dfbcabffa7f4c716fe1abd39897aabe
AUX net-snmp-lm_sensors.patch 13686 RMD160 b2e67c6f5a5347442fbaa97c9ce209f1d9bed194 SHA1 3e795339fc93306a4d662feeaa16faca2509a058 SHA256 51dc2363a687d9f4e65b0a59e767b33129d07623a0b4da07b685e406d2576b86
@@ -28,7 +32,15 @@ EBUILD net-snmp-5.2.2-r3.ebuild 5371 RMD160 ce0b64e18b1f60045091047cff6051f6a9be
EBUILD net-snmp-5.3.1-r1.ebuild 5639 RMD160 1c306b4f98731c42483865680b6eb9b35883f6aa SHA1 fb9f4ec46da3d698123d47f3437202d498603e76 SHA256 211797803d7ff8a575fd1736e4b74cbabbd6861cc337c31bb51ecf3e5c389f10
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 6021 RMD160 7dbf0667c3075682559b501794c3347e1ff30868 SHA1 a82ca7786c6554f520e0d1d1d7b821b71378ac52 SHA256 12f9837725eb1b01f055f54fcbf899c3a204a523aa8d1cd2005d15f0bbfc4430
+EBUILD net-snmp-5.4.1-r4.ebuild 5998 RMD160 3dd7262108af3535c4bf5818938fe2a7216d560f SHA1 0900bfe3bee41f6d3b02cee7d1743ebb956ad5ad SHA256 6549a47ddbca499d6639e6ca06f70881419c21e31ec2b932380ea063597709c8
EBUILD net-snmp-5.4.ebuild 4979 RMD160 079fc223fedf18de1781c875ea2b401661258010 SHA1 9fd47d05498cfac287ce7386a5e2b49c706c9946 SHA256 c49ceced1464a7b00f745e05f80cceb18c94bdcfe92aacefbe78e2493cacfc08
-MISC ChangeLog 28140 RMD160 9a69b70399c508409293ea632d9d267831477941 SHA1 d19397aa9f0c514587a134403171e9523761575c SHA256 f0273bbef8f70eee226f41a56d369f843ab6635d129bfdffe535a69914bf4025
+MISC ChangeLog 28458 RMD160 b202ed2376124de4d5712759f5d187bbd11f3db9 SHA1 0a2269b6c4a24fc25a19459fd55e0b7aed8640bb SHA256 0601d817625a644d9094941cdc469fd6f7975217f75d5a2107a949d02c5c9fad
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/files/net-snmp-5.4.1-perl-asneeded.patch b/net-analyzer/net-snmp/files/net-snmp-5.4.1-perl-asneeded.patch
new file mode 100644
index 000000000000..766436e3f9eb
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.4.1-perl-asneeded.patch
@@ -0,0 +1,33 @@
+Index: net-snmp-5.4.1/configure.in
+===================================================================
+--- net-snmp-5.4.1.orig/configure.in
++++ net-snmp-5.4.1/configure.in
+@@ -2,7 +2,7 @@
+ # the Net-SNMP's COPYING file for more details and other copyrights
+ # that may apply:
+ #
+-# Portions Copyright © 2003 Sun Microsystems, Inc. All rights reserved.
++# Portions Copyright © 2003 Sun Microsystems, Inc. All rights reserved.
+ # Use is subject to license terms specified in the COPYING file
+ # distributed with the Net-SNMP package.
+ #
+@@ -3097,8 +3097,8 @@ fi
+
+ # check needed functions
+ if test "x$embed_perl" != "xno" ; then
+- OLDLDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS $netsnmp_perlldopts"
++ OLDLIBS="$LIBS"
++ LIBS="$LIBS $netsnmp_perlldopts"
+
+ # newer perl vs older perl call functions
+ AC_CHECK_FUNCS(eval_pv)
+@@ -3109,7 +3109,7 @@ if test "x$embed_perl" != "xno" ; then
+ AC_CHECK_FUNC(perl_eval_pv, AC_DEFINE(HAVE_PERL_EVAL_PV_LC))
+ AC_CHECK_FUNC(Perl_eval_pv, AC_DEFINE(HAVE_PERL_EVAL_PV_UC))
+
+- LDFLAGS="$OLDLDFLAGS"
++ LIBS="$OLDLIBS"
+
+
+ if test "x$ac_cv_func_perl_eval_pv" != "xyes" -a "x$ac_cv_func_Perl_eval_pv" != "xyes" -a "x$ac_cv_func_eval_pv" != "xyes" ; then
diff --git a/net-analyzer/net-snmp/net-snmp-5.4.1-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.4.1-r4.ebuild
index 1e0abef54212..02b91a09f9a6 100644
--- a/net-analyzer/net-snmp/net-snmp-5.4.1-r4.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.4.1-r4.ebuild
@@ -1,8 +1,8 @@
# 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-r4.ebuild,v 1.2 2008/06/06 21:33:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.4.1-r4.ebuild,v 1.3 2008/06/07 14:54:11 flameeyes Exp $
-inherit fixheadtails flag-o-matic perl-module python
+inherit fixheadtails flag-o-matic perl-module python autotools
DESCRIPTION="Software for generating and retrieving SNMP data"
HOMEPAGE="http://net-snmp.sourceforge.net/"
@@ -69,6 +69,11 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-CVE-2008-2292.patch #222265
epatch "${FILESDIR}"/${P}-process-count-race.patch #213415
epatch "${FILESDIR}"/${P}-incorrect-hrFSStorageIndex.patch #211660
+
+ epatch "${FILESDIR}"/${P}-perl-asneeded.patch #224251
+
+ eautoreconf
+
ht_fix_all
}
@@ -77,10 +82,6 @@ src_compile() {
strip-flags
- # filter for bug #145960
- # as it seems that the option is not enough
- filter-ldflags -Wl,--as-needed
-
mibs="host ucd-snmp/dlmod"
use smux && mibs="${mibs} smux"
use sendmail && mibs="${mibs} mibII/mta_sendmail"