Remove vulnerable versions from tree, see bugs 531292, 537884.

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.17/cvs/Linux i686
Manifest-Sign-Key: 0x565953B95372756C

5 files changed, 19 insertions, 172 deletions

diff --git a/net-proxy/privoxy/ChangeLog b/net-proxy/privoxy/ChangeLog
index 61de280777ec..17da80ad0d57 100644
--- a/net-proxy/privoxy/ChangeLog
+++ b/net-proxy/privoxy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/privoxy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.115 2015/02/26 19:03:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/ChangeLog,v 1.116 2015/02/27 03:41:09 bircoph Exp $
+
+  27 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> -privoxy-3.0.21-r2.ebuild,
+  -privoxy-3.0.22.ebuild, -files/privoxy-3.0.22-force.patch:
+  Remove vulnerable versions from tree, see bugs 531292, 537884.
 
   26 Feb 2015; Markus Meier <maekke@gentoo.org> privoxy-3.0.23.ebuild:
   arm stable, bug #537884
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 2b4d89a4eaaa..326e8dcf8da7 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -2,22 +2,27 @@
 Hash: SHA256
 
 AUX privoxy-3.0.19-gentoo.patch 3661 SHA256 71c6e6b042a820c44e7110c8a60f7987c826900fd4b22073565977ce63d4860a SHA512 e0f916f33b8f17375b60686a0e4795883f29e46c55e273e0a69fae63d4b4e5a2585bb86b04aa288fdd75cdf51eedf7d72a9f8092e13a853e934e0029ae919a24 WHIRLPOOL 701a5c7ec31b7d2d68801005d81f01ec727712aab7d5d866427a78c940ef2d63201f6ba9e1679bf8e919653b355ea8a0577d4bce5c13b24812d43f2b09797553
-AUX privoxy-3.0.22-force.patch 553 SHA256 85f0a44c6510bc539e32a1eab049ce77cec7dfa079ea33f5941577a17b1d1f49 SHA512 1fa257b541d60d5033ee22fb16ab61ccf36016e5eebae4bad6c0bf581b2b353707abc160bc4922553f9152bff415d1059656e7a5ead2f4f4676cc5652959b0ce WHIRLPOOL c8b6a70cb25522a24db37192106f9ff6a34cb05933043c9e917b9033bb6e1f2e4548471ce7ade8716bfe1e64a370980b4576909ef221415b7e683e72bb9df5ce
 AUX privoxy.initd 745 SHA256 224496b498b4f692ae3316a95b5c7c8b6230dcd5fee0ca163956a7acde243de9 SHA512 5d3870a672cd58d2d88a14af1ebb9c953f951016ba9e0905d7b9bd4ad1b699bf8b77bbb8bc8f31a71a928d3cd4c7f47c6cc20e01962a5ee89981414573fc0972 WHIRLPOOL d55a1df238e24589602174592bfc67af3333f3228abdf9be0f39527d35e7c088421472851b3c54bdb4af9273e714782598c939947fdda6f7e5673fc4b53cb0aa
 AUX privoxy.logrotate 191 SHA256 a14373c8a26aab32f6f025c11a5521d7923ce900d00b31aa61da9f3979e3bb2e SHA512 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9 WHIRLPOOL 4f7f576eb52a02daf38ccec68c49ee5ae0d449cbefdc11ecd1a9790eeee99f800576e05467f80a915423aa077ed3769e85a7c03a92679f31d6b3fe4a3aa3a792
 AUX privoxy.service 248 SHA256 35fee00be175e22dffafcd4a61de3a117268d64d506e99b9b3518702c3a20f35 SHA512 0f3484f06521a66b984fda7238f175a135b22fa5a00dc0c8caadd380d21bfecdae7a6c8d2c0d9a4a3c2858539913722be2b7d4fddd17ea2c95f4e151c3f74ca0 WHIRLPOOL 681c7fe28220ddc4194e6e83974878530b4a3aefd3b1a2de66f9b950ea1eb36252b484077c31af9fbbe335d777898e551455ee5c57892f4e43e5966b23b2d05c
-DIST privoxy-3.0.21-stable-src.tar.gz 1733120 SHA256 5ec7e601948d2bd0ebf0ebe90eed7d49e7663c395ce16d0403e91ea2d459ddb8 SHA512 b7f0d6865bce32445442f3af290e1a43538e4f76c22cb0d0ff9d5a1752f8c019dabb70f023ae370ee59015bd0f6795db97f064f7621efb62265d5e196d2e0e41 WHIRLPOOL 204c860071b958f50d32010d6a7dce70e24f25116514b0999da8ad10862a7ea1889f0d4ff87e34bc8b08ce89c5f3bdf5c87b89c48c5f4c534e0c46be7f557593
-DIST privoxy-3.0.22-stable-src.tar.gz 1737251 SHA256 1a214fec1f3616ea7ff42f1ecdb67ce82690199ec403de9d34b99d0896efcc41 SHA512 40e893ac25d69575c3a2c28bcc5882d91093f8eb6194a54d5b5298ad4023563e586c9aa2a793bbafe2fe3aeef7aa9094aa01e72861a51f0e569d1e5c74f974b2 WHIRLPOOL 229123d2c8acdf258f5baeb36300cec32c730580f11bc2c0bbf7e4c17bfeee800938b2680f0bd1f7ee0346ac55500f4a34945e3a68a1f9791c96a5768aac5a69
 DIST privoxy-3.0.23-stable-src.tar.gz 1715099 SHA256 80b1a172d0518a9f95cde83d18dc62b9c7f117b9ada77bdcd3d310107f28f964 SHA512 487513f4f6f8c868b537132599d0f573384a0b7ed2b3c6778b163d61f94a419e1594d4e0bff286051902bfca292d68c5eeef215955f072c1744bef50db279c25 WHIRLPOOL 68f3ce6dd86a95bb515af2dfe4f166263800f8ff71fb266cb7d8630888f30c93194634b74c5d491a5687afc5842428bd23811ef71ee9358f1cd7ec5ad1ce11a4
-EBUILD privoxy-3.0.21-r2.ebuild 1686 SHA256 53334648d625b6e72b5f954ef9410c45262f5799b2185b111557abeebcc14b09 SHA512 cf4ca8849dc3d877fafd252c57f57e328873ca430beb6c5884f2b34aee0537f18f5bb338348b6ab9b8ff94db3f2f5c2c538e044060a72245f0530d04005668cf WHIRLPOOL 3ad0402ea70f45ee56760e4132051436542a8f43aeccce71ca5bdd6b96a152fe99685681770e49328e213cfe86b1a55d51d6d850bf3abe167c076d70e62cb802
-EBUILD privoxy-3.0.22.ebuild 2293 SHA256 ff316730de94e972144c5e03fd1c1ee1b7665bdec46b4c45a7d9fbeef550c4f1 SHA512 d98d339e833b959147cd9ac3062079a0d2af3dc123e03086fa1723c42109eb4ba3b090e15242f3c991fa5a03e28552c61b1c9ec97c97ed4c504a00683f2f970d WHIRLPOOL b3e860f2702a2fff74afb8e0b668c5f18fda119acba854a7eb70a93f3f30c003bfc9315e2f9e6d5eaf0823746f9a494233cba973263fa29382dc61f15241cffd
 EBUILD privoxy-3.0.23.ebuild 2246 SHA256 b8e230e7926227ecb1ce4211e7e6612341cc31326e2f61c36ca3d81102f0fd1a SHA512 1b65f5a938b4a03dae78cddd1a5c732bf58773b0d7b7d8bc905c3aea1405f8c0d74488fd52360385a29075f5b3be5fbbb817022f68c67157077a6d85879192ab WHIRLPOOL 474e61d0b4b017e66502f90bdf10e2544afa121de1b409cbd155db53d6a2faabb0c97986685809c22550191584059922f3360dbc43fe63145b6330ae2ac6c1d4
-MISC ChangeLog 20899 SHA256 b4dfce8ec24c6ee5cd058bed58cbce0eeda0c20aca07a7b8d4013181707d32aa SHA512 e6ebb121b44a5caeabcdd8556c62e58498dde02f0da194cc1ef8e47c15206782612c39a5666d996bec968cfb2ff66c2b73b06f776684f41d71af0bdb46150209 WHIRLPOOL 7460bb2e32dad48d2fae4d36c6b28919f8dcc860329d02cdc6b11a90dab3e1ad329b65bc379620d55525452bd4d4333fdb43628cd6cf98239c48c9255163923d
+MISC ChangeLog 21107 SHA256 cd60634a324380d099f5b0f427c10037faf31f4876d51c75b6ff147411f62b24 SHA512 66d2e29ca2f9e9a80b5f56f8af4662bc318fe70de5c3e6b4202c73656be50572302b2e7d09f848a0670e30f706b01c50075a919926265797cc757a41f9355577 WHIRLPOOL 965a2c63d6f228c29985cf30c0547400fb03bebf2254438fb027bef999776520b7211b0b20b32a613709fc7b9fdd754b9a9917f101e66f3da250ef66e6b8e969
 MISC metadata.xml 1056 SHA256 22f63a2ff4c284f142c7583912701733d538d03214c69d86b2fe3d03daf4dfa3 SHA512 eaf871e571e70ed96d80b8bbd6897d9eb11c096d589a92b5eebf3b1873289817c56051f39725729c3bbc7ec962aa201125191f046bedb750662adf69c9754330 WHIRLPOOL 264ad98af64124e21a65c9b585339dd76e31c154e8a82b9154e9bf8c97f826db6e9d15235e0ec6f49074bf93ce0fdc8be33019e4a9672d92d3155c3d7639adc1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTvbegACgkQkKaRLQcq0GLOdQCfQFfnpx1Jo5ac1962OFtMxSgL
-s1sAnRqeIqodYKT0grKdJXx8l8nZvawN
-=MQqm
+iQIcBAEBCAAGBQJU7+dWAAoJEPZTWjO6HuSNCIoP/2K2cy/BSnoeJM05BQXfwgGp
+OCgE615teruXAnbDzo3JqTGKJ27Nt+KsF1nYnA/Yym1V5yV2BhY+xfv2FBX5VjYS
+m64ydIK08tEd6ybBfud9K1TgqRtOY6N7YDI6YVVDH7BRRJdIl/t62bWkKM7+LxYi
+Pb3+db6R7zv+91ZSO9fgxOrXo7JymnRmFVTfGJr3dsnf31sc99MOK46tpADPL431
+vZbDgRNPPnnHQYKCHt3aqtyK/7z5WLQRhO57zAOgsJAwemunw4Hs569uj7HwteOY
+q/hbuv0ZRsg231p6fS1xJ/39fZN4zI/Vq/GHC1UsgVMZFRkepjFC3B4dsWSlwyB8
+Y7IFZ6AUSu11BgaT93U30I/0tH4L0I1aY3fnWJefBDGKLDd/7wTMswt3JYGUI9FW
+nZy9TJ2L6wXILFwkk1R6U9c7Nox0DiQqMHxYNjUMyMJb7FvjCUSbu4rX0zWNTR6O
+IIDpsfiJibMIcnC3Ms+ekERDMOM7JKpdjh2ZqL2gGgAeiS766YGmLuKkmbYKkAv3
+/2FcUlDYpOKYDptg6uaEXxCYr9fnK+DUDFSFkPZXsbg63e9/C8hol22nVbj4bu+C
+0TauUdge3THBM/bQDlnHDmMYk+bo0dOStWX5pOa0egZmelj1ILraD0MPXTBC3yDb
+SML2I/cwLm1n3y0HQiFo
+=z1PM
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/privoxy/files/privoxy-3.0.22-force.patch b/net-proxy/privoxy/files/privoxy-3.0.22-force.patch
deleted file mode 100644
index 8d3ac1242d05..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.22-force.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- project.h	2014/11/12 12:00:41	1.208
-+++ project.h	2014/11/16 18:43:48	1.209
-@@ -1365,10 +1365,9 @@
- /** Calculates the number of elements in an array, using sizeof. */
- #define SZ(X)  (sizeof(X) / sizeof(*X))
- 
--#ifdef FEATURE_FORCE_LOAD
--/** The force load URL prefix. */
-+/** The force load URL prefix. Not behind an ifdef because
-+  * it's always used for the show-status page. */
- #define FORCE_PREFIX "/PRIVOXY-FORCE"
--#endif /* def FEATURE_FORCE_LOAD */
- 
- #ifdef FEATURE_NO_GIFS
- /** The MIME type for images ("image/png" or "image/gif"). */
diff --git a/net-proxy/privoxy/privoxy-3.0.21-r2.ebuild b/net-proxy/privoxy/privoxy-3.0.21-r2.ebuild
deleted file mode 100644
index 834c56e089de..000000000000
--- a/net-proxy/privoxy/privoxy-3.0.21-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.21-r2.ebuild,v 1.10 2015/01/08 09:41:45 pacho Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs autotools systemd user
-
-[ "${PV##*_}" = "beta" ] &&
-	PRIVOXY_STATUS="beta" ||
-	PRIVOXY_STATUS="stable"
-
-HOMEPAGE="http://www.privoxy.org http://sourceforge.net/projects/ijbswa/"
-DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk"
-SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
-
-IUSE="selinux threads zlib"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
-LICENSE="GPL-2"
-
-DEPEND="dev-libs/libpcre
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-privoxy )"
-
-S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
-
-pkg_setup() {
-	enewgroup privoxy
-	enewuser privoxy -1 -1 /etc/privoxy privoxy
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.19-gentoo.patch
-	# autoreconf needs to be called even if we don't modify any autotools source files
-	# See main makefile
-	eautoreconf
-}
-
-src_configure() {
-
-	econf \
-		$(use_enable zlib) \
-		$(use_enable threads pthread) \
-		$(usex zlib --enable-compression "") \
-		--enable-dynamic-pcre \
-		--with-user=privoxy \
-		--with-group=privoxy \
-		--sysconfdir=/etc/privoxy \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install () {
-	default
-
-	newinitd "${FILESDIR}/privoxy.initd" privoxy
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/privoxy.logrotate" privoxy
-
-	diropts -m 0750 -g privoxy -o privoxy
-	keepdir /var/log/privoxy
-}
diff --git a/net-proxy/privoxy/privoxy-3.0.22.ebuild b/net-proxy/privoxy/privoxy-3.0.22.ebuild
deleted file mode 100644
index 975818168ea3..000000000000
--- a/net-proxy/privoxy/privoxy-3.0.22.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/privoxy/privoxy-3.0.22.ebuild,v 1.9 2015/02/26 18:46:17 maekke Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs autotools systemd user
-
-[ "${PV##*_}" = "beta" ] &&
-	PRIVOXY_STATUS="beta" ||
-	PRIVOXY_STATUS="stable"
-
-HOMEPAGE="http://www.privoxy.org http://sourceforge.net/projects/ijbswa/"
-DESCRIPTION="A web proxy with advanced filtering capabilities for protecting privacy against Internet junk"
-SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
-
-IUSE="+acl editor external-filters +fast-redirects +force graceful-termination
-+image-blocking ipv6 lfs png-images selinux +stats +threads toggle
-whitelists +zlib"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
-LICENSE="GPL-2"
-
-DEPEND="dev-libs/libpcre
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-privoxy )"
-
-REQUIRED_USE="toggle? ( editor )"
-
-S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
-
-pkg_setup() {
-	enewgroup privoxy
-	enewuser privoxy -1 -1 /etc/privoxy privoxy
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.19-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-3.0.22-force.patch
-	# autoreconf needs to be called even if we don't modify any autotools source files
-	# See main makefile
-	eautoreconf
-}
-
-src_configure() {
-
-	econf \
-		$(use_enable acl acl-support) \
-		$(use_enable editor) \
-		$(use_enable fast-redirects) \
-		$(use_enable force) \
-		$(use_enable graceful-termination) \
-		$(use_enable image-blocking) \
-		$(use_enable ipv6 ipv6-support) \
-		$(use_enable lfs large-file-support) \
-		$(use_enable png-images no-gifs) \
-		$(use_enable stats) \
-		$(use_enable threads pthread) \
-		$(use_enable toggle) \
-		$(use_enable whitelists trust-files) \
-		$(use_enable zlib) \
-		$(usex zlib --enable-compression "") \
-		--enable-dynamic-pcre \
-		--with-user=privoxy \
-		--with-group=privoxy \
-		--sysconfdir=/etc/privoxy \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install () {
-	default
-
-	newinitd "${FILESDIR}/privoxy.initd" privoxy
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/privoxy.logrotate" privoxy
-
-	diropts -m 0750 -g privoxy -o privoxy
-	keepdir /var/log/privoxy
-}