Remove vulnerable unstable version

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

3 files changed, 5 insertions, 75 deletions

diff --git a/net-proxy/polipo/ChangeLog b/net-proxy/polipo/ChangeLog
index 381bd8029077..66d24329ec56 100644
--- a/net-proxy/polipo/ChangeLog
+++ b/net-proxy/polipo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/polipo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.42 2015/01/09 00:13:32 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/polipo/ChangeLog,v 1.43 2015/01/09 00:22:51 bircoph Exp $
+
+  09 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> -polipo-1.0.4.1-r2.ebuild,
+  -files/polipo-1.0.4.1-dns-timeout-fix.patch:
+  Remove vulnerable unstable version and related patch.
 
 *polipo-1.1.1 (09 Jan 2015)
 
diff --git a/net-proxy/polipo/files/polipo-1.0.4.1-dns-timeout-fix.patch b/net-proxy/polipo/files/polipo-1.0.4.1-dns-timeout-fix.patch
deleted file mode 100644
index bf5757b36c36..000000000000
--- a/net-proxy/polipo/files/polipo-1.0.4.1-dns-timeout-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- polipo-1.0.4/dns.c.orig 2008-01-08 16:56:45.000000000 +0400
-+++ polipo-1.0.4/dns.c  2010-03-29 18:28:43.225601510 +0500
-@@ -1181,7 +1181,8 @@
-         } else
-             releaseAtom(value);
-     } else if(af == 0) {
--        if(query->inet4 || query->inet6) {
-+        if(query->inet4 && query->inet4->length ||
-+      query->inet6 && query->inet6->length) {
-             do_log(L_WARN, "Host %s has both %s and CNAME -- "
-                    "ignoring CNAME.\n", query->name->string,
-                    query->inet4 ? "A" : "AAAA");
-@@ -1207,7 +1208,8 @@
-     if(object->flags & OBJECT_INITIAL) {
-         assert(!object->headers);
-         if(cname) {
--            assert(query->inet4 == NULL && query->inet6 == NULL);
-+            assert(!(query->inet4 && query->inet4->length));
-+            assert(!(query->inet6 && query->inet6->length));
-             object->headers = cname;
-             object->expires = current_time.tv_sec + ttl;
-         } else if((!query->inet4 || query->inet4->length == 0) &&
diff --git a/net-proxy/polipo/polipo-1.0.4.1-r2.ebuild b/net-proxy/polipo/polipo-1.0.4.1-r2.ebuild
deleted file mode 100644
index 62a4479d5717..000000000000
--- a/net-proxy/polipo/polipo-1.0.4.1-r2.ebuild
+++ /dev/null
@@ -1,52 +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/polipo/polipo-1.0.4.1-r2.ebuild,v 1.1 2013/05/02 19:45:58 tomwij Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="A caching web proxy"
-HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/"
-SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${PN}/${P}.tar.gz"
-SRC_URI="http://freehaven.net/~chrisd/${PN}/${P}.tar.gz"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-apps/texinfo"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/cache/${PN} ${PN}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-dns-timeout-fix.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake PREFIX=/usr "CDEBUGFLAGS=${CFLAGS}" all
-}
-
-src_install() {
-	einstall PREFIX=/usr MANDIR=/usr/share/man INFODIR=/usr/share/info "TARGET=${D}"
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	insinto /etc/${PN} ; doins "${FILESDIR}/config"
-	exeinto /etc/cron.daily ; newexe "${FILESDIR}/${PN}.crond" ${PN}.sh
-
-	diropts -m0750 -o ${PN} -g ${PN}
-	keepdir /var/cache/${PN}
-
-	dodoc CHANGES README
-	dohtml html/*
-}
-
-pkg_postinst() {
-	einfo "Do not forget to read the manual."
-	einfo "Change the config file in /etc/${PN} to suit your needs."
-}