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

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 54 insertions, 9 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/Manifest b/net-proxy/squid/Manifest
index a4da9ff9d35f..aebaf01fa76a 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -18,9 +18,11 @@ AUX squid-3.0.19-gentoo.patch 13095 RMD160 579701b8461fc340181e89d1f27f52473a3a7
 AUX squid-3.0.20-adapted-zph.patch 6951 RMD160 3178642934680e710bb3ddcfdba7dcea49dcf255 SHA1 a65e08bce07fdde6323c6051b6e15336091eb58d SHA256 dd45c86bf52550c681e54a952acc617a19a23edcf7fe2ee1c060740f846e392b
 AUX squid-3.0.20-cross-compile.patch 1234 RMD160 f77c20557d83d4c630b1ec66403f53b1d0123b6d SHA1 7c9cd4558b040fe50dc2f86b9535d4ab52babdef SHA256 05d2b0eb6be2e8898073acd89b5241e6a5cfdb054aa1b048b52c660ae7be1f55
 AUX squid-3.0.20-gentoo.patch 13157 RMD160 e017a2d0c9a5d873e624bfcf507a60b3947ff59f SHA1 0f2bc6545b4f9e1784350bf66378ab904a5f84f8 SHA256 2ca42644b5b16f8a8e82cc3dbdda568cfb06e1475531b16be090be8a374d4fca
+AUX squid-3.0.20-libmd5.patch 546 RMD160 e1ae14eaa63e64be5fa8b9ed108c532c5e5e8e2b SHA1 559b3659dbe375cc03303b88ed9cfbf61b4678fb SHA256 585b10aa129996983a70010525d67c0ee07e42db292dd069d455720c69eef264
 AUX squid-3.1.0.14_beta-gentoo.patch 12827 RMD160 1edc0fce87637502056597560011a4ff58178499 SHA1 0ee38f3b1b61099109cc51f026b68bdc5515d969 SHA256 c41d729ae4927d988729ce99973455c18bf00e71bc58ffcf3f574979b1b9fbb2
 AUX squid-3.1.0.14_beta-qafixes.patch 3056 RMD160 315cf6724fdcd54086d1004feaded3e6d85152ed SHA1 d467ab7e8baffded6b6deb40d113b2beb3e67a48 SHA256 e67028d04a0362e5564690cd193220f8b19098c7f91df06830a4adbd6d6249d0
 AUX squid-3.1.0.15_beta-gentoo.patch 12492 RMD160 54ac45d44181b0375b2af9c44ba58dd9adcc1167 SHA1 4b315d1217306b82ae3998e9cf202f61892c9156 SHA256 be9ef7ea828403703267e2dbeaa5cc43a3a5600ea3bd400b655ec30cfd5aaab3
+AUX squid-3.1.0.15_beta-libmd5.patch 600 RMD160 9f2891d87ae97188dc0423ad43449894b068b8ed SHA1 e61a8192f9d3085e7409e4059e4b2444cebf9b36 SHA256 e04ee68b9efea75d4fcd93a9f367c8973ca71308b003d66406cd582eacc0fba8
 AUX squid-3.1.0.15_beta-qafixes.patch 3056 RMD160 04651a43cd8d93d7290d34c5d18ffc5f41861691 SHA1 ada18d7d1776891aca0fc8e0128a52d5573569d4 SHA256 06a3bbb7559ebc4a8b335e22fe0d069a1c20d695963a0c3e2fcd0f829ec9c97c
 AUX squid.confd 540 RMD160 aa4ec5a6eebad1222667aff6b3180931cf566b13 SHA1 1c0c23b08bd0450eae14604c2b45ca67c7ac25c5 SHA256 aeef7060c50074b65c664fc106d7319ce380d25320ee2ee00f7d6021846b88ec
 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
@@ -39,15 +41,15 @@ EBUILD squid-2.7.6-r2.ebuild 6039 RMD160 b5355c33e3a7b9dce57f75da87da71854d88032
 EBUILD squid-2.7.7.ebuild 5998 RMD160 b77880af5a9fd3bddb8d2578d29eb86e9e66982f SHA1 a92001eae71c8686f3c81fce2fafb15f9992d94a SHA256 f6f55a553e30585903db9c1d50c0e4226c54756ee2573d252409c6568172dc21
 EBUILD squid-3.0.18-r1.ebuild 6438 RMD160 3f2e0054891d77062da0445e95a60281ab3ab878 SHA1 ad8cb75bf4d0b44c6943de10d4f98f5bee64b451 SHA256 69bb7ef4a8c789e061955e69aeb7d9ca20fb29c2b5764211532a8bd34cbea580
 EBUILD squid-3.0.19.ebuild 6395 RMD160 3285b7d91a04b691f92a6925269fce4c0cd867a0 SHA1 28167450bf99ad48fc1862cb8b82b10a41a2c8c5 SHA256 c60359945a51a944327496c445b2dfa38e7c6de3f909b580523213c9fa3590f8
-EBUILD squid-3.0.20.ebuild 6446 RMD160 697fcd4723782eeb80fb81d51d096f91da43426d SHA1 ab1f0f97db4121488296790c94673254e291f253 SHA256 9ca6273b35532fe61101309bdbd0281ca6952df869391aecc085fdf7b07b3704
+EBUILD squid-3.0.20-r1.ebuild 6489 RMD160 bb84df54afbdeb0995ac48690e0ddfd285a90c10 SHA1 d8e2985646f41552f50a82746d5b35226ee16c3b SHA256 2b0919985b0fbcb01be9f82088ef1a88ffaa41cdcc7a3035d46ef00e8505c027
 EBUILD squid-3.1.0.14_beta.ebuild 6638 RMD160 0aacb360eaa5057b7ea6e0d750079ea4f46cd193 SHA1 66231abca6ff7fba7b80a069e88e6fa719148260 SHA256 7b7110fc9bc6f04b91063b3733fcac0c1dfeed358749e1f12a2ef97145135108
-EBUILD squid-3.1.0.15_beta.ebuild 6784 RMD160 73c7a434c480206838bfbb2aa471653723ac4a98 SHA1 1c0b036ed983a3fd74adacfe2b3cdf9f3aff1501 SHA256 9b034ed7223d7a611a5310dd0c3a3193cf4610c29b76f28e2d1c1723b77c752b
-MISC ChangeLog 63299 RMD160 a3075570d6ef7bc2522ccab51042d6cd6bfb0865 SHA1 8586b43e657d6b146c105242c6dd6a430b3dbd6f SHA256 d95672bd2ef5017007e92015f1c3f0b0b783a778aa547130d9aa4a952aa7dae0
+EBUILD squid-3.1.0.15_beta-r1.ebuild 6827 RMD160 3cf0a8c930b356ab81115a4bc56467b396ad2e5f SHA1 861b095af627c415f7f26512ebf0d86003bec849 SHA256 176a68747e73dc3fc132a560d10cc2545d355783821e59fbe8971cbb5fb1a159
+MISC ChangeLog 63666 RMD160 cf5a93381763bf038f2b49589e55080e1b1b8bf3 SHA1 eb9ed2bd6eeb8d9305a0ca68df2ef7f7ec5de774 SHA256 2f5ed43f3e922efbdd0ce4605ece16ab2775d7162f69178f63f516a5e34d70fc
 MISC metadata.xml 919 RMD160 b856eed05f8176a9acd50d22d1d9bf5659aa931d SHA1 7942c78c916c16982034ee5bd862cf417a97d1ac SHA256 04f29ce4a7c46e5b46edf51129540e2f960ea3cee9d248b4317161de3a78d27b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAksRGNEACgkQ9A5kJBGSrsvC9gCfctA/DS8A7nrF8eLdOGKio8Hd
-AEwAn2/BuEvi9YWyEUQhRnyKFiAtPw8T
-=pry3
+iEYEARECAAYFAksSNqwACgkQ9A5kJBGSrsu5KgCfUrVv9cZOWNObhHlBD3PMhMMT
+TgAAn3mCXhc7eMH/JUSE2dqmxGgDALmg
+=xfyZ
 -----END PGP SIGNATURE-----
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"