Security cleanup wrt bug 455324

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

4 files changed, 7 insertions, 252 deletions

diff --git a/net-proxy/c-icap/ChangeLog b/net-proxy/c-icap/ChangeLog
index 74fcd46d07dc..fbd3d48322cc 100644
--- a/net-proxy/c-icap/ChangeLog
+++ b/net-proxy/c-icap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/c-icap
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.27 2013/10/13 10:32:28 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/ChangeLog,v 1.28 2014/08/26 17:24:27 creffett Exp $
+
+  26 Aug 2014; Christopher Reffett <2011creffett@gentoo.org>
+  -c-icap-0.2.2.ebuild, -c-icap-0.2.5.ebuild:
+  Security cleanup wrt bug 455324
 
   13 Oct 2013; Agostino Sarubbo <ago@gentoo.org> c-icap-0.2.6.ebuild:
   Stable for x86, wrt bug #455324
diff --git a/net-proxy/c-icap/Manifest b/net-proxy/c-icap/Manifest
index 4e7c950645f8..2568f0498c89 100644
--- a/net-proxy/c-icap/Manifest
+++ b/net-proxy/c-icap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX c-icap-0.1.3+db-5.0.patch 495 SHA256 5cc9ea93da6e14f546a4fbe34cdfbc796b8e871e6a618de400e709a61556fb01 SHA512 c9f87538922d0c06ab6153779d379b3f5a850c4f9a5c8adf073c2f13de0d585dad2bead8e30a1f138b64427fdeb784fc16cb590c48188beea717cdb25806a8d9 WHIRLPOOL b0f30d8a2341b83a1dd9a0477d7664ae6835e19daa70b08c524770d6a29af814468721ebc286ae4bdafe41b164c00b3d1dd82c8a77fbd76c7a7b03978a675372
 AUX c-icap-0.1.4-crosscompile.patch 1847 SHA256 5117a04c7472cd405781f9751a35c5226e9bf1d4457bb3da6e5dbad65a18facd SHA512 921eccd75e7c652e5173dc797a9f171d59c67dc3499f99a2750a27d96f78474d8515fa59c38516c06f17308c76dec3b8e17bb627a430c33c83cfd3736b6483fd WHIRLPOOL a4844778c09b883fcfaf81c8fadf59e91d56324b483bbc238fa845bc91308d7e55ab68b706708c7d51fa72ad0482592fdc87d9de7dc264dbd0c65bfd65a405f3
 AUX c-icap-0.1.6-implicit.patch 315 SHA256 b01d114efb6cb3ef5ce2a5945604ae96a7f8ee2b402f77bce0f60e3cd9f34f7e SHA512 bde1fa27bc09fea4d1ca0d3fdf5454fde15a5014109ef213134980d3848ecae3af74b13a8e1253aca7485734de7de2a318bbd9bc92c7e750f1d008386b17cb62 WHIRLPOOL 71da5c378613eab242be89b4704c5f61521a3e1861cf92bf77b6124a573e6823eb1498b8c1b8d359a4ae40ec8406c4739a4e62b5e67e6f6ad1a985551c29ac1b
@@ -10,28 +7,7 @@ AUX c-icap.conf 472 SHA256 4daeb52750c87b19fce1014f90f18140a7ba9efc1e92f5e920b7d
 AUX c-icap.init.2 575 SHA256 c5ff4b5cb9ba0640cb370089bd2fbd8f363ce1d225714e9bdaae7f0d32af64ab SHA512 62a34b68d61c37d15d0125c45292f9e09f06ba717e7bd5bdec3cc6f0f9b3238e674342b7f6ee04de566a708537e4c90d8605d9273dc2b288e5b9cb3ad4546b2d WHIRLPOOL c1e5ccb02a3f7fed5ce27fbc639a1c07cf453bd3717cb120539c23f9391f284f6766e6a5e41706256cb97352287bf5452064772dc4850b0d4f032033864ef753
 AUX c-icap.init.3 806 SHA256 69ca964732709ec0b95c66bf3c9da030c39da0f42af509d649b0e56f0170938b SHA512 87f3a71362c5d0615d8cff08bca2e9f4042990c96697d672d4c320de2ba7f584525f4041cc39e065632c56ecd381a29505a4e0bb29f01d755615332ddc37de3b WHIRLPOOL d330b229f05b9ec65eebd6454f32c539d7aa34a176812ba0672fac83ea785fe42c924a0adee4c5ea6ac38a7eac640d9c8e9d6c766850fb7314088293f9a15829
 AUX c-icap.logrotate 188 SHA256 a1ebd01837312c1fbb5b110486656656001c9b70ab0008f5ee73de6222005b54 SHA512 edc8dbbbaa06cf062b307e37ffee1dee9d566cc4b8a6947422125a22d956bcc639c483712ff6b6f6e9eb30852b4b0d5c293f1279463af89e8fc199828792a9e7 WHIRLPOOL f20fa59b07edd5c1b1a86d6d5e59523ba17b011d019af9b521f03f10a9f821c5d31230161abeabbd77a020ca59425e91e48588e85a469a9452ed8ff296390d3d
-DIST c_icap-0.2.2.tar.gz 581607 SHA256 3236fb63b7cb08df46f591d4a5b0cd6c3806fcd8a9831aa01915acc9435f6ed1 SHA512 798aa5c485e12c623706b73486aee69776d60258e0c6e3fd2c5c08c5ec8eee92115e5883a5a761ce4aaafeab77aff8a94c62117504debbb63b67276837e07fcb WHIRLPOOL f4fe754555a1c0b708bce9a1084fb1ca9677724bbc19d99365c770dd9654057928ff75f0271cef81323689762f5cbf3932c9dad8856e9552654d752f95961e03
-DIST c_icap-0.2.5.tar.gz 582223 SHA256 125f002f6e2bc70c1d07b2b44ae0d17ee83b9760f4cbe3527865deecdaf877b8 SHA512 5e514e61b4373c00d51999326e50c9350a3b9732b27c70ae94d8b219ed683b4a5c631cfbf30488409647b7151be678cc1c991578345b7c7d87898dbe7b3a84c6 WHIRLPOOL b252de7ef6118da23364cb9eadaaee8c7eb15f84b0e9c5d2c38ed7748758eb11d163778f9814536545076af56fea253ff65e32b93d157438952670420199786b
 DIST c_icap-0.2.6.tar.gz 581856 SHA256 e5caf8d53975fbffdd50f99ebf7bf88067c842609ab69e08b4337961ac46482a SHA512 3b1fe1f89581ec4649f74771f4a33a08637428f6cf81a9228f5d08405207c3495e6dadd590254dd6804ccbb7c34af1fc62973563c6156c4249941a599a072a40 WHIRLPOOL 8dd8a999e8863f3873629b0e0dc72e7a4109d37531bf2752d587b4c4df128dba6280b0d9226e3e4edffc615cca6cb6795cc62c9fe2b75ba7adbbcc2f108935ea
-EBUILD c-icap-0.2.2.ebuild 3094 SHA256 c21fe9b47948a9f8e6bb1e668c350d39d9fa2a71139935ef1b637826f1b551a5 SHA512 ca12f5a8bc47979267fd6e057bd4e29bc5e5117dc66a7f34712203346e34f7825b98922e6f858ba9a3fc7583dbd8f4f0e104cbf43adb01fdd9b164d18c6168bd WHIRLPOOL 29f29f6b8128e9fc6044feb9317f5515d809805f0a215410acd2f08b5ab5d792e080cdec3be73aefd2e8dbc51fb56573e3394ad26138a1a2c0c5d79c2b726869
-EBUILD c-icap-0.2.5.ebuild 2903 SHA256 8bd887c18b0605268c920a47265441b55fedad30eda117d269527ee48637880f SHA512 893d16fdd58f3479693108000c915509d66af69b64a3099a1deeb761b72aaa3d24a4cc9fa7fea48a24858b64731558b50a8a2b60f5474d24042d4c9868a399d0 WHIRLPOOL 847e761787a61a7c80ba6c3f4106fd8dfcfdf6774112ab3638040651a9b2efeb3203a56ece9937e04420830c8070e99cce1250c43ac0b68fe8f7baa8ba076874
 EBUILD c-icap-0.2.6.ebuild 2962 SHA256 0da33b945ba9f1f17f5c66aa9642f7ef110e6647d741a3e2d3b29e099df863b1 SHA512 a5ed8da26bf6eafc70410de3c2a1ad736617169749d04a0f9525bb8ddfe4970c4fb5e955e2e9e32b9aa8ca26d90aa176fd7a649e9f7d3dd11531c0259dcdb034 WHIRLPOOL 055b5d516a81ed38edf08ceaf36156e4731d91702057c1e8a62e2b9c9a607fbca591b41c4eeed075ad781f41a2b18ff6161d86438d3ba7d02063edfded2aaae8
-MISC ChangeLog 4790 SHA256 33644c9fca6c4af8046fb275d93250f8a3ed94aa4e8644b6832e0cd3fb93bab3 SHA512 ee0bad6f0647064ec957a3a90f61867de43cb2c6a785b43eb9ff98fc41ff91de9d0ebdcdbac60023dfe162199ba0c4ab5c473a605448897ebd0b404d23a03aac WHIRLPOOL cca1a6d6bd0edb4c4f96f0989864512e8115a37a15024a198f4e33b46feb464629c46a4ba175b44858eab0f494765b5f0af8d6ab6525b466269b9bdf98effcc5
+MISC ChangeLog 4937 SHA256 801ba2adc66a9f40e4fdc4749c12548e43b5e7bef58d3f434d7b9987201be817 SHA512 1d2019be836d2f74dafd29a8a88178e3068e11911ab74af0586b6d77eb36797454c38747b898b57f97c2bc3a965607b082856797337a25778b00143b448b6778 WHIRLPOOL 9ea2e7b617c9e0cc46fa3369b689754afd5e6c4825f56812034fefb9f18c69ab9b59204c5a9d0c3677990af541c331541b395d688cdb4f011bbe6c5efdea580a
 MISC metadata.xml 314 SHA256 62f7e0195ddb28bcab113616feba8f590429a33552ec9bf96f5e3ad5c5f4e542 SHA512 2bc33979e81c3b5e27aac5fa048357ab3c3b52bda6892fd7423ddbaeeebc76a06e972b6c6b21b9f76164e25f28879dff3552132d06cad52ff75f71df36938348 WHIRLPOOL 168fc9f4e5140f1b07bc437e7f92cc8ce6c47e8ec9739824c7c1340f2bfe1036b27c39de4a604f4c415cfe6473115cfb45a98920b2349503c0eeebd18b80d3f3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCgAGBQJSWnazAAoJELp701BxlEWfA+MQAIiFCo23m9GdrORL5y3tApNr
-S19KMq0oft0pZ2YiOk4YypQENSrt5cACGYlBzFxQBU4ckIpWM6f+28z1CLLrEOfb
-LYbrWrpNxj31oA7/RUG5AlxnGcUPPQmPgpo19He5zGBCggE5XbDPkmF6GeqB80u8
-TmWLuqWOxihR+6U/QELcU6qNMXHhz379lgy16V4trOqia+Bwteam1hphi+aqmXjT
-bsVxZB64PveeSiJORJNf+jlEK+IwmT+jxeTegtaABAWnraPikPCXNmIRAzIuGutp
-RUeAi/rYyJ9zFxchYxL5gAG1JKOw3uJTnl9//ID3TC2SVZ32ZANcbG4p7IAFkJV/
-O3nIH5LuoBFnPrSlpzRoJpDYBYXnm6z4jyrKTzCDT31OOiuShymt6yoEWn/58suN
-qaltMCBCDJ0P572sc6TIUaZsUY41NIVSx5/Px6yAcr4jxegp3auBkSQjYfYL5+vf
-6azteIBt/78XZdr3ChefsWX8qlhjVIblzkkUEb3SFc2ySxG/N9JML4xH7ftRjvYM
-/nV7AScjxl7w/lR6moa+qx6snDvpcaRjkcSEn0m045/OIqLHznSrRanzc3PLBOmH
-orFyhYpZAY/kL4QiV9MLlL4E1OV087iileY3B/INNtzoAC9jrogkaiv+j1MvzSQZ
-YgM2c11YpZt5OiKimbml
-=Ah5A
------END PGP SIGNATURE-----
diff --git a/net-proxy/c-icap/c-icap-0.2.2.ebuild b/net-proxy/c-icap/c-icap-0.2.2.ebuild
deleted file mode 100644
index a8e06b7f9ed2..000000000000
--- a/net-proxy/c-icap/c-icap-0.2.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/c-icap-0.2.2.ebuild,v 1.4 2012/12/04 11:24:10 ago Exp $
-
-EAPI=4
-
-inherit eutils multilib flag-o-matic autotools
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="C Implementation of an ICAP server"
-HOMEPAGE="http://c-icap.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="berkdb ipv6 ldap"
-
-RDEPEND="berkdb? ( sys-libs/db )
-	ldap? ( net-nds/openldap )
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	sys-apps/openrc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.2.2-asneeded.patch"
-	epatch "${FILESDIR}/${PN}-0.1.3+db-5.0.patch"
-	epatch "${FILESDIR}/${PN}-0.1.4-crosscompile.patch"
-	epatch "${FILESDIR}/${PN}-0.1.6-implicit.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# some void *** pointers get casted around and can be troublesome to
-	# fix properly.
-	append-flags -fno-strict-aliasing
-
-	econf \
-		--sysconfdir=/etc/${PN} \
-		--disable-dependency-tracking \
-		--disable-maintainer-mode \
-		--disable-static \
-		--enable-large-files \
-		$(use_enable ipv6) \
-		$(use_with berkdb bdb) \
-		$(use_with ldap)
-}
-
-src_compile() {
-	emake LOGDIR="/var/log"
-}
-
-src_install() {
-	emake \
-		LOGDIR="/var/log" \
-		DESTDIR="${D}" install
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Move the daemon out of the way
-	dodir /usr/libexec
-	mv "${D}"/usr/bin/c-icap "${D}"/usr/libexec || die
-
-	# Remove the default configuration files since we have etc-update to
-	# take care of it for us.
-	rm "${D}"/etc/${PN}/c-icap.*.default || die
-
-	# Fix the configuration file; for some reason it's a bit messy
-	# around.
-	sed -i \
-		-e 's:/usr/var/:/var/:g' \
-		-e 's:/var/log/:/var/log/c-icap/:g' \
-		-e 's:/usr/etc/:/etc/c-icap/:g' \
-		-e 's:/usr/local/c-icap/etc/:/etc/c-icap/:g' \
-		-e 's:/usr/lib/:/usr/'$(get_libdir)'/:g' \
-		"${D}"/etc/${PN}/c-icap.conf \
-		|| die
-
-	dodoc AUTHORS README TODO ChangeLog
-
-	newinitd "${FILESDIR}/${PN}.init.2" ${PN}
-	keepdir /var/log/c-icap
-
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
-	# avoid triggering portage's symlink protection; this is handled by
-	# the init script anyway.
-	rm -rf "${D}"/var/run
-}
-
-pkg_postinst() {
-	elog "To enable Squid to call the ICAP modules from a local server you should set"
-	elog "the following in your squid.conf:"
-	elog ""
-	elog "    icap_enable on"
-	elog ""
-	elog "    # not strictly needed, but some modules might make use of these"
-	elog "    icap_send_client_ip on"
-	elog "    icap_send_client_username on"
-	elog ""
-	elog "    icap_service service_req reqmod_precache bypass=1 icap://localhost:1344/service"
-	elog "    adaptation_access service_req allow all"
-	elog ""
-	elog "    icap_service service_resp respmod_precache bypass=0 icap://localhost:1344/service"
-	elog "    adaptation_access service_resp allow all"
-	elog ""
-	elog "You obviously will have to replace \"service\" with the actual ICAP service to"
-	elog "use."
-}
diff --git a/net-proxy/c-icap/c-icap-0.2.5.ebuild b/net-proxy/c-icap/c-icap-0.2.5.ebuild
deleted file mode 100644
index 78990f968d5c..000000000000
--- a/net-proxy/c-icap/c-icap-0.2.5.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/c-icap-0.2.5.ebuild,v 1.1 2013/01/04 13:53:38 flameeyes Exp $
-
-EAPI=5
-
-inherit eutils multilib flag-o-matic
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="C Implementation of an ICAP server"
-HOMEPAGE="http://c-icap.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="berkdb ipv6 ldap"
-
-RDEPEND="berkdb? ( sys-libs/db )
-	ldap? ( net-nds/openldap )
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	sys-apps/openrc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# some void *** pointers get casted around and can be troublesome to
-	# fix properly.
-	append-flags -fno-strict-aliasing
-
-	econf \
-		--sysconfdir=/etc/${PN} \
-		--disable-dependency-tracking \
-		--disable-maintainer-mode \
-		--disable-static \
-		--enable-large-files \
-		$(use_enable ipv6) \
-		$(use_with berkdb bdb) \
-		$(use_with ldap)
-}
-
-src_compile() {
-	emake LOGDIR="/var/log"
-}
-
-src_install() {
-	emake \
-		LOGDIR="/var/log" \
-		DESTDIR="${D}" install
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Move the daemon out of the way
-	dodir /usr/libexec
-	mv "${D}"/usr/bin/c-icap "${D}"/usr/libexec || die
-
-	# Remove the default configuration files since we have etc-update to
-	# take care of it for us.
-	rm "${D}"/etc/${PN}/c-icap.*.default || die
-
-	# Fix the configuration file; for some reason it's a bit messy
-	# around.
-	sed -i \
-		-e 's:/usr/var/:/var/:g' \
-		-e 's:/var/log/:/var/log/c-icap/:g' \
-		-e 's:/usr/etc/:/etc/c-icap/:g' \
-		-e 's:/usr/local/c-icap/etc/:/etc/c-icap/:g' \
-		-e 's:/usr/lib/:/usr/'$(get_libdir)'/:g' \
-		"${D}"/etc/${PN}/c-icap.conf \
-		|| die
-
-	dodoc AUTHORS README TODO ChangeLog
-
-	newinitd "${FILESDIR}/${PN}.init.3" ${PN}
-	newconfd "${FILESDIR}/${PN}.conf" ${PN}
-	keepdir /var/log/c-icap
-
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
-	# avoid triggering portage's symlink protection; this is handled by
-	# the init script anyway.
-	rm -rf "${D}"/var/run
-}
-
-pkg_postinst() {
-	elog "To enable Squid to call the ICAP modules from a local server you should set"
-	elog "the following in your squid.conf:"
-	elog ""
-	elog "    icap_enable on"
-	elog ""
-	elog "    # not strictly needed, but some modules might make use of these"
-	elog "    icap_send_client_ip on"
-	elog "    icap_send_client_username on"
-	elog ""
-	elog "    icap_service service_req reqmod_precache bypass=1 icap://localhost:1344/service"
-	elog "    adaptation_access service_req allow all"
-	elog ""
-	elog "    icap_service service_resp respmod_precache bypass=0 icap://localhost:1344/service"
-	elog "    adaptation_access service_resp allow all"
-	elog ""
-	elog "You obviously will have to replace \"service\" with the actual ICAP service to"
-	elog "use."
-}