summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bevitt <cyfred@gentoo.org>2004-08-16 11:30:58 +0000
committerAndrew Bevitt <cyfred@gentoo.org>2004-08-16 11:30:58 +0000
commit1382da6e12358bc6cff8382df44416ed0ce33129 (patch)
tree81b34069e9732a7c29f59876f12d72719a10732b /www-proxy/squid
parentx86 stable (Manifest recommit) (diff)
downloadgentoo-2-1382da6e12358bc6cff8382df44416ed0ce33129.tar.gz
gentoo-2-1382da6e12358bc6cff8382df44416ed0ce33129.tar.bz2
gentoo-2-1382da6e12358bc6cff8382df44416ed0ce33129.zip
Removing sasl2 sed process for 2.5.5-r3
Diffstat (limited to 'www-proxy/squid')
-rw-r--r--www-proxy/squid/ChangeLog6
-rw-r--r--www-proxy/squid/Manifest2
-rw-r--r--www-proxy/squid/squid-2.5.5-r3.ebuild20
3 files changed, 8 insertions, 20 deletions
diff --git a/www-proxy/squid/ChangeLog b/www-proxy/squid/ChangeLog
index 41a39c2a1378..97e11fcffd36 100644
--- a/www-proxy/squid/ChangeLog
+++ b/www-proxy/squid/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-www/squid
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/ChangeLog,v 1.2 2004/08/16 01:29:20 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/ChangeLog,v 1.3 2004/08/16 11:30:58 cyfred Exp $
+
+ 16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.5.5-r3.ebuild:
+ Patches introduced for 2.5.5-r3 fix the sasl sedding done in the ebuilds,
+ removing.
*squid-2.5.5-r3 (16 Aug 2004)
diff --git a/www-proxy/squid/Manifest b/www-proxy/squid/Manifest
index 84becc59bd12..3bc29eb7ba3f 100644
--- a/www-proxy/squid/Manifest
+++ b/www-proxy/squid/Manifest
@@ -1,4 +1,4 @@
-MD5 11217c8a6084aa9cc40f11b628247cd6 squid-2.5.5-r3.ebuild 5871
+MD5 ff1129965b196998f27629c7e91d34e0 squid-2.5.5-r3.ebuild 5375
MD5 2f8dd2acd78403df2d61495b30ea3652 squid-2.5.6.ebuild 5326
MD5 f98ac2e961a1eaaa8437083b278a03d4 squid-2.5.5-r2.ebuild 5804
MD5 2517bc7ee609190786876bcbc5577ea5 squid-2.5.6-r1.ebuild 5391
diff --git a/www-proxy/squid/squid-2.5.5-r3.ebuild b/www-proxy/squid/squid-2.5.5-r3.ebuild
index a7e4df368d24..faa84de01fd8 100644
--- a/www-proxy/squid/squid-2.5.5-r3.ebuild
+++ b/www-proxy/squid/squid-2.5.5-r3.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/www-proxy/squid/squid-2.5.5-r3.ebuild,v 1.1 2004/08/16 01:29:20 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squid/squid-2.5.5-r3.ebuild,v 1.2 2004/08/16 11:30:58 cyfred Exp $
inherit eutils
@@ -60,23 +60,7 @@ 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}"
local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group"
use ldap && ext_helpers="ldap_group,${ext_helpers}"