summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bevitt <cyfred@gentoo.org>2004-07-15 05:04:40 +0000
committerAndrew Bevitt <cyfred@gentoo.org>2004-07-15 05:04:40 +0000
commit1012fd4134094deb37d11b10c04ca4748b0ce8c0 (patch)
tree247384a7b886561e1e6f78583120953c4669f986 /net-www
parentrevert some QA done on the multilib checks so that they work again (diff)
downloadgentoo-2-1012fd4134094deb37d11b10c04ca4748b0ce8c0.tar.gz
gentoo-2-1012fd4134094deb37d11b10c04ca4748b0ce8c0.tar.bz2
gentoo-2-1012fd4134094deb37d11b10c04ca4748b0ce8c0.zip
Squid 2.5 Stable 6; Plus squid-caches patches for this release so far (the whole one :))
Diffstat (limited to 'net-www')
-rw-r--r--net-www/squid/ChangeLog9
-rw-r--r--net-www/squid/Manifest4
-rw-r--r--net-www/squid/files/digest-squid-2.5.61
-rw-r--r--net-www/squid/files/squid-2.5.6-ufs-no-valid-dir.patch14
-rw-r--r--net-www/squid/squid-2.5.6.ebuild187
5 files changed, 214 insertions, 1 deletions
diff --git a/net-www/squid/ChangeLog b/net-www/squid/ChangeLog
index 4cfc0d39fe1e..9605f50639fa 100644
--- a/net-www/squid/ChangeLog
+++ b/net-www/squid/ChangeLog
@@ -1,6 +1,13 @@
# 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.54 2004/07/01 22:50:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.55 2004/07/15 05:04:40 cyfred Exp $
+
+*squid-2.5.6 (15 Jul 2004)
+
+ 15 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>;
+ +files/squid-2.5.6-ufs-no-valid-dir.patch, +squid-2.5.6.ebuild:
+ Squid 2.5 Stable 6; inital ebuild thanks to ali3nx, included patches from
+ squid-caches updates
01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> squid-2.5.3.ebuild,
squid-2.5.4.ebuild, squid-2.5.5-r1.ebuild, squid-2.5.5-r2.ebuild,
diff --git a/net-www/squid/Manifest b/net-www/squid/Manifest
index 77f61a8ffca1..9f5e61d250a3 100644
--- a/net-www/squid/Manifest
+++ b/net-www/squid/Manifest
@@ -1,4 +1,5 @@
MD5 f116f427f152b040e79718dc61ad3a00 squid-2.5.4.ebuild 5251
+MD5 cdfe163ae380659872dbeca7b98f8606 squid-2.5.6.ebuild 5686
MD5 d706adb32d3eba692102018a4cd8f2ff squid-2.5.5-r2.ebuild 5647
MD5 35ac3fff52dc7f3fd0e81c383b67e800 squid-2.5.3.ebuild 4938
MD5 29685f0894c8370b80ed6ae4908d1133 squid-2.4.7.ebuild 3539
@@ -7,6 +8,7 @@ MD5 c033aedbe3729181b213ee604a167cb8 squid-2.5.5-r1.ebuild 5237
MD5 660ab3e95c5e3850e4b79ef50ece5ae0 ChangeLog 7782
MD5 d7dd06078d4f3a44b46709294cc7bc21 metadata.xml 249
MD5 60b9ab4d53c4485a214baa7c8f9a2cc0 files/squid-2.4.7-gentoo.diff 1828
+MD5 26a4ab522a2469f805f746bcdbe0109c files/squid-2.5.STABLE6.ufs_no_valid_dir.patch 566
MD5 a188814c2113dcd28c55672dbe58df8c files/squid-2.5.5-ntml-auth-fix.patch 2354
MD5 80e89eba8200ffbdf4afe8fc3c0dcd0e files/digest-squid-2.5.5-r1 71
MD5 80e89eba8200ffbdf4afe8fc3c0dcd0e files/digest-squid-2.5.5-r2 71
@@ -17,7 +19,9 @@ 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 6658bb10c03cd2940380d3358c2d8eef files/digest-squid-2.5.3 71
MD5 7183dd9775e11802755e8dc6be14e083 files/digest-squid-2.5.4 146
MD5 80e89eba8200ffbdf4afe8fc3c0dcd0e files/digest-squid-2.5.5 71
+MD5 a89292cba70fb5e9f63f60cdfe9bc678 files/digest-squid-2.5.6 71
diff --git a/net-www/squid/files/digest-squid-2.5.6 b/net-www/squid/files/digest-squid-2.5.6
new file mode 100644
index 000000000000..c8bb1af72488
--- /dev/null
+++ b/net-www/squid/files/digest-squid-2.5.6
@@ -0,0 +1 @@
+MD5 7fd964ac27b43b613d6b981cc702a29e squid-2.5.STABLE6.tar.bz2 1047199
diff --git a/net-www/squid/files/squid-2.5.6-ufs-no-valid-dir.patch b/net-www/squid/files/squid-2.5.6-ufs-no-valid-dir.patch
new file mode 100644
index 000000000000..e2738191a0f8
--- /dev/null
+++ b/net-www/squid/files/squid-2.5.6-ufs-no-valid-dir.patch
@@ -0,0 +1,14 @@
+Index: squid/src/fs/ufs/store_dir_ufs.c
+diff -c squid/src/fs/ufs/store_dir_ufs.c:1.39.2.8 squid/src/fs/ufs/store_dir_ufs.c:1.39.2.9
+*** squid/src/fs/ufs/store_dir_ufs.c:1.39.2.8 Mon May 31 16:03:31 2004
+--- squid/src/fs/ufs/store_dir_ufs.c Wed Jul 14 10:26:12 2004
+***************
+*** 1636,1641 ****
+--- 1636,1642 ----
+ ufsinfo->swaplog_fd = -1;
+ ufsinfo->map = NULL; /* Debugging purposes */
+ ufsinfo->suggest = 0;
++ ufsinfo->open_files = 0;
+ sd->init = storeUfsDirInit;
+ sd->newfs = storeUfsDirNewfs;
+ sd->dump = storeUfsDirDump;
diff --git a/net-www/squid/squid-2.5.6.ebuild b/net-www/squid/squid-2.5.6.ebuild
new file mode 100644
index 000000000000..d0bb4efd835a
--- /dev/null
+++ b/net-www/squid/squid-2.5.6.ebuild
@@ -0,0 +1,187 @@
+# 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 $
+
+inherit eutils
+
+IUSE="pam ldap ssl sasl snmp debug"
+
+#lame archive versioning scheme..
+S_PV=${PV%.*}
+S_PL=${PV##*.}
+S_PP=${PN}-${S_PV}.STABLE${S_PL}
+
+DESCRIPTION="A caching web proxy, with advanced features"
+HOMEPAGE="http://www.squid-cache.org/"
+
+S=${WORKDIR}/${S_PP}
+SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${S_PP}.tar.bz2"
+
+RDEPEND="virtual/libc
+ pam? ( >=sys-libs/pam-0.75 )
+ ldap? ( >=net-nds/openldap-2.1.26 )
+ ssl? ( >=dev-libs/openssl-0.9.6m )
+ sasl? ( >=dev-libs/cyrus-sasl-1.5.27 )
+ selinux? ( sec-policy/selinux-squid )"
+DEPEND="${RDEPEND} dev-lang/perl"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+
+src_unpack() {
+ unpack ${A} || die
+ cd ${S} || die
+
+ #do NOT just remove this patch. yes, it's here for a reason.
+ #woodchip@gentoo.org (07 Nov 2002)
+ patch -p1 <${FILESDIR}/squid-2.5.3-gentoo.diff || die
+
+ # Fix storeCreate: ufs_no_valid_dir as listed on squid bug #1103
+ epatch ${FILESDIR}/squid-${PV}-ufs-no-valid-dir.patch || die
+
+ #hmm #10865
+ cd helpers/external_acl/ldap_group
+ cp Makefile.in Makefile.in.orig
+ sed -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
+ Makefile.in.orig > Makefile.in
+
+ if ! use debug
+ then
+ cd ${S}
+ mv configure.in configure.in.orig
+ sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in
+ export WANT_AUTOCONF=2.1
+ autoconf || die
+ fi
+}
+
+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
+
+ local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group"
+ use ldap && ext_helpers="ldap_group,${ext_helpers}"
+
+ local myconf=""
+ use snmp && myconf="${myconf} --enable-snmp" || myconf="${myconf} --disable-snmp"
+ use ssl && myconf="${myconf} --enable-ssl" || myconf="${myconf} --disable-ssl"
+
+ use amd64 && myconf="${myconf} --disable-internal-dns "
+
+ if use underscores; then
+ ewarn "Enabling underscores in domain names will result in dns resolution"
+ ewarn "failure if your local DNS client (probably bind) is not compatible."
+ myconf="${myconf} --enable-underscores"
+ fi
+
+ ./configure \
+ --prefix=/usr \
+ --bindir=/usr/bin \
+ --exec-prefix=/usr \
+ --sbindir=/usr/sbin \
+ --localstatedir=/var \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc/squid \
+ --libexecdir=/usr/lib/squid \
+ \
+ --enable-auth="basic,digest,ntlm" \
+ --enable-removal-policies="lru,heap" \
+ --enable-digest-auth-helpers="password" \
+ --enable-storeio="ufs,diskd,coss,aufs,null" \
+ --enable-basic-auth-helpers=${basic_modules} \
+ --enable-external-acl-helpers=${ext_helpers} \
+ --enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \
+ --enable-linux-netfilter \
+ --enable-ident-lookups \
+ --enable-useragent-log \
+ --enable-cache-digests \
+ --enable-delay-pools \
+ --enable-referer-log \
+ --enable-async-io \
+ --enable-truncate \
+ --enable-arp-acl \
+ --with-pthreads \
+ --enable-htcp \
+ --enable-carp \
+ --enable-poll \
+ --host=${CHOST} ${myconf} || die "bad ./configure"
+ #--enable-icmp
+
+ mv include/autoconf.h include/autoconf.h.orig
+ sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
+ include/autoconf.h.orig > include/autoconf.h
+
+# if [ "${ARCH}" = "hppa" ]
+# then
+# mv include/autoconf.h include/autoconf.h.orig
+# sed -e "s:^#define HAVE_MALLOPT 1:#undef HAVE_MALLOPT:" \
+# include/autoconf.h.orig > include/autoconf.h
+# fi
+
+ emake || die "compile problem"
+}
+
+src_install() {
+ make DESTDIR=${D} install || die
+
+ #--enable-icmp
+ #make -C src install-pinger libexecdir=${D}/usr/lib/squid || die
+ #chown root:squid ${D}/usr/lib/squid/pinger
+ #chmod 4750 ${D}/usr/lib/squid/pinger
+
+ #need suid root for looking into /etc/shadow
+ chown root:squid ${D}/usr/lib/squid/ncsa_auth
+ chown root:squid ${D}/usr/lib/squid/pam_auth
+ chmod 4750 ${D}/usr/lib/squid/ncsa_auth
+ chmod 4750 ${D}/usr/lib/squid/pam_auth
+
+ #some clean ups
+ rm -rf ${D}/var
+ mv ${D}/usr/bin/Run* ${D}/usr/lib/squid
+
+ #simply switch this symlink to choose the desired language..
+ dosym /usr/lib/squid/errors/English /etc/squid/errors
+
+ dodoc CONTRIBUTORS COPYING COPYRIGHT CREDITS \
+ ChangeLog QUICKSTART SPONSORS doc/*.txt \
+ helpers/ntlm_auth/no_check/README.no_check_ntlm_auth
+ newdoc helpers/basic_auth/SMB/README README.auth_smb
+ dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html
+ newdoc helpers/basic_auth/LDAP/README README.auth_ldap
+ doman helpers/basic_auth/LDAP/*.8
+ dodoc helpers/basic_auth/SASL/squid_sasl_auth*
+
+ insinto /etc/pam.d ; newins ${FILESDIR}/squid.pam squid
+ exeinto /etc/init.d ; newexe ${FILESDIR}/squid.rc6 squid
+ insinto /etc/conf.d ; newins ${FILESDIR}/squid.confd squid
+ exeinto /etc/cron.weekly ; newexe ${FILESDIR}/squid-r1.cron squid.cron
+}
+
+pkg_postinst() {
+ # empty dirs..
+ install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid
+ install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid
+
+ echo
+ ewarn "Squid authentication helpers have been installed suid root"
+ ewarn "This allows shadow based authentication, see bug #52977 for more"
+ echo
+}