Version bump. Add nis global USE flag; add pf-transparent and ipf-transparent local USE flags (#134823).

(Portage version: 2.1)

5 files changed, 223 insertions, 1 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 5bbbe8ac3eed..9a33a915c3fb 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.77 2006/05/25 16:03:49 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.78 2006/06/19 18:52:59 mrness Exp $
+
+*squid-2.5.14 (19 Jun 2006)
+
+  19 Jun 2006; Alin Nastac <mrness@gentoo.org> +squid-2.5.14.ebuild:
+  Version bump. Add nis global USE flag; add pf-transparent and
+  ipf-transparent local USE flags (#134823).
 
   25 May 2006; Guy Martin <gmsoft@gentoo.org> squid-2.5.13.ebuild:
   Stable on hppa.
diff --git a/net-proxy/squid/files/digest-squid-2.5.12 b/net-proxy/squid/files/digest-squid-2.5.12
index 53e91d2f6820..dc8aa77ef3b2 100644
--- a/net-proxy/squid/files/digest-squid-2.5.12
+++ b/net-proxy/squid/files/digest-squid-2.5.12
@@ -1,2 +1,6 @@
 MD5 ef9c292c2458a8d11e2ee2a569fbc408 squid-2.5.STABLE12-patches-20051123.tar.gz 21598
+RMD160 d16104157b31dc38f9366e3ccf21c8d563ae5346 squid-2.5.STABLE12-patches-20051123.tar.gz 21598
+SHA256 cca5c302eb68c2cd246b032672151ae934272a3d2c8f9238707048676e2936af squid-2.5.STABLE12-patches-20051123.tar.gz 21598
 MD5 de6238427bed63728970b7e3d6cba40a squid-2.5.STABLE12.tar.gz 1394653
+RMD160 ce2b368915e5f927a59b6aeaabecbd1911d66329 squid-2.5.STABLE12.tar.gz 1394653
+SHA256 9a5e0a2bc7ed4202e536c059532884a6c45de9a234520b886b2f891f861d3f0f squid-2.5.STABLE12.tar.gz 1394653
diff --git a/net-proxy/squid/files/digest-squid-2.5.12-r1 b/net-proxy/squid/files/digest-squid-2.5.12-r1
index 5a037f2ff53b..c8a2a5b17d2a 100644
--- a/net-proxy/squid/files/digest-squid-2.5.12-r1
+++ b/net-proxy/squid/files/digest-squid-2.5.12-r1
@@ -1,2 +1,6 @@
 MD5 33f76d99bccd759e35c52479fe3009ad squid-2.5.STABLE12-patches-20060124.tar.gz 23027
+RMD160 aef2819961b8af4b87bbb874062d2c4ba2cac009 squid-2.5.STABLE12-patches-20060124.tar.gz 23027
+SHA256 76c32721e3f0a9af30926445eb307b4757dfa47803bfd2fed4c8930a7191907d squid-2.5.STABLE12-patches-20060124.tar.gz 23027
 MD5 de6238427bed63728970b7e3d6cba40a squid-2.5.STABLE12.tar.gz 1394653
+RMD160 ce2b368915e5f927a59b6aeaabecbd1911d66329 squid-2.5.STABLE12.tar.gz 1394653
+SHA256 9a5e0a2bc7ed4202e536c059532884a6c45de9a234520b886b2f891f861d3f0f squid-2.5.STABLE12.tar.gz 1394653
diff --git a/net-proxy/squid/files/digest-squid-2.5.14 b/net-proxy/squid/files/digest-squid-2.5.14
new file mode 100644
index 000000000000..58922a7c4994
--- /dev/null
+++ b/net-proxy/squid/files/digest-squid-2.5.14
@@ -0,0 +1,6 @@
+MD5 9b657ea621e75a457b7db32fa794642f squid-2.5.STABLE14-patches-20060619.tar.gz 23811
+RMD160 a2779367052e0ac2a8ab085c78ad29de41b6f166 squid-2.5.STABLE14-patches-20060619.tar.gz 23811
+SHA256 0688f218779317304195aa2f728f6599635d34528882b23eb8461ca4cfa55319 squid-2.5.STABLE14-patches-20060619.tar.gz 23811
+MD5 26ccd46f232a7f85a42834e0c8953176 squid-2.5.STABLE14.tar.gz 1399962
+RMD160 abe464ab115b3f9541d3890fd413044f526ab5f0 squid-2.5.STABLE14.tar.gz 1399962
+SHA256 3ddb16abfe51f5fcbab66d2ca6a6e25341ed470eb7eb1415111401b9e20ba5f2 squid-2.5.STABLE14.tar.gz 1399962
diff --git a/net-proxy/squid/squid-2.5.14.ebuild b/net-proxy/squid/squid-2.5.14.ebuild
new file mode 100644
index 000000000000..c2994d1babe8
--- /dev/null
+++ b/net-proxy/squid/squid-2.5.14.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.5.14.ebuild,v 1.1 2006/06/19 18:52:59 mrness Exp $
+
+inherit eutils pam toolchain-funcs flag-o-matic
+
+#lame archive versioning scheme..
+S_PV="${PV%.*}"
+S_PL="${PV##*.}"
+S_PL="${S_PL/_rc/-RC}"
+S_PP="${PN}-${S_PV}.STABLE${S_PL}"
+PATCH_VERSION="20060619"
+
+DESCRIPTION="A caching web proxy, with advanced features"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz
+	mirror://gentoo/${S_PP}-patches-${PATCH_VERSION}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pam ldap sasl nis ssl snmp debug selinux underscores logrotate customlog zero-penalty-hit follow-xff \
+	pf-transparent ipf-transparent"
+
+RDEPEND="pam? ( virtual/pam )
+	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 )
+	logrotate? ( app-admin/logrotate )"
+DEPEND="${RDEPEND} dev-lang/perl"
+
+S="${WORKDIR}/${S_PP}"
+
+pkg_setup() {
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd "${S}" || die "dir ${S} not found"
+
+	# Do bulk patching from squids bug fix list as well as our patches
+	use customlog || rm "${WORKDIR}"/patch/9*customlog*
+	use zero-penalty-hit || rm "${WORKDIR}"/patch/9*ToS_Hit*
+	use follow-xff || rm "${WORKDIR}"/patch/9*follow_xff*
+	EPATCH_SUFFIX="patch"
+	epatch "${WORKDIR}/patch"
+
+	#hmm #10865
+	sed -i -e 's%^\(LINK =.*\)\(-o.*\)%\1\$(XTRA_LIBS) \2%' \
+		helpers/external_acl/ldap_group/Makefile.in
+
+	#disable lazy bindings on (some at least) suided basic auth programs
+	sed -i -e 's:_LDFLAGS[ ]*=:_LDFLAGS = '$(bindnow-flags)':' \
+		helpers/basic_auth/*/Makefile.in
+
+	if ! use debug ; then
+		sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
+	fi
+	export WANT_AUTOCONF=2.1
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	local basic_modules="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,winbind"
+	use ldap && basic_modules="LDAP,${basic_modules}"
+	use pam && basic_modules="PAM,${basic_modules}"
+	use sasl && basic_modules="SASL,${basic_modules}"
+	use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}"
+
+	local ext_helpers="ip_user,unix_group,wbinfo_group,winbind_group"
+	use ldap && ext_helpers="ldap_group,${ext_helpers}"
+
+	local myconf=""
+	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
+
+	# Support for uclibc #61175
+	if use elibc_uclibc; then
+		myconf="${myconf} --enable-storeio='ufs,diskd,aufs,null'"
+		myconf="${myconf} --disable-async-io"
+	else
+		myconf="${myconf} --enable-storeio='ufs,diskd,coss,aufs,null'"
+		myconf="${myconf} --enable-async-io"
+	fi
+
+	if use kernel_linux; then
+		myconf="${myconf} --enable-linux-netfilter"
+	elif use kernel_freebsd || use kernel_openbsd || use kernel_netbsd ; then
+		if use pf-transparent; then
+			myconf="${myconf} --enable-pf-transparent"
+		elif use ipf-transparent; then
+			myconf="${myconf} --enable-ipf-transparent"
+		fi
+	fi
+
+	export CC=$(tc-getCC)
+
+	./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-basic-auth-helpers="${basic_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check,winbind" \
+		--enable-ident-lookups \
+		--enable-useragent-log \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-referer-log \
+		--enable-truncate \
+		--enable-arp-acl \
+		--with-pthreads \
+		--with-large-files \
+		--enable-htcp \
+		--enable-carp \
+		--enable-poll \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		$(use_enable follow-xff follow-x-forwarded-for) \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+
+	sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
+		include/autoconf.h
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	#need suid root for looking into /etc/shadow
+	fowners root:squid /usr/lib/squid/ncsa_auth
+	fowners root:squid /usr/lib/squid/pam_auth
+	fperms 4750 /usr/lib/squid/ncsa_auth
+	fperms 4750 /usr/lib/squid/pam_auth
+
+	#some clean ups
+	rm -f "${D}"/usr/bin/Run*
+
+	#simply switch this symlink to choose the desired language..
+	dosym /usr/lib/squid/errors/English /etc/squid/errors
+
+	dodoc CONTRIBUTORS 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*
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd" squid
+	if use logrotate; then
+		newinitd "${FILESDIR}/squid.initd-logrotate" squid
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		newinitd "${FILESDIR}/squid.initd" squid
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	rm -rf "${D}"/var
+	diropts -m0755 -o squid -g squid
+	keepdir /var/cache/squid /var/log/squid
+}
+
+pkg_preinst() {
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+pkg_postinst() {
+	echo
+	ewarn "Squid authentication helpers have been installed suid root"
+	ewarn "This allows shadow based authentication, see bug #52977 for more"
+	echo
+	einfo "For winbind authentication to work with squid you should change the"
+	einfo "/var/cache/samba/winbindd_privileged group to the same one you use"
+	einfo "in the cache_effective_group option on your squid.conf:"
+	einfo "    chgrp squid /var/cache/samba/winbindd_privileged"
+	echo
+	ewarn "Be careful what type of cache_dir you select!"
+	ewarn "   'diskd' is optimized for high levels of traffic, but it might seem slow"
+	ewarn "when there isn't sufficient traffic to keep squid reasonably busy."
+	ewarn "   If your traffic level is low to moderate, use 'aufs' or 'ufs'."
+	echo
+}