diff options
| author |   Andrew Bevitt <cyfred@gentoo.org> | 2004-07-15 23:15:45 +0000 |
|---|---|---|
| committer | Andrew Bevitt <cyfred@gentoo.org> | 2004-07-15 23:15:45 +0000 |
| commit | ac1b6d9ce8c92c6e041b44dcab2e8e08c83bef42 (patch) | |
| tree | 3cdef0f6464d06860437c81037d4f909f2607765 /net-www | |
| parent | Removed obsolete ebuild/digest (diff) | |
| download | historical-ac1b6d9ce8c92c6e041b44dcab2e8e08c83bef42.tar.gz historical-ac1b6d9ce8c92c6e041b44dcab2e8e08c83bef42.tar.bz2 historical-ac1b6d9ce8c92c6e041b44dcab2e8e08c83bef42.zip | |
SASL V1/V2 supported natively now, removing sed fancyness
Diffstat (limited to 'net-www')
| -rw-r--r-- | net-www/squid/ChangeLog | 5 | ||||
| -rw-r--r-- | net-www/squid/Manifest | 22 | ||||
| -rw-r--r-- | net-www/squid/squid-2.5.6.ebuild | 21 |
3 files changed, 18 insertions, 30 deletions
diff --git a/net-www/squid/ChangeLog b/net-www/squid/ChangeLog index 606f2aaa8778..44f139f53b89 100644 --- a/net-www/squid/ChangeLog +++ b/net-www/squid/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-www/squid # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.57 2004/07/15 18:32:33 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.58 2004/07/15 23:15:45 cyfred Exp $ + + 16 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.5.6.ebuild: + SASL V 1/2 is now supported natively 15 Jul 2004; Tom Gall <tgall@gentoo.org> squid-2.5.5-r2.ebuild: stable on ppc64, bug #55406 diff --git a/net-www/squid/Manifest b/net-www/squid/Manifest index 82cb77724d11..1bb7d4f42f10 100644 --- a/net-www/squid/Manifest +++ b/net-www/squid/Manifest @@ -1,18 +1,18 @@ -MD5 e322e7feb35dff6944166f7596f17b27 ChangeLog 8360 -MD5 d7dd06078d4f3a44b46709294cc7bc21 metadata.xml 249 -MD5 29685f0894c8370b80ed6ae4908d1133 squid-2.4.7.ebuild 3539 -MD5 5e29b1110f2fc6f0c5abcc71d44a3659 squid-2.5.6.ebuild 5780 +MD5 1945cfb8ba1e8875cbfc02ac5de9691e squid-2.5.6.ebuild 5317 MD5 0b6db90aefc1221144795065f4dd31ec squid-2.5.5-r2.ebuild 5802 -MD5 bb029026a8d6bd24efd9086a2f3e959e files/digest-squid-2.4.7 74 -MD5 a89292cba70fb5e9f63f60cdfe9bc678 files/digest-squid-2.5.6 71 -MD5 26a4ab522a2469f805f746bcdbe0109c files/squid-2.5.6-ufs-no-valid-dir.patch 566 -MD5 80e89eba8200ffbdf4afe8fc3c0dcd0e files/digest-squid-2.5.5-r2 71 -MD5 626914d5b07105602773bf8a1534a3ae files/squid-2.4.7-debian.diff 12078 +MD5 29685f0894c8370b80ed6ae4908d1133 squid-2.4.7.ebuild 3539 +MD5 e92dcb71704ed8dc46e6e37629b873de ChangeLog 8471 +MD5 d7dd06078d4f3a44b46709294cc7bc21 metadata.xml 249 MD5 60b9ab4d53c4485a214baa7c8f9a2cc0 files/squid-2.4.7-gentoo.diff 1828 -MD5 0c7867dce4b8bef078a93bf717196b0e files/squid-2.5.3-gentoo.diff 11534 MD5 a188814c2113dcd28c55672dbe58df8c files/squid-2.5.5-ntml-auth-fix.patch 2354 -MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid-r1.cron 133 +MD5 80e89eba8200ffbdf4afe8fc3c0dcd0e files/digest-squid-2.5.5-r2 71 MD5 3351a9887b4bb7b8a9d8be6a6c79c53c files/squid.confd 437 MD5 1ee97d797645814f5ad77c98ad10eef2 files/squid.cron 41 +MD5 0c7867dce4b8bef078a93bf717196b0e files/squid-2.5.3-gentoo.diff 11534 +MD5 626914d5b07105602773bf8a1534a3ae files/squid-2.4.7-debian.diff 12078 +MD5 6f30a7f5c48ec35a7044acb189c858c5 files/squid-r1.cron 133 MD5 da04bda1eac0b7993089be8b592a8650 files/squid.pam 505 MD5 a94acb581ad7e59d2451fcd0c68cc6ac files/squid.rc6 1981 +MD5 26a4ab522a2469f805f746bcdbe0109c files/squid-2.5.6-ufs-no-valid-dir.patch 566 +MD5 bb029026a8d6bd24efd9086a2f3e959e files/digest-squid-2.4.7 74 +MD5 a89292cba70fb5e9f63f60cdfe9bc678 files/digest-squid-2.5.6 71 diff --git a/net-www/squid/squid-2.5.6.ebuild b/net-www/squid/squid-2.5.6.ebuild index d0bb4efd835a..b90d203cc8d9 100644 --- a/net-www/squid/squid-2.5.6.ebuild +++ b/net-www/squid/squid-2.5.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.6.ebuild,v 1.1 2004/07/15 05:04:40 cyfred Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.6.ebuild,v 1.2 2004/07/15 23:15:45 cyfred Exp $ inherit eutils @@ -59,23 +59,8 @@ src_compile() { local basic_modules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM,winbind" use ldap && basic_modules="LDAP,${basic_modules}" use pam && basic_modules="PAM,${basic_modules}" - if use sasl; then - basic_modules="SASL,${basic_modules}" - #support for cyrus-sasl-1.x and 2.x; thanks Raker! - if [ -f /usr/include/sasl/sasl.h ]; then - cd ${S}/helpers/basic_auth/SASL/ - cp sasl_auth.c sasl_auth.c.orig - sed \ - -e "s:sasl.h:sasl/sasl.h:" \ - -e "s:NULL, NULL, NULL:NULL, NULL, NULL, NULL, NULL:" \ - -e "s:strlen(password), \&errstr:strlen(password):" \ - < sasl_auth.c.orig > sasl_auth.c - cp Makefile.in Makefile.in.orig - sed -e "s:-lsasl:-lsasl2:" \ - < Makefile.in.orig > Makefile.in - cd ${S} - fi - fi + use sasl && basic_modules="SASL,${basic_modules}" + # SASL 1 / 2 Supported Natively local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group" use ldap && ext_helpers="ldap_group,${ext_helpers}" |