pinger needs suid - bug #436304

Package-Manager: portage-2.2.0_alpha132/cvs/Linux x86_64

3 files changed, 244 insertions, 22 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index e1d42febc1d0..6c4d8164f77b 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.351 2012/09/25 09:19:35 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.352 2012/09/26 16:08:59 eras Exp $
+
+*squid-3.2.1-r1 (26 Sep 2012)
+
+  26 Sep 2012; Eray Aslan <eras@gentoo.org> +squid-3.2.1-r1.ebuild:
+  pinger needs suid - bug #436304
 
 *squid-3.1.21 (25 Sep 2012)
 
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index b9859dc5b80c..57f7e8a6eab2 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX squid-2-heimdal.patch 776 SHA256 bd0083836321c596db3fc8749152bc77d5a4bd03070d33541b7b489af59e4c25 SHA512 78ac4e930dbf4296036fff9022572e455ed7999eddfcc0b13d34da74bc1c994665fbe30f2e3322f1efa31834a555ed1dce2b3327b4d97bfd03363ae03164d410 WHIRLPOOL f8a54ea5f52968958607df7ebd467b591fbc9189de5b03d1f871b534980858348929b25f3fc3a2fb2ec968655a73e9323f2fe79d2b0b43558669714edba7996b
 AUX squid-2.7.9-gentoo.patch 13118 SHA256 981588dc2d599a2b49f550a1ae111e96515b437a03c8d0dccc6f96f078009d11 SHA512 358fb2e28fc7eb9cee573c05e1becee9ad9ce0cacde106f0809ca2e12ec6ca0a1d68eab81a34879d2ca7b05adcacb33502369266b3c9eed249f2506e0c55492d WHIRLPOOL b8c62251f4d1e54d50b301ac807e9bf08d6c777432795820f993b2a4f29be7491b60c13b3200a16f79280b8e2e410c2ca34a0a5820da8493fdcceea0e3b82e59
 AUX squid-3.1.15-gentoo.patch 10538 SHA256 75549600815236932f549e1c4e0286b6cbb4dc26a7e545abb96b7d29f0128ab3 SHA512 6e2a26e7cb99664046619f3d4cb9e87998b462f7de09d6fbf4a269ccf2da758d5caad35c0ec43c5c9c5a9eb8943ecf14a0cdb67fa2a117bc3be4d9a41a920451 WHIRLPOOL 5dfce88287693fd75902b58c7d7759bd083173e8e69bf4f7c725a196a8d4d1f92e5e3e98dc7c727f01d62f5e049fe2599f6f9e02eb92c13a8bf09f8c4387dbd7
@@ -27,23 +24,7 @@ EBUILD squid-3.1.18.ebuild 6684 SHA256 20fa8d1c19647244b85e6d1f4d7a78a970684f46e
 EBUILD squid-3.1.19.ebuild 6664 SHA256 d2883e0731b2bd5209a6a4c6a7d2aa6cf61e74854522570f3699ac01822d77ff SHA512 1fef889008957653726e502ab711ddd03016bcf8cf5ed69db2785bc412db6378bd0603a7428fee4a62f2513132430c3b4ff6e800d07c563b7eaff97a404eab42 WHIRLPOOL d5d6966d7d869ae560222ec7c44b33c0a5af98ef4dc3bb585d4a4431ef99d1b8e4e883023768cdf44985dc129dcecb22d294def99cbc3d3fdb988c13c56830d9
 EBUILD squid-3.1.20.ebuild 6641 SHA256 64c6674cee87de0055dd27cf48c345cfb3e5e5dfa05148079569b66db312f268 SHA512 942b5598a0c94e6db9cd5f1da17e697df3eddaf7d916139cee107f0ddaf75cd12dd23b2fab521402fa7ebda8c8f4ef4a98ffef0021d1e994256d054650c467b2 WHIRLPOOL d45da9d5e1e1631df21a389773bfb527fb9b14a055a87fa3af12b4af8d3120ad52174abda866a42e0e188365be3f2caa10cd846791fcebd126ab0656b9ea564c
 EBUILD squid-3.1.21.ebuild 6641 SHA256 494236982f99275d67fd1e1241bd1dc42dfd90d65b4888f09af09bc7d3553399 SHA512 d1838d8fac7799310219966ef0515d8b477dcf7ac611bffcb3cc68593cf33350f45bc725dd33f33b4d37834da06ea0dff1d8bd2304315e8b96b8768d0406dc43 WHIRLPOOL 1668506f0fac06c1e03ba1771a7ded3322c430be5dc000be06e950ae5b32dbd9ca722e18c3cfb40749d0109f0528081615b9ac784fd2eef68155f7f0d128a070
+EBUILD squid-3.2.1-r1.ebuild 7539 SHA256 c60b2a3c9e484d3fa7396149035f034ba75dd54881b9725cd7fec02036c2055f SHA512 5c7ae91e33719ce863f8d7ef105b6480c40e728ac86cc189493765e991da3319ae83da6172cb5684e6b0aa5e91c9da9a0ffe67ecad2797ed30026638788847b0 WHIRLPOOL 8c6ca3126d25ab3bfc8c7921fdd4fc4d040742f8114a8ed574e52d44bdb44ca3ed998b8ce0782e145c31c82a286aa394539c50220ff451b997d782aaed254864
 EBUILD squid-3.2.1.ebuild 7633 SHA256 e9feee56fb5075f7418e07112cdfa6c8a2122817dfb6974566e61cdf6512dcb0 SHA512 3998b35a6f4b481dea00e2b994ada0f865b24ae9b1005220f0accafed1f42ec46b834e7a0dc18dbd5ccf5bde093eca892880ef82b5a8a0200434dd8bc5c6d5d9 WHIRLPOOL 4efb6d6025fe4d4e8a72a480e0955f6e5f96af0e1edfc82eacd804e752af2f5a02da62a6acf398be1b59783dc3f7a4a2a6cc3963c21b39a59766701667b6c6ec
-MISC ChangeLog 72933 SHA256 5a05060a1a30e85c5952aacaa0515f8818ae1887dae665bc963b268ce6b1386b SHA512 b56cf656cd00da2960e5e094d06bfa7b283f6b87ce2ecfa4f74603abb1c115fea4d00fb6bd45867a60df1de6a461c71b01b45827a55600600befd94b39ff91dc WHIRLPOOL 96e1e0810dcf7edd878a6f7a0564aad21585523ba1cfb1d2b2b9747f2afd4afeffa143f6ea8e880c307b1a9bcefbe40c03aeafe760844cb99083bdbf1fb889be
+MISC ChangeLog 73067 SHA256 ea05a974319bbd5afd4fe0826817afe95f4bd9fecc0d9c7096b4c25ce0a30d78 SHA512 c80d50771918af8f1c587516c41e467b03e982dad92df0fdd091189ee4939cff49579972ce122be880eca5f5fac71898c922fbac079d619b19c36906e03b45d8 WHIRLPOOL 76a6a2e7545701b13f87ad0e5d2515c50d207f4d4b234b7ac3cdb559e6d5eb8be1366e1aaceacf81535397af66d57afe3802ac8876f9459ee257913b5478c687
 MISC metadata.xml 1335 SHA256 07a1e3761c3f3f2c3524057a7321fef17742203c3ede39066e89da593e4c6265 SHA512 1876ea4e243a6a95e748cd471823191713fa5dad5fc64343e35d7cf345e504e2ab56109b9b8a1f4c0740c03770026773c825abd5a9635eea74e35aa67bcf55d3 WHIRLPOOL c0b2399f9c8f78a28753d27520c4d64e3c8aa8894e66f12162e0197e85cd9a81949e5e5868b2461ddb1d757b52a97674105820fd6e84fa4946d410e00effd965
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQYXc2AAoJEHfx8XVYajsftG8QAIzkYCkt0fIybHcwsnQ0RkHL
-iMUkjLIh0l0datE5XYgDH5E+yTYO52ieqp4hz0fBDF2RViqz//GV+ibydlrqKVG5
-pzzfw+HOgvNATcmU/NvKujhqRXQUw2aUDustTTFtyTFJJ6YsseC+yyiqP2eIJhBA
-iVq2UqUFfGWalUopk6vpLSpXs5b6GLuheWL4JJzFCcLgFFHYOi6uD/LyUgXQ2oit
-d+IprwnGDzuxR69iRkADEWoh1khmgjoPrEMdUQBVYSFIpNnhtOOY3K0/wx3N2z1V
-pl6OT1K0XJkZHCpdBgnx7ZP6jhxBHGEaNwouGS0xZcC69/ObfWBc+swCHvPhrN0G
-LanKqwTSlTPTyGWZFUcqCI8h/8f5Mr+uWt3brHS6GttJiEUSm5b8cWlq/lAQ8Rtq
-8LiikjftM+NIN/RM1R0ksRYnv0Vw3VTxtWfl5ipP3z0zyXEwhmdiKU7WJuST8VpK
-EGUDwGqLmEuZ6E7u06COb38BZ9EySfiGIVkceQ+HFNB+Kwg3qxntyrIpSgBa/aiC
-86S/cH+4etsaljwVxx+9NoDqKLQST17rUJY3ccekJ0DHRggedJuzai9mhZfLKaLC
-qqoGYkB2vy/XPYaDp+RDikPWw/7gVIR2E5YehvAh1m+ppE8yGySQXjZtlXPvhpD8
-PcFjli1i8sld+sU+DmOr
-=YIFz
------END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-3.2.1-r1.ebuild b/net-proxy/squid/squid-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..0dd9419c7ba4
--- /dev/null
+++ b/net-proxy/squid/squid-3.2.1-r1.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.1-r1.ebuild,v 1.1 2012/09/26 16:08:59 eras Exp $
+
+EAPI=4
+inherit eutils pam toolchain-funcs autotools linux-info user versionator
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.2/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap icap-client ssl-crtd \
+	mysql postgres sqlite \
+	qos tproxy \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux"
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? ( dev-libs/openssl )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:2 )
+	selinux? ( sec-policy/selinux-squid )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4
+	sys-devel/libtool
+	dev-lang/perl"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/ed
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+REQUIRED_USE="tproxy? ( caps )
+			qos? ( caps )"
+
+pkg_pretend() {
+	if use tproxy; then
+		echo
+		elog "Checking kernel configuration for full Tproxy4 support"
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+		echo
+	fi
+}
+
+pkg_setup() {
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.2.1-gentoo.patch"
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		helpers/basic_auth/MSNT/README.html \
+		helpers/basic_auth/MSNT/confload.cc \
+		helpers/basic_auth/MSNT/msntauth.conf.default \
+		scripts/fileno-to-pathname.pl \
+		scripts/check_cache.pl \
+		tools/cachemgr.cgi.8 \
+		tools/purge/conffile.hh \
+		tools/purge/README  || die
+	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+		INSTALL QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
+		QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
+		QUICKSTART \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
+		helpers/basic_auth/MSNT/README.html || die
+	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
+		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
+		helpers/external_acl/session/ext_session_acl.8 \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
+		scripts/check_cache.pl || die
+	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	eautoreconf
+}
+
+src_configure() {
+	local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
+	use samba && basic_modules+=",SMB"
+	use ldap && basic_modules+=",LDAP"
+	use pam && basic_modules+=",PAM"
+	use sasl && basic_modules+=",SASL"
+	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
+	use radius && basic_modules+=",RADIUS"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules+=",DB"
+	fi
+
+	local digest_modules="file"
+	use ldap && digest_modules+=",LDAP,eDirectory"
+
+	local negotiate_modules="none"
+	use kerberos && negotiate_modules="kerberos,wrapper"
+
+	local ntlm_modules="none"
+	use samba && ntlm_modules="smb_lm"
+
+	local ext_helpers="file_userip,session,unix_group"
+	use samba && ext_helpers+=",wbinfo_group"
+	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
+	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
+
+	# uclibc does not have aio support - needed for coss (#61175)
+	local storeio_modules="aufs,diskd,rock,ufs"
+	# not stable enough yet
+	#! use elibc_uclibc && storeio_modules+=",coss"
+
+	local transparent
+	if use kernel_linux ; then
+		transparent+=" --enable-linux-netfilter"
+		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
+	fi
+
+	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		transparent+=" $(use_enable kqueue)"
+		if use pf-transparent; then
+			transparent+=" --enable-pf-transparent"
+		elif use ipf-transparent; then
+			transparent+=" --enable-ipf-transparent"
+		fi
+	fi
+
+	export CC=$(tc-getCC)
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--with-pidfile=/var/run/squid.pid \
+		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
+		--with-default-user=squid \
+		--enable-removal-policies="lru,heap" \
+		--enable-storeio="${storeio_modules}" \
+		--enable-disk-io \
+		--enable-auth \
+		--enable-auth-basic="${basic_modules}" \
+		--enable-auth-digest="${digest_modules}" \
+		--enable-auth-ntlm="${ntlm_modules}" \
+		--enable-auth-negotiate="${negotiate_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-log-daemon-helpers \
+		--enable-url-rewrite-helpers \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-eui \
+		--enable-icmp \
+		--enable-follow-x-forwarded-for \
+		--enable-esi \
+		--with-large-files \
+		--with-filedescriptors=8192 \
+		--disable-strict-error-checking \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_enable ssl) \
+		$(use_enable ssl-crtd) \
+		$(use_enable icap-client) \
+		$(use_enable ecap) \
+		${transparent}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+	# pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# some cleanups
+	rm -f "${D}"/usr/bin/Run*
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
+	newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
+	newdoc helpers/basic_auth/LDAP/README README.LDAP
+	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
+	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
+	newdoc tools/purge/README README.purge
+	newdoc tools/helper-mux.README README.helper-mux
+	dohtml RELEASENOTES.html
+
+	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
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid
+}
+
+pkg_postinst() {
+	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
+		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 2 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.2/RELEASENOTES.html"
+		echo
+	fi
+}