Drop vulnerable version, bug #536012

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

3 files changed, 5 insertions, 170 deletions

diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 8944e783c6b7..8c35ee28e2e3 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.178 2015/07/30 19:02:20 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.179 2015/07/30 19:10:41 jlec Exp $
+
+  30 Jul 2015; Justin Lecher <jlec@gentoo.org> -p7zip-9.20.1-r4.ebuild:
+  Drop vulnerable version, bug #536012
 
   30 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> p7zip-9.20.1-r5.ebuild:
   ia64 stable wrt bug #536012
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 0df582b988e0..d8a3d8539097 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 9.04-makefile.patch 470 SHA256 c8ef2898ed994929600c04ed0ecfd2dc2b94982d274ee217cbc05234c37750f6 SHA512 2c131e0b42ae6c8cd236125be313ea032b47edf858d1248a8648fd0e794ca4094016a3bb06e15fe65582626dd9d611a08a87ad5789695fff0a2244bb7f3cec3d WHIRLPOOL b2a66b46651a8036808985524b2c6311fa0d7dbceba453f1ac4bb1cc0fef9fbe060b1d4c04e20353c4232915f340cf3bd65d0f7e0ccc3eac8651d3ac15d389db
 AUX p7zip 1210 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799fbc2d5 SHA512 e3f1497cc00669430de336aac1d45a0313831b7f5dc88b9b2ca49e743d8e9e7c73b403d94b4fd9de6cd59875fef47756f9dab9ddf12442ee3fff71e413715553 WHIRLPOOL e14aef0141b8260a5206bd94d22560c927a3ce0e643433ee68d8ade0601655b8a6b7c8ad78f81a0fb97323c7c37eb3fc5483d9e49c2ac259d146b60e678cc973
 AUX p7zip-9.20.1-CVE-2015-1038.patch 9959 SHA256 99e67592a8d1d578c94a2d4731df36d00aff572e6f09a818e2334d582369fca6 SHA512 c14550d346d7f6aea32d1b076a4ed6006d7f26a1ced5eb7b7e737a7599a384c1e3395820df5b5bdcae3027f1af7aaa520137e72f0b33ac80a6552e1e498c92ff WHIRLPOOL 580b51be849b9cae0bec2d234df9a5daa0cea6e71183b82bbfa3433d7515d77b874b17386d253ec3403836d21ae6df778dc0118acc2e6465a1068d3fd9e50ee3
@@ -11,17 +8,7 @@ AUX p7zip-9.38.1-CVE-2015-1038.patch 8608 SHA256 f88a01760330f4bb70ec09a598c4c0e
 AUX p7zip-9.38.1-osversion.patch 838 SHA256 135de03123263910ed99d1afa07ee4a39e471fc257e9dcbe7a8ce0477634cc54 SHA512 28a798a2930552ee940f4f400e66e11cf7ee113c3c0fcf782404c45b95b5774c52b0518520a5f38cc9d7abe795756fce14a0c0e143c31f8da50253bcda423909 WHIRLPOOL 6c6f0e024ba590139fbb6f61ae8f3699e841ac8b00d530e6f7418ccc182aca2f5ffa81925b2bc2b1520cfbd617f0bf8f3c3f95b74222a5300b0f89b10ec19604
 DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a WHIRLPOOL cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
 DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04 WHIRLPOOL 6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24
-EBUILD p7zip-9.20.1-r4.ebuild 4260 SHA256 8de34f46051d81c9b92f6479c3e77e1f366af48eec839908056c837bb11d569d SHA512 c19950e5a629d3f3f0b9083a00330ee93ef40e7dd2e69602c544938e96eaa0242df4f02813c5ca0b0ca8d1b69d2fed308150a79a1b8bc55b4f35c2933e77310a WHIRLPOOL 184124262c40eea989041d0076ba814f87f457b8407c1294c3596b983b33b2c91d29e0adbf3af5df42ee73f94aa4a9c491ed88f0ac3b95f3e8034c9097c7faf9
 EBUILD p7zip-9.20.1-r5.ebuild 4312 SHA256 dfae051d3ee8abc92e70789bde99763945cdd67585f476d3dea2c06cf1a78e62 SHA512 2772fdd129cf5e8d3c5089f2ddb5c258b712e38d8ea905fea289e76e431f140cc5fb2df9d2729733d9d309f6a742febc97e604fac12c275a8ec0347ee7be9024 WHIRLPOOL 90ce73e9ba0dbf55c03fbe5ed1293608fc4f3f36a351fca7a1bbcb519f52d0097dbf17aba020f80f8fd99ead766d5866bf57577a5ad67ba63c31484e94f487db
 EBUILD p7zip-9.38.1-r2.ebuild 4367 SHA256 7d03bba50c492cc5b7e7532f38b0b5411447039fe6a38179cfda79bed51bda28 SHA512 e9899fca8d13b65336f7d1f295904ab5880d14f88728301beec0e99a6b95a78729c0ecd50753e7cc9be08215d793f730a3ca0f1b787cb2035b5cdf33385f5e7a WHIRLPOOL eabe49339355cc865a05fc0eafa588cb99a6f3fb2ca4070e06a50d3568ea3780c850df78ee589f951f62a3531c204be1af52ca7dbd6c83c64705d53f54347106
-MISC ChangeLog 23506 SHA256 bb3504f3f8fc47d9ea2625a3ea0bc2c2a506fe46c4fa4c709b26f9a10e279300 SHA512 5c58443f36475aaa84253f7d301f9cc608385243ac9297e569a5ca70f4f2c52dc3b229e73a36ef7e3b3fe9f023c150f17abe0212479b4a1eed73c76d4d8ec911 WHIRLPOOL 9f52c7d26fc33b833a2cc6116a98f0a11cdd863883b6ef7b0e138b4272e41f4dc383961df16d178704822a53aba91d2d8a67598e1520720b2830a6451c93a1c0
+MISC ChangeLog 23615 SHA256 a54b898b9a62097200726e77e374600fa9b7f8cffadf132d110ca00449d42849 SHA512 e8e2f0cf43f704fa13a88f3febe3647d0521e1055627ba97d717155499e65dc79481752232a484e6264a8001f4bb0e638754b724d3e425e73dde2fb2e1aa92cf WHIRLPOOL f737bd27b70913de90ecbb477ab1aa21e4cba6c4a62cbd47c15b4e727fecd3d15c14de536850f2cd06059d647bd0471f4fc567a5c022fc96dadeaa4fd56fde51
 MISC metadata.xml 411 SHA256 d4848799ff75dcb348928517060b9a97f5f9b557225d84bddd11612faf490c1d SHA512 88c14e42985fc90bb93a9253cad3179217046d9a99b5b4489ca1fcfa8a977a9859628cfc45c9dbd1c3c358261af7544039da001f66fa87c6e284a548572a8afb WHIRLPOOL f18e7509f2585fab1159773490e690f968cf19f29e4537d30a5a964bb3a3b135945f9fd3ee20821a52326861eda8096d43929ad986b7b96a479c7c65d1b38677
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iJwEAQEIAAYFAlW6dDAACgkQG9wOWsQutdYKDwQAsOUYK8IN3mTQ7Mm9YTPUf+zj
-q7bZVQT2GZzi3XPqt1QTa2eZpq/VpKpTOFZ8q4IdNKXziDvk7ctYpDDTZ4SooEYX
-f5Gk6hSEDy80g8Lkb60c/hb8ctV3++KDy9LQxnPIqMyMcehANU74XAOgYARi/kq0
-xYfz0e7gCuQgQUw8pAk=
-=fHCp
------END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/p7zip-9.20.1-r4.ebuild b/app-arch/p7zip/p7zip-9.20.1-r4.ebuild
deleted file mode 100644
index 93f1530bfadb..000000000000
--- a/app-arch/p7zip/p7zip-9.20.1-r4.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r4.ebuild,v 1.7 2015/05/04 12:23:31 jlec Exp $
-
-EAPI=4
-
-WX_GTK_VER="2.8"
-
-inherit eutils multilib toolchain-funcs wxwidgets
-
-DESCRIPTION="Port of 7-Zip archiver for Unix"
-HOMEPAGE="http://p7zip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
-
-LICENSE="LGPL-2.1 rar? ( unRAR )"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="doc kde rar +pch static wxwidgets"
-
-REQUIRED_USE="kde? ( wxwidgets )"
-
-RDEPEND="
-	kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
-DEPEND="${RDEPEND}
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/nasm )"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-execstack.patch \
-		"${FILESDIR}"/${P}-QA.patch
-
-	if ! use pch; then
-		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
-	fi
-
-	sed \
-		-e 's:-m32 ::g' \
-		-e 's:-m64 ::g' \
-		-e 's:-O::g' \
-		-e 's:-pipe::g' \
-		-e "/^CC/s:\$(ALLFLAGS):${CFLAGS} \$(ALLFLAGS):g" \
-		-e "/^CXX/s:\$(ALLFLAGS):${CXXFLAGS} \$(ALLFLAGS):g" \
-		-i makefile* || die
-
-	# remove non-free RAR codec
-	if use rar; then
-		ewarn "Enabling nonfree RAR decompressor"
-	else
-		sed -e '/Rar/d' -i makefile* || die
-		rm -rf CPP/7zip/Compress/Rar || die
-		epatch "${FILESDIR}"/9.04-makefile.patch
-	fi
-
-	sed -i \
-		-e "/^CXX=/s:g++:$(tc-getCXX):" \
-		-e "/^CC=/s:gcc:$(tc-getCC):" \
-		-e '/ALLFLAGS/s:-s ::' \
-		makefile* || die "changing makefiles"
-
-	if use amd64; then
-		cp -f makefile.linux_amd64_asm makefile.machine || die
-	elif use x86; then
-		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
-	elif [[ ${CHOST} == *-darwin* ]] ; then
-		# Mac OS X needs this special makefile, because it has a non-GNU linker
-		[[ ${CHOST} == *64-* ]] \
-			&& cp -f makefile.macosx_64bits makefile.machine \
-			|| cp -f makefile.macosx_32bits makefile.machine
-		# bundles have extension .bundle but don't die because USE=-rar
-		# removes the Rar directory
-		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
-			CPP/Windows/DLL.cpp || die
-		sed -i -e '/^PROG=/s/\.so/.bundle/' \
-			CPP/7zip/Bundles/Format7zFree/makefile \
-			$(use rar && echo CPP/7zip/Compress/Rar/makefile) || die
-	elif use x86-fbsd; then
-		# FreeBSD needs this special makefile, because it hasn't -ldl
-		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
-	fi
-
-	if use static; then
-		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
-	fi
-
-	if use kde || use wxwidgets; then
-		einfo "Preparing dependency list"
-		emake depend
-	fi
-}
-
-src_compile() {
-	emake all3
-	if use kde || use wxwidgets; then
-		emake -- 7zG
-		emake -- 7zFM
-	fi
-}
-
-src_test() {
-	emake test test_7z test_7zr
-}
-
-src_install() {
-	# this wrappers can not be symlinks, p7zip should be called with full path
-	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
-	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
-	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
-
-	if use kde || use wxwidgets; then
-		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
-		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
-
-		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
-
-		dobin GUI/p7zipForFilemanager
-		exeinto /usr/$(get_libdir)/${PN}
-		doexe bin/7z{G,FM}
-
-		insinto /usr/$(get_libdir)/${PN}
-		doins -r GUI/{Lang,help}
-
-		insinto /usr/share/icons/hicolor/16x16/apps/
-		newins GUI/p7zip_16_ok.png p7zip.png
-
-		if use kde; then
-
-			rm GUI/kde4/p7zip_compress.desktop
-			insinto  /usr/share/kde4/services/ServiceMenus
-			doins GUI/kde4/*.desktop
-		fi
-	fi
-
-	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
-	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
-	doexe bin/*$(get_modname)
-	if use rar; then
-		exeinto /usr/$(get_libdir)/${PN}/Codecs/
-		doexe bin/Codecs/*$(get_modname)
-	fi
-
-	doman man1/7z.1 man1/7za.1 man1/7zr.1
-	dodoc ChangeLog README TODO
-
-	if use doc; then
-		dodoc DOCS/*.txt
-		dohtml -r DOCS/MANUAL/*
-	fi
-}