Avoid linking with md5.so installed by libwww (#292406).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 46 insertions, 3 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 6bd159a0d5dd..bebb74ba3651 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.292 2009/11/28 12:32:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.293 2009/11/29 08:53:09 mrness Exp $
+
+*squid-3.1.0.15_beta-r1 (29 Nov 2009)
+*squid-3.0.20-r1 (29 Nov 2009)
+
+  29 Nov 2009; Alin Năstac <mrness@gentoo.org> -squid-3.0.20.ebuild,
+  +squid-3.0.20-r1.ebuild, +files/squid-3.0.20-libmd5.patch,
+  -squid-3.1.0.15_beta.ebuild, +squid-3.1.0.15_beta-r1.ebuild,
+  +files/squid-3.1.0.15_beta-libmd5.patch:
+  Avoid linking with md5.so installed by libwww (#292406).
 
 *squid-3.1.0.15_beta (28 Nov 2009)
 *squid-3.0.20 (28 Nov 2009)
diff --git a/net-proxy/squid/files/squid-3.0.20-libmd5.patch b/net-proxy/squid/files/squid-3.0.20-libmd5.patch
new file mode 100644
index 000000000000..4ecfaa06b1ba
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.20-libmd5.patch
@@ -0,0 +1,16 @@
+diff -Nru squid-3.0.STABLE20.orig/configure.in squid-3.0.STABLE20/configure.in
+--- squid-3.0.STABLE20.orig/configure.in	2009-11-28 10:29:42.000000000 +0100
++++ squid-3.0.STABLE20/configure.in	2009-11-29 09:36:03.000000000 +0100
+@@ -2426,7 +2426,11 @@
+ AC_CHECK_LIB(crypt, crypt, [CRYPTLIB="-lcrypt"])
+ 
+ dnl Solaris10 provides MD5 natively through libmd5
+-AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"])
++case "$host" in
++	*-solaris*)
++	    AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"])
++	    ;;
++esac
+ 
+ AC_SUBST(CRYPTLIB)
+ 
diff --git a/net-proxy/squid/files/squid-3.1.0.15_beta-libmd5.patch b/net-proxy/squid/files/squid-3.1.0.15_beta-libmd5.patch
new file mode 100644
index 000000000000..81398e285188
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.1.0.15_beta-libmd5.patch
@@ -0,0 +1,16 @@
+diff -Nru squid-3.1.0.15.orig/configure.in squid-3.1.0.15/configure.in
+--- squid-3.1.0.15.orig/configure.in	2009-11-23 04:11:00.000000000 +0100
++++ squid-3.1.0.15/configure.in	2009-11-29 09:44:37.000000000 +0100
+@@ -2802,7 +2802,11 @@
+ dnl libcrypt (eg FreeBSD)
+ AC_CHECK_LIB(crypt, crypt, [CRYPTLIB="-lcrypt"])
+ dnl Solaris10 provides MD5 natively through libmd5
+-AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"])
++case "$host" in
++	*-solaris*)
++	    AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"])
++	    ;;
++esac
+ AC_SUBST(CRYPTLIB)
+ 
+ dnl Check for libdl, used by auth_modules/PAM
diff --git a/net-proxy/squid/squid-3.0.20.ebuild b/net-proxy/squid/squid-3.0.20-r1.ebuild
index 10f82d5f19da..14c94c1b4125 100644
--- a/net-proxy/squid/squid-3.0.20.ebuild
+++ b/net-proxy/squid/squid-3.0.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.20.ebuild,v 1.1 2009/11/28 12:32:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.20-r1.ebuild,v 1.1 2009/11/29 08:53:09 mrness Exp $
 
 EAPI="2"
 
@@ -61,6 +61,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	epatch "${FILESDIR}"/${P}-cross-compile.patch
+	epatch "${FILESDIR}"/${P}-libmd5.patch
 	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch
 
 	eautoreconf
diff --git a/net-proxy/squid/squid-3.1.0.15_beta.ebuild b/net-proxy/squid/squid-3.1.0.15_beta-r1.ebuild
index 52e2abbeb025..41f43b72b65b 100644
--- a/net-proxy/squid/squid-3.1.0.15_beta.ebuild
+++ b/net-proxy/squid/squid-3.1.0.15_beta-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.15_beta.ebuild,v 1.1 2009/11/28 12:32:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.15_beta-r1.ebuild,v 1.1 2009/11/29 08:53:09 mrness Exp $
 
 EAPI="2"
 
@@ -61,6 +61,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	epatch "${FILESDIR}"/${P}-qafixes.patch
+	epatch "${FILESDIR}"/${P}-libmd5.patch
 
 	# eautoreconf breaks lib/libLtdl/libtool script
 	./bootstrap.sh || die "autoreconf failed"