Remove vulnerable version c.f bug #541568

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xFED5002857C1ABFA!

3 files changed, 12 insertions, 142 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 6d17d9a8936b..e39ca969c7c3 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.601 2015/04/26 12:51:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.602 2015/05/11 19:39:45 k_f Exp $
+
+  11 May 2015; Kristian Fiskerstrand <k_f@gentoo.org> -gnupg-1.4.18.ebuild:
+  Remove vulnerable version c.f bug #541568
 
   26 Apr 2015; Anthony G. Basile <blueness@gentoo.org> gnupg-2.1.3-r3.ebuild:
   Keyword ~arm and ~mips.  Bug #546478.
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 1df09f148c2c..d1369d3056dd 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -8,33 +8,24 @@ AUX gnupg-2.1.1-misc-cve.patch 3548 SHA256 cef5fabc9b02366a33ed79e35b887fcb47e1d
 AUX gnupg-2.1.3-dirmngr-Fix-segfault-in-ldap-engine.patch 962 SHA256 d762d7ca1bf850203e24ec1d3151fb3df1b1e368b3cb80ec884cdd6b716e0273 SHA512 602cd338abb7897c6b101ec1644e137880baab2bf35ab0c4b21b439548b3ccb04f8f63c45afb4da89d88200c3402a64e67c3b3845f76e01a42c82f99e20efb30 WHIRLPOOL 3c7d1a29a8f43e2a29d871853ce0042e24df522abc26bd3342874abb8053b735fdc2ffefc3c4686fe82f45f98608914c3f899fba6545f58af8e58da6648a5483
 AUX gnupg-2.1.3-dirmngr-no-ldap.patch 7476 SHA256 d210eb26f0853547948d46e391eb5cbf02ec99fe216238d2475cf478da154f64 SHA512 64176f4158540b64a1c8ddcc1535869a62eff7eb02bd161eb93434288b4bebe123d66ef03b61745c5741ba11eb9ffdce25da80eea4aa8afa18858755a015387d WHIRLPOOL e312ed8de95e0edcbc0eebc46907a0c90b8d872074920fc2a3d80581e30bef8c569e9b70798ad64a638965b1b34803e5acb343c557f195bcd4a6cf440fdb0e88
 AUX gnupg-2.1.3-gpg-fix-null-segv.patch 2064 SHA256 ed58663492c111103a4b7b7d575e5ec3400d2372394cc5da56374e864ae7642a SHA512 a8966a2e50e8e8b2f2f14b32282a41a76f221bf4ff645b0dfbf1fc83cb35afa6d3d426686008a1cb58e51708d5f8cab13762cfba79f2bdd3415ba1b5103793aa WHIRLPOOL 7c916f55d60eb0df86918778c5d8226e56e6ba45c564bdd35c5f5cc16d9eb642f1dce25fd29c2febbfbfb1ba163c274e559dc69517cccaed686f5d8584de5c14
-DIST gnupg-1.4.18.tar.bz2 3649557 SHA256 b7b5fdda78849955e0cdbc5a085f3a08f8b7fba126c622085debb62def5d6388 SHA512 f9619ede8e0d2844774e07fb42359444c5ab8e15565a87f419f76cc3d781940c564f35f429131686fdd7559c5c2edb49506b3c0a1feecbd95438743075be3e63 WHIRLPOOL 780876be0603fd0605b192721e2bbb770ad67d98acba8ef0fd769ab3241467696da5f49a189d89600d076691bf2cedb1294ffade5c44f6d24512d6a93a6f8981
 DIST gnupg-1.4.19.tar.bz2 3713811 SHA256 7f09319d044b0f6ee71fe3587bb873be701723ac0952cff5069046a78de8fd86 SHA512 cce2a83efb05f963ad0f8afd04999cc852889d46b4cad4cf399a37fd6e69f0911a5ccaa0192cb891a941cfa93125349b481efa789a127e3c0aa2c5ba53672741 WHIRLPOOL 14eaddca0981f05757aa0751b9563837efd3f5943a422d5f29e0de94eb6233b85b8848a1f4816ab7e897d6e656c7c08705115d53ed89f554604ffd2009c3c39f
 DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 SHA512 5dd23baaac764fd48abd235ed52a85a2c7fd68b98fcde45c0f294ddb3b5629e8b1bd894585fbed4e6a6cb2bc4a5552c098c3cf1a849fffa469424fd0a4fee726 WHIRLPOOL 8d9b30337957f6bfeddea29116d862ef0c0ddd06d59bc2799db236b91b2c6767aad6f37f2166fc431c5d9454eb41f49f3e261bc38d0e89361f0c467f4591cd5a
 DIST gnupg-2.0.27.tar.bz2 4424679 SHA256 57646d3e4b919fa1e5c8f1c0cf5fe1215333041c493a5ebc4b8f2978dbe930f2 SHA512 b05e75f5ef9881df9472818743c175cfe3254088086f36dc0fcf3d34e61f648f1775d90d404f6c622561df5066d972aadbf99ea8ec1290e5d7f7310f4ef2989e WHIRLPOOL abb353b20655002a0957e38d2b889fb5e6a47ba7b7546e1c70fc1f97cf42deeca8f2b061678983f3a160210f4eaf7529441246df1f9f1d875f5cc090456fdfb7
 DIST gnupg-2.1.3.tar.bz2 4875813 SHA256 213e7fb0d74bb4e53a2d3153f309ddc077528f2cfffa2af85f2a20cc7875c8ed SHA512 dfa462c490102f6924314aaba44af8492b3825f1431732ad4ac739124077c5ed85bc26b83e72d7b974a4008e7e9be5fa33eb7523c174e3e5291367f28d845de8 WHIRLPOOL e6fade4dfdcdf590b8bc793daf5f00f8feb1e537b1a28c87a98b2e364f171e6c9ae615e6e7742504097df71e636be894d8c95fad5f3f699f93071c73af3726ef
-EBUILD gnupg-1.4.18.ebuild 3763 SHA256 37cedb3946b555e83111f5096b3dd73f9506175976be10d648f8eb76b0b5fd3a SHA512 3dd165eb15a4946a9e2157549f0da6864e84c054a6369d7053730a899b50c5f05a703c1ce8e208b9de21b135bc8888f0f13835fce50f0e9eec467140e7e63355 WHIRLPOOL 9c64d59b7c444dde1fb601a6ab8d1085525153174b5995009ff7758866e56b88028056b42154fa0e28b3328978e15df515e4c65e65cb667fc17b75fb340e8e15
 EBUILD gnupg-1.4.19.ebuild 3472 SHA256 e2d789f8ddd23866340e7e2cd450e7d7c51ea135e403571ec00873e85e04a4a1 SHA512 e4b5eb1b1d03762528464596316e433ec2b01330cd76ce5a7d7006ba77f8b7dda2d15e66f8574803a229fb5f543c587fe01b82ad981bb7a26c7ad7c2d86d7f7e WHIRLPOOL 9452157d05e9fc515af5b1d71bc14c820ac09337d6b3ac5ff66bca45a7de1ea50958f42bfdc6aee3f27e2596997efe36a473e7053bd904e144c73c3fbbc3a17e
 EBUILD gnupg-2.0.26-r3.ebuild 4889 SHA256 d68393d52300de25451d6e732c7c10484f31283b560988e4992e9ac8fed0874a SHA512 5cc4f633741c32f244aa43eb4606a339e9de7b0d7ceb6cc38bdc985293efc605abcaafe438d0d60250d30f1cf7923a92a093d854f2abb28b302a8ff385b4cfc9 WHIRLPOOL 3d5df13d06a20c6cb53ca9259a416e7f0fc6490331d19ba4b98508d1dd18ddbcfe19913ce0a8fb61071c5a4ed38e8d9dca68b79f22ceb97890ce8236dd2e739c
 EBUILD gnupg-2.0.27-r1.ebuild 4814 SHA256 e886319d458473e57a6f88e1f0c15d791e3375e66aca80eceebd3bad539c52ff SHA512 656c96421556ac1b6b1022d28b452db23de5100c0cf8ed0c51e73053f4526d7c38c6682dea596ab7d36489b20978da6a1375a56f5ca24b43b78394c859de363b WHIRLPOOL b3fe2d812c0defcff16030f6fdb07a9b430781fa0027c45dcda3c921785413271ec492f789a7a1a4f5c393794ab539f0bb7e263fd1eb1784972a752d3fd3b9a5
 EBUILD gnupg-2.0.27.ebuild 4782 SHA256 5453bd69096075d8866a4877b6dbc3efa03a85ae8cbee63ff72269741749545e SHA512 6fa97736a7995c4f6a0095453bfdc0a627c9915da1e7442a65933532aa2ec7d21fdc69ae1cc1b32147731927eaa3cd1716715fdc8dcd969956201649a9da23ce WHIRLPOOL f9f7fe16b87194311f24f9699c561248faec2600fb632a9bd14a205e5ba8092826c7167e895968ea516d6b260f5bc618faf412cd5e5df0198d04891f7ad2c4f1
 EBUILD gnupg-2.1.3-r3.ebuild 5203 SHA256 eea739e2eec8a95e1acf87c6a31cc9f1be96ed5e588e67cbd96c28e80e1439eb SHA512 c9b264fe0050ce586f981abc6b32413fc0fdec538ade978dc0bb10408d9f064738a083d1e6bfba780f2533ebf93b84cf9fdc5eacbdba056f7074382d77754dbf WHIRLPOOL 36fc5ba7d61dbd8b7e63cd8d4dbd2232af63cec70c83f78bc5c3eab56ba5932352cfe9f6e2859a81d4d2568d2afd800165bbc58fbf1c5c87344c63d668cbf0cb
-MISC ChangeLog 87888 SHA256 462844abf6c8fa91a567db9e7e06210a5c1eaab19fe420b18508814335a8f357 SHA512 169cafdc848cd60b52c70217c5e97b372f641a7822a79965dbb85994827302a2b6e358c914826c747eb6af806fcea97b747c52b4cb90a488c9ebdf21de4f7b83 WHIRLPOOL 00a57ad44614a21c797c4aae36864fade509f463df0d3a20bb617315a2f1945daee53c643bb14ddc7f58ae483500e77bc918775e917d9c9c7db81e038a64c1cb
+MISC ChangeLog 88004 SHA256 081537e5817c7cb6ee06e0b512a48845e007252487eb35de291c9ea385317f88 SHA512 0ca3641ef93fe610c519336a4388db817fc3e1763dd52dd538c25210ea3804c11bc79a4ba6910280dfc0319d5a373067f23384658cc97df86c288f658712b221 WHIRLPOOL 5005960c4b71dc83058f77e62b68a5d4e43a48649d27daebb9b32c6a1f470e4dc699ce3ec5b7d0391f260ea6ff62e28092acff6df8ee518e0f12258dd7817291
 MISC metadata.xml 1032 SHA256 cbef1621eb1364c8d12ac18e71cf4aabfced9ecd3c990a3f3cdf066902dc97bb SHA512 5e2ef4380effe027a0b0b8a11a29ed1996b3b5256ee333909d4a7cfcb18ea1e9dead9b8303c7dffc1ad10014dea79e827b1d84caa92294f4d3dfc29ff23a6af5 WHIRLPOOL a24c7f71ed140f34dd59b10314869d0c5482063be20faefa1591595feb856c79bc57a6b344dd467875cf3389d8cd14e2d41f2312f51d3b77dcbe27af97b7f129
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVPN+sAAoJEJOE+m71LUu6Ch8P/0rzIPWZ14/ovVuO71wFi35b
-m3Ux5zp+2BFrdNEMdHPfr9ioDe1QaXmI1IJvjn3PcU8AzkNhNqFYOXFEQr1lsbYk
-FqSyiq0GZsTbEHowLkww9HtLKbhB3zOsshpekorlC73oH16R0yXrU0UPvxhS42Bk
-05SyCMFxdeKNQVhp11OF+k3iz9MS9+FZTe4yqHY7XtLArjvkFaXvEZ3CoqViXWh5
-c8N7NR5ucshJ6t8a1QJUeNM7oF5S2tMXCcHx5YNrdJWF6VVaRU5Qn6duVb8IpEIu
-anBlpEhgi7k922sc98XSBmP1wOnO9wtLSc06WilyqnHegWSIiFq/olE0cxq7k1vY
-QBDnTcl8Qb9deJFvNVn+FQLAPLa6IdMS7iAuim158uzVnr2UIoO6SzAtDtqCfnIH
-djUZWP34wSZYLdRN3FCFz/9kKBddxm/5gAgC3woJZn9JFQBZVNSx2Knr3ppIKqNG
-Ab8qEpwTjNjZ+LjSUoHaEm+HnqoU6HuC4Vz6raLD1mGgROXdw3bz71sfkN6G7BRG
-QItS+HKdP0UOuCGbCktDIkE3iXr1OqaAUa9KWDNbCrU3rU25MF0zJCKbAkmWtceQ
-miSK1wjTYrHKV35Jt5I1oT0NHEjrwvuy4PxUUJVrM/XeNySKLqbJe49HV28pZnPn
-jB0dAIWTzKd/1LzKERsq
-=FzqB
+iQEcBAEBCAAGBQJVUQWCAAoJEP7VAChXwav6yCQH/i+P4lMl7+qMrWOpPkvIa8WF
+lJCnb/jbGJaQmkHjpXqvB9a4IijHGOXYfHFN81/LrBa0TwkKwCwWCGWHZarYWGlX
+DJvR5/JKORFIOZ+oNFTFPDcg0/96Me37pyG+9tB+4AjDzmrFE6HlKLY9ouUQOVLj
+sK/ncktg592W8tJLFB1zD2Ykx8ewJVsE5YltPjAP6YZNw7mEAN0v+qSA1vwNhE4b
+IE75UWsGRGv6uoch6ChQS1xyprqanNJ6zmUNmthAJeSqPjdIG2BLlSTnvZt9fYdd
+pA1aLoIZRGxRzPsoTxZPuM1g5vJuIKZPvQMCYBgAmKSTg2GInO+nhstdFElzQkc=
+=MzxC
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/gnupg-1.4.18.ebuild b/app-crypt/gnupg/gnupg-1.4.18.ebuild
deleted file mode 100644
index 4dc500372df9..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.18.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.18.ebuild,v 1.10 2014/07/05 11:29:15 ago Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-ECCVER="0.2.0"
-ECCVER_GNUPG="1.4.9"
-ECC_PATCH="${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff"
-MY_P=${P/_/}
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="bzip2 curl ldap mta nls readline selinux smartcard static usb zlib linguas_ru"
-
-COMMON_DEPEND="
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	curl? ( net-misc/curl )
-	mta? ( virtual/mta )
-	readline? ( sys-libs/readline )
-	smartcard? ( =virtual/libusb-0* )
-	usb? ( =virtual/libusb-0* )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND} )
-	selinux? ( sec-policy/selinux-gpg )
-	nls? ( virtual/libintl )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Install RU man page in right location
-	sed -e "/^man_MANS =/s/ gpg\.ru\.1//" -i doc/Makefile.in || die "sed doc/Makefile.in failed"
-
-	# bug#469388
-	sed -i -e 's/--batch --dearmor/--homedir . --batch --dearmor/' checks/Makefile.in
-
-	# Fix PIC definitions
-	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c \
-		|| die "sed PIC failed"
-	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S || \
-		die "sed PIC failed"
-}
-
-src_configure() {
-	# Certain sparc32 machines seem to have trouble building correctly with
-	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
-	# fix until the gcc problem can be tracked down.
-	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
-	fi
-
-	# 'USE=static' support was requested in #29299
-	use static && append-ldflags -static
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable ldap) \
-		$(use_enable mta mailto) \
-		--enable-hkp \
-		--enable-finger \
-		$(use_with !zlib included-zlib) \
-		$(use_with curl libcurl /usr) \
-		$(use_enable nls) \
-		$(use_enable bzip2) \
-		$(use_enable smartcard card-support) \
-		$(use_enable selinux selinux-support) \
-		--without-capabilities \
-		$(use_with readline) \
-		$(use_with usb libusb /usr) \
-		--enable-static-rnd=linux \
-		--libexecdir="${EPREFIX}/usr/libexec" \
-		--enable-noexecstack \
-		CC_FOR_BUILD=$(tc-getBUILD_CC) \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" || die
-
-	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP}
-
-	exeinto /usr/libexec/gnupg
-	doexe tools/make-dns-cert
-
-	# install RU documentation in right location
-	if use linguas_ru; then
-		cp doc/gpg.ru.1 "${T}/gpg.1" || die
-		doman -i18n=ru "${T}/gpg.1"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9,"
-	ewarn "you MUST make the gpg binary setuid."
-	echo
-#	if use !bindist && use ecc; then
-#		ewarn
-#		ewarn "The elliptical curves patch is experimental"
-#		ewarn "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
-#	fi
-	elog
-	elog "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	elog
-	elog "If you wish to view images emerge:"
-	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
-	elog "Remember to use photo-viewer option in configuration file to activate the right viewer"
-}