From: Anthony G. Basile <blueness@gentoo.org>
Date: Mon, 27 Apr 2015 00:28:20 +0000 (+0000)
Subject: Drop all but necessary KEYWORDS on vulnerable version.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=156a2c5e0c65b9ea7217bd90fe1c3fd9758ebd17;p=gentoo.git

Drop all but necessary KEYWORDS on vulnerable version.

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

diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index bcaebbf74f16..09a09cfb3c78 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.221 2015/04/27 00:25:03 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.222 2015/04/27 00:28:08 blueness Exp $
+
+  27 Apr 2015; Anthony G. Basile <blueness@gentoo.org> -stunnel-5.15.ebuild,
+  stunnel-5.08.ebuild:
+  Drop all but necessary KEYWORDS on vulnerable version.
 
 *stunnel-5.16-r1 (27 Apr 2015)
 
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index f3c5db4e9904..48909a05f649 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -6,28 +6,26 @@ AUX stunnel.conf 1419 SHA256 9ae90e10e9cb99e69183d908e6df3b56660eeefba8651988fea
 AUX stunnel.tmpfiles.conf 38 SHA256 68c9c963673a3bf0f3ce3f32751c9e36a3299251da12e9bcae929629657df135 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb WHIRLPOOL 5e070b27ed14c06efc8e66d23a9098d60cc16c01331824d910786c6fa7697f96b8704dc02af4f4346b4628dd22b8729a11756c7d85596ffcf916f36f9de8ec05
 DIST stunnel-5.08.tar.gz 608365 SHA256 830b21d24cd237e96f4d7993be43553d4eba4d3cfa2660faa78dec8d41d314fc SHA512 8cbcb11aef85cbfa8bdad15deeeaed1af4e4361ab1bbf0f535fcd8b36bab4c00faec6519cecbf7f18d8c14397f8264ad2e0e2cb84968e0a0c40a41720e064dca WHIRLPOOL e3b4d8531af603b4a8c7f556831e877c7a4bdd0a3a75b00ea65a134e38a2df7faf30b0006d0ec44600c9cd22917eae58a9f98f63dbddd28728ec2fa85304e75c
 DIST stunnel-5.14.tar.gz 608366 SHA256 2197b4fc1db82eba69c8baf1fac30f0767af26e9f8c7e9e1d5a4a8fbb264695a SHA512 f0d074f5c525036d98565c9c315f1761920c2e7cd7687a9a0f0441e7caf5cf3930b14c078f4f158806c557ba8ea0698aa3b23d5e7e03c076ee3b6667140148c8 WHIRLPOOL af8d018ffb74aafafef7bc90c63c2a5c1e4dbe164f71eb7aea7cf5388f60c9f49c19ce4dcbf2e55c2c166ee1be98ff5ef72171d750949e668391a7afeca78224
-DIST stunnel-5.15.tar.gz 613768 SHA256 58ff4645eb5d6bd64e6ddedaa683534302f75625c531e8a6364badcac0541cba SHA512 317d9d970b15024bd28d5db1014592d1f7cf342f617618c301e3810c98a595d80c888136aa0050ca750fd75084966f653dbcc725c4721d15eaeb4b280a1267e0 WHIRLPOOL ad015f3063b6c6bf16f4d5db6479e87a216cb1a87c53c7e2f14f71ef7255984551c39b486d9378122bd2c916e3351aaf07a4ee2023ee6cbd8e4e989cddd039f3
 DIST stunnel-5.16.tar.gz 613813 SHA256 b6b7e93fb2626eaabae1c8474e1dfa23962cfde8fa35c8602289fcaa4f53608d SHA512 8e3182d0a8103c713d4dae7913e617f10102d69ded9b17abb4b5c937b8fb6f436440b5bbae0a33fd1728205109e1e37bfa4f28f8f2873fbbe2fb214b563b3a4d WHIRLPOOL e3552994c958d53cbb1bb4b9b67fb3423c142509b01a34f00994ba9ba35a040ce0cb0f68a289937a98d6c14bead205d215639304807bbc276f5017b5667a9c58
-EBUILD stunnel-5.08.ebuild 2624 SHA256 c9d2a47b72acb1d84c332009edd9a574d1e6250ce6ebd98f01de013951e68114 SHA512 5b900c0b491e58f2d4bbaa80b1efcb4767898c1d865b371d2bf4c9b4284e1e6846fa03a1519d9f8fdbe4db129a5c5e463d5ff02dc27fdda3e096311ea6388dbd WHIRLPOOL a32e999d3f5140e992da90b20e680cdc9045f3aff9a696affa578316486eca42da149e77d136b61f65a3eb5a46435b2d49e09e89ab32d97ce7f2381dcb888721
+EBUILD stunnel-5.08.ebuild 2532 SHA256 c58e9ce1b6fdefb6b1b5df28aba676cbcb6de62a88a22c0c4f6a9b8a9251c30f SHA512 d112614325e87a83f9a478c7138f228811d11ca54accbd17100bd56e230eeb93a71f0653720b335ae6b4b73bbd98de4dc58b8569f000fce426f094b7f685495a WHIRLPOOL d4006021927ff2fd48aa0d02d7e3021d9a6b69335156691156935ba7ddd6fc744848389c2ecb2054c4250cabd65e03f49cac1804153929a1b67a551d0ff380f2
 EBUILD stunnel-5.14.ebuild 2626 SHA256 8cb2f88fada82226886e75ed19223000f5b4c91923179c366e94d0f6d276841d SHA512 1da4f57e250f7e7732644451a94cf3b8a46b9b238e760063e3ffbc793b5728398bed3163b21bcfa4c8739cf1a31c590dd030689308ace3a5bd08840f527de853 WHIRLPOOL 5fdecda9a5ed24d143718c59569a2460abd9f3827ea746b68f693488266cc03da7a2d676fa765642e51286b1b6d7c54c6c74e2f42bbf232e0128f6c3de0abdbc
-EBUILD stunnel-5.15.ebuild 2637 SHA256 6bf7a9ca2ffefc1a08975db3cb652a18c9e83cb725f6b6b854128ee917baabbf SHA512 2f263958e248930b8611696726dfe736f2d97245351e960ff4c416e988879b703a4961ca6ba75b7c4f0d8066a2766daa6b67b5aee5f83f2be43f8571a9ae6514 WHIRLPOOL 6cc8b7846fb83db0af3565b94da836d4aef9d5a59716805ba7914123040a8ca74bdc6c35ac5805a99367907899ec35a39b5763ec7b24272b638c734f42b75325
 EBUILD stunnel-5.16-r1.ebuild 2741 SHA256 0a1ba3bbcd83f753f931e319add0bc5dd794755660b45f502cdfa14bd500a016 SHA512 e736c3d37471ba1dbd6ef1e29ed30f1803468c26793f45ad28aeead5a95c6101ce4d8209488d915ae5dc5fcf402a02751a875f61084f078bd2000dd51e116b25 WHIRLPOOL 873d65cc249c2b9af6b05d1e98e3c80ec6a69aaeafdb5b702a98e6c33c7a40a1911b3fe7457dec61b3cc8d0a9cdf6c7b5280ed4df24018f9cd16e7f4c13c9b41
-MISC ChangeLog 31465 SHA256 17080380d27dc1b33d2edc5878234da613bd4e28205e33985f5769e021878fdb SHA512 6cc09903e969e506038462cf536414abe3496c4d34b9193152db9f3614d2d8343bfc583d4ea57d7e479b42335c9f45167fc71594c314f85390f73b1c8604ede2 WHIRLPOOL 50ed0283bab0c5600303a022f8dd00c6dbaf84d62ff8346412dfd85cec9a95160fc9f0067247dacfc4de482f01db3b999a27489d668a98de8f3a988c3ab326a3
+MISC ChangeLog 31623 SHA256 c61545c3b080098e3e5aadb81a872e046bf1aa032beaaf3fc75837bc32c402bc SHA512 a192c5b53e726f44682bdcef8ed9edc39d3f1b106c37fd422caada8e6679077d0612a7232b4a629797bf6075639c80a5f9d002dacfc0de9478a3c47ed4991697 WHIRLPOOL b3bc8a8266e5e532881d24080d42023e6cb46277c1dfdafb35d392a54821596898ca74d37ca34082edac0809967c4f8f509f064a6b99a3f1ee285447f526a793
 MISC metadata.xml 622 SHA256 42b6c75bd95fd3f6322e6a6f726a9e07d74f0b46376a6f17718f9043cf6cc225 SHA512 930faf03b0f8e73c0ddb1a9821c04d8e0b0eb49fbf1e70ba439cd810e7aac827490b2036fb9a4bf4d8f2d96b3a2e0c0b2923ed21ae17b08ca09464c7cee54997 WHIRLPOOL a604c6422e399f97c5d701d756eee871438b9bb7fb7195c5b4a35357be9e11b7709d7e77172d85f1e5f1d31987de958e8f0f29f13bd1106afab1bb32b75564e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVPYI5AAoJEJOE+m71LUu6uWEP/jJwJaRVFTGmpEXrpEmtxnec
-GYsDo9KKScXKO8dqkqgx/KccaQD0A1GHBgOoGpzyQmMJFNu25+s7mMGYYNrTpaHm
-IRBRjVL1P05DNbS/PUqM2qwLle+81ffFLB3hx9fbluNHZPxXPCJ24iHeqAN1d5Id
-oBnIklORb2qUDQbofVUJmpe7oT0KfUNXiYGtya8Yuf2a5Dyiiaj0c9pXZPZp37v9
-WoftPQ5v0HHxUc5HsObrjz/QlOeMpfTNReftgNmiDrU1HChsvy34ClLeKklt0XOo
-c1i2pTr/OKFE0P7UCynZG+tfeclLzgbBeP9cF8UpnxdZb+tUkZIGkl5DcX2ncIv0
-6XfdLLe06MyCVsUDxqsAb09pcVH4WuDqv4JzH/dM6oxhpEmnFycKHfAXzefCCc04
-tnwlsGW4hpC8+n2x6ZL0Su0bS0bU2KBPYJ6W4aLs3PaT6W9vcyUi/HPxgyCAIt/U
-hJicn501eyihBoqurFfTbMCRx0/sxhSM5ss8Ugt6aSF0MVlyCJ8FYDaqdskJgLWF
-EvnZ69ELsR9PQNi2pWN1eXj/sCJY4+OfPdUTwlvF+q0PZIH+yPObldZADMpq8VPd
-vC9rb/l08dihq3AdYZL25fzM4lQGF8OIg9ZthQNO2hyndG9i+EPy8ud3uvb3IofW
-uafHFBPhF7CXAmuWdAJp
-=Ox+1
+iQIcBAEBCAAGBQJVPYLxAAoJEJOE+m71LUu65JcQAK++Me9jF5szkXSPNrHOfEi6
+w/E50aAW4kUO79ll+T/uRpEdWrYqvRQiHIR/5I4876KMOgHvJdgTUg9P409waHv8
+ZBNn6lEoe0T7Mv2Qmqy0eeodlrxo1gGX1F74/fPxEriiyqQn9cy3sBaD3yT6naek
+FoPSSlH3+fJ4auXhrEZtLvU6xuIYcBK73cvOqh3iaUL/wk1NtGKWrKRUpSF4PGFZ
+IuPtOVQOxPtjFRv6SpN57IeJHthh3SjRlFSnPKSYcrIbLgJTvQq61LumN/J5kbpv
+UfdNlSUUEPVGLS2yDULxfLqN2kRkfFdEvdlv6RRRQxpfxeqxzwzZT1104hsDNtU2
+Za08KWz5PC2qOKwIFhHHCLWnAX9KCoqlU0pI/kmBLmK5rQmOgkkBMrAujunWUQyg
+NO0UJr6dEBi+MzaZ4T+qF/TV7LYlvzflnfxEKW0oTt8hfhT3MyQjvmQRNLDW/GoW
+GsNcXnX3PFIbK8V6CHPX5jMCBOnjDySrhvgACK1f2NKxGAzYPX0TEcUxfPFK8IjB
+t9kKuynyydUXc/gHkIpqdABbEmGAsjAXFNmKCBeHTeraManZpB9Aau5uvW7ISCxJ
+0DWZa7J9llENWJErmL3GddSuWnvr6j4/XKvQqNIt95sDws8MrUtcc2cK9st7KOUl
+1uH07TZfkX9S4Lvf0YRb
+=vvM6
 -----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/stunnel-5.08.ebuild b/net-misc/stunnel/stunnel-5.08.ebuild
index 1e09f8db51a5..60b7a9e7aaa4 100644
--- a/net-misc/stunnel/stunnel-5.08.ebuild
+++ b/net-misc/stunnel/stunnel-5.08.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.08.ebuild,v 1.9 2015/02/27 11:10:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.08.ebuild,v 1.10 2015/04/27 00:28:08 blueness Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha sparc"
 IUSE="ipv6 selinux tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.15.ebuild b/net-misc/stunnel/stunnel-5.15.ebuild
deleted file mode 100644
index ac81538f0f37..000000000000
--- a/net-misc/stunnel/stunnel-5.15.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.15.ebuild,v 1.1 2015/04/17 11:59:05 blueness Exp $
-
-EAPI="5"
-
-inherit ssl-cert eutils systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 selinux tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	dev-libs/openssl"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample "${ED}"/usr/bin/stunnel3 \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	doinitd "${FILESDIR}"/stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}