Remove vulnerable unstable version

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

4 files changed, 19 insertions, 91 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/Manifest b/net-proxy/polipo/Manifest
index 693d5ea8fcc7..d6a07d7b1c48 100644
--- a/net-proxy/polipo/Manifest
+++ b/net-proxy/polipo/Manifest
@@ -2,7 +2,6 @@
 Hash: SHA256
 
 AUX config 167 SHA256 3b600497508790390eb5413cc53ab04bfe8b083324472732b11847acddc91bda SHA512 a92a738016ed6da4fa47d23b2cfdb5296b0c1a818eabcf319550f62e41ba45d6a9103bd7cd956a417cab3b87d18f16227fd9fbadb95dcc267c3983c61d4bdd00 WHIRLPOOL 216fa4587def4639b05a16d7a53fc96f9ef7bd3a4defd9fd4c7e0e38dd0d7265af7563ffcf710a3bc00ffb702262921aec44a38f8cc152ebecce7a6a4fd4801d
-AUX polipo-1.0.4.1-dns-timeout-fix.patch 1014 SHA256 d4b2faab078439179b6e6d836248927d45bf938a831affbaf3743c107c222a1e SHA512 fa53f2e527264b1ffb629dbbddd042896823777500eca4796db8a62d16d3a1d49fde20c2220934ca2d18968a90a576b7b037c355f8cdcf85ec345a2df023d6c1 WHIRLPOOL ee4be33129840834098e62bde44176533838ec20528a1a4132db83f5cb5ae945826aba2840c15fa4946408e10808ee84a301d144871b58a300a8782042d99773
 AUX polipo.crond 234 SHA256 cab7448361658d34593822893688df11d6f02f8b2927dbbbbe84642b335575d0 SHA512 8981382b65b0bc0cc20258a171066ee9535b4aaa0dad6d1e2b44d42a1ca94b90e78e7d6f0319cc9b07c51b88ca293d9968a7fdfd4e00061c56a612804fdc576f WHIRLPOOL 753584b2baaebfadecb3334cfab43dbbf6488e4b0af9af6b87fa890e21525498c48d6f728c4f7bc616c4c3c0410e3d7d6b066b0a48bef786764bc7e88ca6424e
 AUX polipo.crond-2 640 SHA256 b17f66c5f8eeb26c698f56458c607dbce8b630257c64c497aa8031d6010a68b3 SHA512 36c13e9790210c378968d9c6958be412fd2f1d2739aab560d8df4064fb92cb2b79dbfcb3e674f285b48eb42a3b2c6226862d1d0f9a6ce28e14de5797d62f1354 WHIRLPOOL 89227fd7a033236fd8255ed1161ba5279d660c2beb2887482bb7ca9844a2fa243752ba07e8491f7e3064490542909bbbc4dfcac19f369e8fb5828e495fa8e8ba
 AUX polipo.initd 1304 SHA256 438b8a9cfccf1ea14314f38e6821454b6da9ae20ea12bf311ad9fa89816cd702 SHA512 d77e7599eb20fe6dabf38cea0eedde255e63b45757fea01c1966c748b88e9d6e33ae51a7f50d9cf65cc32733cd58bb190d67006b089943187a5888c111f6d4de WHIRLPOOL f39743c2bbcfbfa33368d3ac4be780d21762e0696a39f088fb70c4a83ebf539c052495ab000a86ad779fa595b6607c24ed07dd0f502b85ae450c1ba6c302c7ed
@@ -10,25 +9,24 @@ AUX polipo.initd-2 1651 SHA256 625298ccb4cbc6481f0a8b852573286ed229f99f12d2558d7
 DIST polipo-1.0.4.1.tar.gz 180121 SHA256 8d6fbfdec600d42823e483b0143704c6f179c349803028a4d2cef056b79f7cfa SHA512 15c555e7751cce38b783ea28d303adb95b49577bcc39ceaa310839021af9282a1c50fa442c8dbd98bab8f685cd705383cc8e4df94aa268a4cb8e45c4a8c7c067 WHIRLPOOL 47111cf5dabf2e91b02f6127701c19f082f89c7802a77d149ea1aada7223d801c7dc0b4d3b66612e8f522279bf22351c70391261b18c29e8189e8e8420aff905
 DIST polipo-1.1.1.tar.gz 182891 SHA256 a259750793ab79c491d05fcee5a917faf7d9030fb5d15e05b3704e9c9e4ee015 SHA512 7324ca96c19bf9f089146a12dba349ea8cd2669ee02d0599ed6c6116d11eb0e7cef7830d91d16921ba5cdd0ce06e6f831901832326d8118ebe0a565feeec7fb1 WHIRLPOOL 2904a68cc64500dc6207713e255e49eb6d9fb3d73c0ff80c19b71cf1ae6ceee533b625643c7a177924f4d254deae659cdc4137218ae152582da65d0b933f65e3
 EBUILD polipo-1.0.4.1-r1.ebuild 1312 SHA256 51006269a40b5f7ae70ee1a430efb344199a46cd321db09a51a8d19e1e4fbd01 SHA512 6dde6d52ab9190b1ce21dd11a7bced40ff2983f73799d1afbd2b520fcf33ae6e2a9aa941ccc02d5ca921d0f048ec39d12108d265426e3a8c80f844d3e648c3c3 WHIRLPOOL 8046b4d64ae11225893cef3381295a006be41fdee7671b1289b7c0587143b411e1d82cfd3fb4121e896bf73d4ee840de1610ba74547a6ab2c7438cf0b28fa9a2
-EBUILD polipo-1.0.4.1-r2.ebuild 1312 SHA256 016ba97257031f1e321dec9c5ac8e0efdc88c29c75e830e6affa2652d4bf541b SHA512 23f41a178310ec0eda5cfbed4828ec11b26b75f64a362817a86eeab3690e265ed33113e73c0e3a06445ccf2d349e8ed01ccb19bbcf427fb4ead856b6bf585ba6 WHIRLPOOL 6f4a3c77354f7befce2feb0020e207cb97faa45315e4e5b0b6a0813d9de711b2c661e927f37b3b4e615c98d2ce96cb387ea0dd7be6d98d30b9d004385099a1fc
 EBUILD polipo-1.1.1.ebuild 1492 SHA256 dd7fe69801e2fc55dc9d172e12fb19a8a7f97ca2ec1f0135d44e2c67b915ff91 SHA512 f09df1fb49f8025e66c2128c971da47076493fb3a06357593f1dfa923f5a35b77f7a37a1c2df5e0d16991e0c42ee75960b9e888f227a8e343322698a0efb90e5 WHIRLPOOL c670f35184efc6ed86e75c01fc348d65c71cb4df7722fa7ef2bf224c70f6cae46d26ea27f92723879ffabb74687167acb4d9b32282d5017edd7a5cd5a2150c79
 EBUILD polipo-9999.ebuild 1491 SHA256 ef1196e461940b105a36283abb591bbdbca50a3bf8daf91ee23ab2007ab85d4c SHA512 8ae012e005bb9389a065d6589e37729b785f00f605e61c552ef89cb1ce2605d72b61efc90f06a1acdc1718eabae8760f3872be9cced95af04835ce7c909927d9 WHIRLPOOL 7fa7abcbd783ec9900a1d118437b2c16f4dc7bd7e95e02c8d86918c192a7216f1b7f0a04b72dc82a62ea9366c2c1bd255ac82135016c393ab822ec0aee0a082a
-MISC ChangeLog 7469 SHA256 ed86ba8d7e72306719d60fa91a55bb5b4468db74abe2e5eee41a1d9578947b42 SHA512 928f3d89806de671322f427b0d5ed62e836a00cacaa7f2e706c9541a74762d067a4db6e8a1dab63ff23c9f76eac1530f524b04cc711417397d54d01bcdf21a70 WHIRLPOOL 1ca557aba07fb39c779b254642ce98547c3111a7d7977fce2d7b88ad96b463b564533227db0c9ac1b522f54a97c9dab8f98b52cd427be03b4746c4e2e8c37d6b
+MISC ChangeLog 7653 SHA256 2456b34674ad96c392446529031d1e47c8d973759711d6a07a337f72ff2b004b SHA512 f50bf339fd5dca4fe26c5687e253b46e6b43b6b542e8639e6c927444db70861129e775b824b8d1dfd12554256855f184ae2301d3663746f259f2e3f0e41be55b WHIRLPOOL 94a8c705fe50ccb13edd02821a15fd5e1d3bdf36e4b80ee6fe0e2c7f44161ac395aee91c77bcdf7c9f40a4bec1e5c3ff50181fb42ca73e3eae132aebb9817d82
 MISC metadata.xml 336 SHA256 3af44f3e92b59a2e1db07127cb5e9d3dd5ec3dd29a2516961d7f76c431f0c353 SHA512 cdb114c52d849db414b8a67c628fd78283711ea5f0194f81e82085e598b3e40b05362118cf3968e39a6ec0623f9c47c333194b134c9ce84daf4b50e7150017ae WHIRLPOOL 93cf2b3d9af9c97379ef0ca5883d13e5eb5c07cbc6efdbf109bef6fd60bd525c8bb763ca69f6268bea4dd79b22663bc8bb9a3ee600fd81c22a87c3e53c565517
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUrx0tAAoJEFZZU7lTcnVsUbEP/1TFqB8bu3RBDgGtXUbHq85X
-sPo7hx3/+6+ck5A2yxJlBBiGdKPdNKzgMsPu8K8iM+UqqSBXEAn4VEw25T5rWpsJ
-14KbUtYfqEWjIac5tLC4GJXQLh4ebIZKsG+PovW8DWh5qOrroRd+g/15VyKFBwlQ
-vCODmR2VtDFjy9iH8xNLRx5F9EHphHdJJkDwgskOVPXdT/GPla3FLVIMWr118Bse
-iEJxkKk6eedjje/pgj9mYkfG6+Yt5mGhuJiLCrKfLXNks1e8cnIROL7jxDh+hZa5
-zHz13mTctlfanSi9GM2wZfxPRcIVWlJYTwMztpDiChHA81c50QM10joH6mh7tAVV
-UVx8ZfSDBe5ZWLxn6l/OJsuvne9VgvFQ/+CPCheCWdUgIiT0pd7ebnnxpi6CwMAB
-xeKVivzwtCHIk5JSZiRsj/t3E4G/zsUcNOn/7D7yvsMcOtpbPqQVJoZyWdfgp09r
-4hFVFj9a1q++8I0JCnFuIlkaR9IORCS0dh1GO0HvmL1t0ibBBIYcDM/WGTuFS0dc
-IIYW2JUM6B8t3ay4PupRtV44C9uac5sHkjUoyXkVs+5qHH3I7tEDDyBFrXkeVtQK
-crZawltpODypZcyR40fj7U4BQMh0CsPYmt7nqw5lfA7cN9V2/h1ImlhnBsWhYHh9
-AREmlRU+MfeZTAFzbqv5
-=HL+R
+iQIcBAEBCAAGBQJUrx9cAAoJEFZZU7lTcnVsdJ4P/RfrRtNsaVwu+JdYH7Ld0foF
+3yonKo8azik7Pv9Vx9Yg00SMgDhnAVSqZhdfEIC1B5a4lj+oiU+FCiGLHVnBXmtj
+ZoR+YhdL2gI24FPQnl8ezhopWktL3LiDwQ5KMjdPdl1sVfubQuhMFMCnNx5XBh6X
+iBVoSnh8OfUsHM+pvBlZDdPYkX23gQ+UJ+n1FdNC/51MwixLgGzuvaz3O4yG/Jhb
+rBMsPZJBiWllc/HQarrLvaUMYsLEVPu+1eMddpJ+yeJhzyLakCbwl9EdelX4P9MW
+TzdZZI38Crlvk/BKpCP8oWOnrE5RJkUt/ce1oQ6LFy8yL5dX2n2J+ePCA2A7zdFk
+BKpl3I1Vs6GKWmk2XU+UYZXdFDwStdAVRqZp/tUqbpd8oWlDo0ifu/aHK/A7/bz7
+8AdeJkUnO0nhQJ2/iQ8wSRK7/Bxkw+mWqnuaLI2mJTl2SW5YZiN4jTBxYwgHS2we
+RR2wr/giv7F9PkrdalZ+E6Y79mFy26/aH+c9O9RHR+GT1fXAycQTQDBBbWPJTqc6
+qxquxPD01/ef7OIV6glGwlGY/xaSismhV0Jj1pgLLOqpQAe+WdbDQxpvi6HJJY73
+mGPOB4BZ1hnWcxmXyVUw3xOPKnBHFwgdGTV5JmCwvpt9D/LsEzSbfQxzeGMlqzYm
+5PFGA2MFllWgj71rx13d
+=7tkh
 -----END PGP SIGNATURE-----
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."
-}