Revision bump to fix the pam.d file.

Package-Manager: portage-2.1.3_rc6

5 files changed, 241 insertions, 5 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 4ed2c13b1212..4168ed5c8bd4 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.141 2007/07/01 21:54:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.142 2007/07/02 10:14:30 flameeyes Exp $
+
+*squid-2.6.13-r1 (02 Jul 2007)
+
+  02 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> +files/squid.pam.1,
+  +squid-2.6.13-r1.ebuild:
+  Revision bump to fix the pam.d file.
 
   01 Jul 2007; Raúl Porcel <armin76@gentoo.org> squid-2.6.13.ebuild:
   alpha/ia64/x86 stable wrt #182301
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index c52d165eab22..0d037ca2312f 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX squid-2.6.12-ToS_Hit_ToS_Preserve.patch 7810 RMD160 f5c1cf54dca620f540baf842f1e677ec7f325c8c SHA1 8ed0aa5aacdb9cf44644d8259e9fa8186a06841b SHA256 d7b081c72063e3a64d9abb583ba1bc520089fea4e451d646eade30dc81bc44f5
 MD5 35dbafcc1b37d853f836a267b2035756 files/squid-2.6.12-ToS_Hit_ToS_Preserve.patch 7810
 RMD160 f5c1cf54dca620f540baf842f1e677ec7f325c8c files/squid-2.6.12-ToS_Hit_ToS_Preserve.patch 7810
@@ -42,20 +45,28 @@ AUX squid.pam 315 RMD160 ff8a56fd5e8d4e0fde70853162a757476f3b7893 SHA1 f694dbc62
 MD5 2957ca0ec8bf84e4af8ed5adef7acb90 files/squid.pam 315
 RMD160 ff8a56fd5e8d4e0fde70853162a757476f3b7893 files/squid.pam 315
 SHA256 dec9bd5ea16977fa334db04eb657e0598af411dad7ff279acf86beddcd22a8fd files/squid.pam 315
+AUX squid.pam.1 320 RMD160 365ae3d5674f93b4c3d8d86a446fdf9adcfae244 SHA1 287e72cd279fd08d1e7cb10c2296cad8a93f575b SHA256 5039319ed3bd78952d81a31b299d1f3d5b641eb5feb52b3cc05f8d88bf1d2273
+MD5 0ecef2f5f3711a22a32672caf3af16a4 files/squid.pam.1 320
+RMD160 365ae3d5674f93b4c3d8d86a446fdf9adcfae244 files/squid.pam.1 320
+SHA256 5039319ed3bd78952d81a31b299d1f3d5b641eb5feb52b3cc05f8d88bf1d2273 files/squid.pam.1 320
 DIST squid-2.6.STABLE12.tar.gz 1626994 RMD160 8e9463969064312b5f2fbe83b039be09646efbed SHA1 06a733cc04ba894cf4f7621278a1145b8e5807f9 SHA256 b4a1dd476371327369894ff73f729e5a24ec76b07f40a823cf04ca5c1210fc42
 DIST squid-2.6.STABLE13.tar.gz 1627479 RMD160 6a01a10482ed1ce9715ae89905629472103bd394 SHA1 6e5783c928325b3652a5a7ffb5b167318d5937f1 SHA256 1c32265ec15af7cfa28dec12f356c9abcb1c38ecf97de263674bb61732d4076b
 EBUILD squid-2.6.12.ebuild 6135 RMD160 47895fbd209fb6d2b8f47e9214a82647332744ae SHA1 b06a5ee4b832214e5ed51f834e68d3ab0b11e0e2 SHA256 d336b2c5797cd9f73f382217a612a8869d45b35d93ec4abdd6a8bb47719b6e89
 MD5 67dd998ba1081c2335b89283dca076b4 squid-2.6.12.ebuild 6135
 RMD160 47895fbd209fb6d2b8f47e9214a82647332744ae squid-2.6.12.ebuild 6135
 SHA256 d336b2c5797cd9f73f382217a612a8869d45b35d93ec4abdd6a8bb47719b6e89 squid-2.6.12.ebuild 6135
+EBUILD squid-2.6.13-r1.ebuild 6204 RMD160 b5c900e4dc660d55f9d7ebe530ce1b56504f2ed5 SHA1 64a6369259fe581079fcf94f27f7f0527665add3 SHA256 cd75e286a2614da3a3bde76a1c58499f9e08dec6663d7fca7a50d6a660d75832
+MD5 d55f0b52b9d05b7f822d273220025737 squid-2.6.13-r1.ebuild 6204
+RMD160 b5c900e4dc660d55f9d7ebe530ce1b56504f2ed5 squid-2.6.13-r1.ebuild 6204
+SHA256 cd75e286a2614da3a3bde76a1c58499f9e08dec6663d7fca7a50d6a660d75832 squid-2.6.13-r1.ebuild 6204
 EBUILD squid-2.6.13.ebuild 6191 RMD160 2e27c5e56e0248f95f6921b52371c150f0657c46 SHA1 03301e6fc02136ef34351a68f9bec547e720bfba SHA256 ee119557d5480fdb38137ad9f2baf24c157cf8f56a8e153f27f990cfb668c331
 MD5 b3d53c69f418da4277c374130fc0930e squid-2.6.13.ebuild 6191
 RMD160 2e27c5e56e0248f95f6921b52371c150f0657c46 squid-2.6.13.ebuild 6191
 SHA256 ee119557d5480fdb38137ad9f2baf24c157cf8f56a8e153f27f990cfb668c331 squid-2.6.13.ebuild 6191
-MISC ChangeLog 35229 RMD160 d455aaf667f1314671192f6c55aa29792aa35ed1 SHA1 da525d0d7e9a174e31634114885973cda7998b49 SHA256 df2b26b146a1ef362a15668254f40b38e96da91ac35cb4a8ca25c7a81a0f99e7
-MD5 f8866ed199251de614f1fe323a12fa05 ChangeLog 35229
-RMD160 d455aaf667f1314671192f6c55aa29792aa35ed1 ChangeLog 35229
-SHA256 df2b26b146a1ef362a15668254f40b38e96da91ac35cb4a8ca25c7a81a0f99e7 ChangeLog 35229
+MISC ChangeLog 35403 RMD160 4268b038d2314be56bddd60f53046db45f663488 SHA1 4a149d968ab10d2afe1c3624816134fd9b7efafe SHA256 787087f74bb6dd973b0f7b9caf7639a5a4216e0db8119a1822d259861f93b66d
+MD5 eed38ce588bad58780625444b1a91187 ChangeLog 35403
+RMD160 4268b038d2314be56bddd60f53046db45f663488 ChangeLog 35403
+SHA256 787087f74bb6dd973b0f7b9caf7639a5a4216e0db8119a1822d259861f93b66d ChangeLog 35403
 MISC metadata.xml 229 RMD160 3017fab68c82b875738f1df5bb414f46480f142f SHA1 975a764b9c2b956a744795d61a702bd3545bbfb9 SHA256 b986c2ccab6337ef434285c558ed764218d7ca79a82cb5ee3d2615cd03360e87
 MD5 24a10e76803f4cc98cdc979586096c6f metadata.xml 229
 RMD160 3017fab68c82b875738f1df5bb414f46480f142f metadata.xml 229
@@ -66,3 +77,13 @@ SHA256 4c277802753ea30ca9be81361e42899274a072f082d06cc793a352bcf7fec253 files/di
 MD5 bece67ae4733616c75ab2c6b864a23c2 files/digest-squid-2.6.13 259
 RMD160 dcd0886e50bfed9cbbb470ee2c2bcb6ebf7c4dbd files/digest-squid-2.6.13 259
 SHA256 04d841d3dc6bf9aad0831ec3ecb08ef55aeb12fc23dec3d3c500e804d5d90dfc files/digest-squid-2.6.13 259
+MD5 bece67ae4733616c75ab2c6b864a23c2 files/digest-squid-2.6.13-r1 259
+RMD160 dcd0886e50bfed9cbbb470ee2c2bcb6ebf7c4dbd files/digest-squid-2.6.13-r1 259
+SHA256 04d841d3dc6bf9aad0831ec3ecb08ef55aeb12fc23dec3d3c500e804d5d90dfc files/digest-squid-2.6.13-r1 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGiNA7AiZjviIA2XgRAnYyAJ9LHXS7sQbDv5WA1nJ0zCL25jO+IgCfZ0/Q
+FQ8r0jfcPqNWSZA+5giwWyo=
+=BB7c
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/digest-squid-2.6.13-r1 b/net-proxy/squid/files/digest-squid-2.6.13-r1
new file mode 100644
index 000000000000..8c0450fef0ef
--- /dev/null
+++ b/net-proxy/squid/files/digest-squid-2.6.13-r1
@@ -0,0 +1,3 @@
+MD5 f152224c3edbc0acbb85565c1942332b squid-2.6.STABLE13.tar.gz 1627479
+RMD160 6a01a10482ed1ce9715ae89905629472103bd394 squid-2.6.STABLE13.tar.gz 1627479
+SHA256 1c32265ec15af7cfa28dec12f356c9abcb1c38ecf97de263674bb61732d4076b squid-2.6.STABLE13.tar.gz 1627479
diff --git a/net-proxy/squid/files/squid.pam.1 b/net-proxy/squid/files/squid.pam.1
new file mode 100644
index 000000000000..fb073672378d
--- /dev/null
+++ b/net-proxy/squid/files/squid.pam.1
@@ -0,0 +1,8 @@
+#%PAM-1.0
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.pam.1,v 1.1 2007/07/02 10:14:30 flameeyes Exp $
+auth       include		system-auth
+auth       required		pam_nologin.so
+account    include		system-auth
+password   include		system-auth
+session    include		system-auth
+session    optional		pam_limits.so
diff --git a/net-proxy/squid/squid-2.6.13-r1.ebuild b/net-proxy/squid/squid-2.6.13-r1.ebuild
new file mode 100644
index 000000000000..0f926689dbbc
--- /dev/null
+++ b/net-proxy/squid/squid-2.6.13-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.6.13-r1.ebuild,v 1.1 2007/07/02 10:14:30 flameeyes Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils pam toolchain-funcs flag-o-matic autotools linux-info
+
+#lame archive versioning scheme..
+S_PV="${PV%.*}"
+S_PL="${PV##*.}"
+S_PL="${S_PL/_rc/-RC}"
+S_PP="${PN}-${S_PV}.STABLE${S_PL}"
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v2/${S_PV}/${S_PP}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="pam ldap samba sasl nis ssl snmp selinux logrotate qos zero-penalty-hit \
+	pf-transparent ipf-transparent \
+	elibc_uclibc kernel_linux"
+
+DEPEND="pam? ( virtual/pam )
+	ldap? ( >=net-nds/openldap-2.1.26 )
+	ssl? ( >=dev-libs/openssl-0.9.7j )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.21 )
+	selinux? ( sec-policy/selinux-squid )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4
+	dev-lang/perl"
+RDEPEND="${DEPEND}
+	samba? ( net-fs/samba )"
+
+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"
+
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-ToS_Hit_ToS_Preserve.patch
+	use qos && epatch "${FILESDIR}"/${P}-qos.patch
+
+	sed -i -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in
+
+	#disable lazy bindings on (some at least) suided basic auth programs
+	sed -i -e '$aAM_LDFLAGS = '$(bindnow-flags) \
+		helpers/basic_auth/*/Makefile.am
+
+	eautoreconf
+}
+
+src_compile() {
+	local basic_modules="getpwnam,NCSA,MSNT"
+	use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}"
+	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,session,unix_group"
+	use samba && ext_helpers="wbinfo_group,${ext_helpers}"
+	use ldap && ext_helpers="ldap_group,${ext_helpers}"
+
+	local ntlm_helpers="fakeauth"
+	use samba && ntlm_helpers="SMB,${ntlm_helpers}"
+
+	local myconf=""
+
+	# 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"
+		if kernel_is ge 2 6 && linux_chkconfig_present EPOLL ; then
+			myconf="${myconf} --enable-epoll"
+		fi
+	elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		myconf="${myconf} --enable-kqueue"
+		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)
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--datadir=/usr/share/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="${ntlm_helpers}" \
+		--enable-ident-lookups \
+		--enable-useragent-log \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-referer-log \
+		--enable-arp-acl \
+		--with-pthreads \
+		--with-large-files \
+		--enable-htcp \
+		--enable-carp \
+		--enable-follow-x-forwarded-for \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		${myconf} || die "econf failed"
+
+	sed -i -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 8192:" \
+		include/autoconf.h
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	#need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/ncsa_auth
+	fowners root:squid /usr/libexec/squid/pam_auth
+	fperms 4750 /usr/libexec/squid/ncsa_auth
+	fperms 4750 /usr/libexec/squid/pam_auth
+
+	#some cleanups
+	rm -f "${D}"/usr/bin/Run*
+
+	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.1" 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
+
+	#Remove this after all versions prior to 2.6.4 has been removed from the tree
+	if [[ -L "${ROOT}/etc/squid/errors" ]]; then
+		rm "${ROOT}/etc/squid/errors"
+	fi
+}
+
+pkg_postinst() {
+	echo
+	ewarn "Squid authentication helpers have been installed suid root."
+	ewarn "This allows shadow based authentication (see bug #52977 for more)."
+	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
+	ewarn "/etc/squid/errors symlink has been removed from your system."
+	ewarn "Error templates can be customized through ${HILITE}error_directory${NORMAL} directive."
+	echo
+	ewarn "Squid can be configured to run in transparent mode like this:"
+	ewarn "   ${HILITE}http_port internal-addr:3128 transparent${NORMAL}"
+}