Add patch from bug 118016 to allow use of --as-needed. Thanks to Diego Petteno <flameeyes at gentoo dot org>.

Package-Manager: portage-2.0.53

4 files changed, 53 insertions, 6 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index cf4d150489f0..7631ed19e9ff 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/net-snmp
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.127 2005/12/26 21:58:10 vanquirius Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.128 2006/01/06 18:10:03 vanquirius Exp $
+
+  06 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +files/net-snmp-5.2.2-asneeded.patch, net-snmp-5.2.2.ebuild:
+  Add patch from bug 118016 to allow use of --as-needed. Thanks to Diego
+  Petteno <flameeyes at gentoo dot org>.
 
 *net-snmp-5.3_rc2 (26 Dec 2005)
 *net-snmp-5.2.2 (26 Dec 2005)
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 1320ce9cdd91..3994d043bc8f 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,10 +1,11 @@
-MD5 aa082927dc531b0ad87dd27bdbb516b4 ChangeLog 19900
+MD5 b3c85195c7a5858be2d23809b093372e ChangeLog 20130
 MD5 9791bf52496848c5613de87a95a3b761 files/digest-net-snmp-5.1.3.1 69
 MD5 cfce6770c86e3e3bc76800c6bd6ee8c6 files/digest-net-snmp-5.2.1.2-r1 69
 MD5 92b7d3fe0c5dad9c215a170199e3c66c files/digest-net-snmp-5.2.2 67
 MD5 00cef611211aeaa16f95d9bd4bd8da4f files/digest-net-snmp-5.3_rc2 69
 MD5 82d14deda5805e21a60de03e0a69659c files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch 4734
 MD5 a63107c1d81a8aeb10e84be0658e2794 files/net-snmp-5.2.1-fix-insecure-fixproc.diff 1639
+MD5 3e2ad4a80d670958106d3c97cac1a24f files/net-snmp-5.2.2-asneeded.patch 1458
 MD5 ca3a2ba5a12a796d29087038828f2c21 files/net-snmp-5.2.2-conf-elf-rpm-bz2.patch 4815
 MD5 25d92c9a7adcbb80240a914a8f6bbfe5 files/net-snmp-lm_sensors.patch 13686
 MD5 ed2e953a9a923caec45eeca95bec2efc files/snmpd-5.1.conf 606
@@ -13,5 +14,5 @@ MD5 791cd8d81154f2c1d01e3f87b86faa44 files/snmptrapd.conf 635
 MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
 MD5 f9c21a4768653f0035408ae5136fdafe net-snmp-5.1.3.1.ebuild 4933
 MD5 9b7f462b1de1fa21b0f3e9f79c5b72d3 net-snmp-5.2.1.2-r1.ebuild 5055
-MD5 0a3e8b228c5dfaaa9ef552577ce71061 net-snmp-5.2.2.ebuild 5038
+MD5 1dbb8d5fd92a3e3495be2d3a7caffcbe net-snmp-5.2.2.ebuild 5102
 MD5 38b4f9a37d1957e0f12c1e5ae74a0d71 net-snmp-5.3_rc2.ebuild 5241
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.2.2-asneeded.patch b/net-analyzer/net-snmp/files/net-snmp-5.2.2-asneeded.patch
new file mode 100644
index 000000000000..d84c58ebdf9a
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.2.2-asneeded.patch
@@ -0,0 +1,38 @@
+Index: net-snmp-5.2.2/snmplib/Makefile.in
+===================================================================
+--- net-snmp-5.2.2.orig/snmplib/Makefile.in
++++ net-snmp-5.2.2/snmplib/Makefile.in
+@@ -185,11 +185,11 @@ all: standardall
+ 
+ # how to build the libraries.
+ libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
+-	$(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}
++	$(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} @LIBCRYPTO@
+ 	$(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+ 
+ libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
+-	$(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}
++	$(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} @LIBCRYPTO@
+ 	$(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+ 
+ #
+Index: net-snmp-5.2.2/configure.in
+===================================================================
+--- net-snmp-5.2.2.orig/configure.in
++++ net-snmp-5.2.2/configure.in
+@@ -2671,6 +2671,7 @@ if test "x$useopenssl" != "xno" ; then
+         encrmodes="[disabled]"
+     fi
+     AC_DEFINE(USE_OPENSSL)
++    LIBCRYPTO="-lcrypto"
+     AC_MSG_RESULT(OpenSSL Support)
+ elif test "x$usepkcs" != "xno" ; then
+     authmodes="MD5 SHA1"
+@@ -2690,6 +2691,7 @@ fi
+ if test "x$enable_md5" = "xno"; then
+     authmodes=`echo $authmodes | sed 's/MD5 *//;'`
+ fi
++AC_SUBST(LIBCRYPTO)
+ 
+ AC_MSG_CACHE_ADD(Authentication support:     $authmodes)
+ AC_MSG_CACHE_ADD(Encryption support:         $encrmodes)
diff --git a/net-analyzer/net-snmp/net-snmp-5.2.2.ebuild b/net-analyzer/net-snmp/net-snmp-5.2.2.ebuild
index 571973bce6ad..9d2865508673 100644
--- a/net-analyzer/net-snmp/net-snmp-5.2.2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.2.2.ebuild,v 1.1 2005/12/26 21:58:10 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.2.ebuild,v 1.2 2006/01/06 18:10:03 vanquirius Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -55,6 +55,9 @@ src_unpack() {
 		fi
 	fi
 
+	# bug 118016
+	epatch "${FILESDIR}"/${PN}-5.2.2-asneeded.patch
+
 	# bugs 68467 and 68254
 	sed -i -e 's;embed_perl="yes",;embed_perl=$enableval,;' configure.in \
 		|| die "sed configure.in failed"