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

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
(Portage version: 2.2.17/cvs/Linux i686, signed Manifest commit with key 565953B95372756C)

4 files changed, 5 insertions, 163 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/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
-}