summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2009-11-29 08:53:09 +0000
committerAlin Năstac <mrness@gentoo.org>2009-11-29 08:53:09 +0000
commit47aaf849791cf25fae8d5c21494cb231f43861a3 (patch)
treead32b3d9444ab1016b5d0d78476ff62fc7b5d0c9 /net-proxy/squid/files
parentUnbump, version 1.1.0 is a completely different package with the same name (diff)
downloadgentoo-2-47aaf849791cf25fae8d5c21494cb231f43861a3.tar.gz
gentoo-2-47aaf849791cf25fae8d5c21494cb231f43861a3.tar.bz2
gentoo-2-47aaf849791cf25fae8d5c21494cb231f43861a3.zip
Avoid linking with md5.so installed by libwww (#292406).
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'net-proxy/squid/files')
-rw-r--r--net-proxy/squid/files/squid-3.0.20-libmd5.patch16
-rw-r--r--net-proxy/squid/files/squid-3.1.0.15_beta-libmd5.patch16
2 files changed, 32 insertions, 0 deletions
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