rm these vulnerable versions wrt Bug #513864

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 9 insertions, 234 deletions

diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog
index 84ad6024b0d9..21000ec4e30f 100644
--- a/sys-cluster/swift/ChangeLog
+++ b/sys-cluster/swift/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/swift
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.29 2014/06/24 09:49:27 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.30 2014/06/24 09:56:43 idella4 Exp $
+
+  24 Jun 2014; Ian Delaney <idella4@gentoo.org> -swift-1.13.0.ebuild,
+  -swift-1.13.1.ebuild:
+  rm these vulnerable versions wrt Bug #513864
 
 *swift-1.13.0-r1 (24 Jun 2014)
 *swift-1.13.1-r1 (24 Jun 2014)
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 325ffc7eff97..647ffde434fa 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -14,18 +14,16 @@ DIST swift-1.13.0.tar.gz 779440 SHA256 2c2203678cb67e2e8249db1265c68ec901edfaace
 DIST swift-1.13.1.tar.gz 802273 SHA256 cbe6e807c0c0115570fc3da4dd7e3f3c2477fb48f865f29d648fb5714734eabd SHA512 3a18df9bb440723ff88429bea215b25b2d3790193bb1e0bef155c8cb9c260db79099794145ab7bd3a99eb25e8441cf527c82a803408078212ca0145cab8c2258 WHIRLPOOL ba10c6e110eb6b7de99b6f6733e05bb092837ce3e6aefdc0a74a9fc693625dbf3f182e8c637dbfc07d3f6ecca8fa26aebc89ba65917d952551793b28689f9523
 EBUILD swift-1.12.0.ebuild 4182 SHA256 66978608aee2828b94bd60947e92867a4cb1bbe9894f293af1066d783bbbd540 SHA512 b02b982a1739e37b7f6d257a11a5847ccf88702a9460152a4c53fad8bdff10f7f86f93a3d1800257700576f961bf905de30cae4cd084de1d0ad3585bf3b7b0fd WHIRLPOOL 719434cfbfec1b8dc0a4cb03cbf0e82accd5335d7a6144c37a80490f6ae441804f4b5dce19b7f306c28aad2029fa09fbf3af941485abbe2a6604c903e399aa92
 EBUILD swift-1.13.0-r1.ebuild 4131 SHA256 5dd8d29e570607506a7453d63087fc54f989f277d644a715574287851e9f5b7e SHA512 da959f690bea57129e21858cc6e9d2456f7d72413fead13584fe311823e359f5eaf873118c1c8dba0f50ef8fc785a0637d5ab98f51257c3556d1e16f8d70b744 WHIRLPOOL 2ca30bb23dcc07e752853c4769043fea3aeaac6f9c5377ad4abf72cb0c7dc99ed48a744d17e56e4a786051420ec220f8b8545a80d8e001e4a418f448d2f1ec8e
-EBUILD swift-1.13.0.ebuild 4137 SHA256 20c5ac8b7d7f1c0ec24b792d4ac6e3deeccacef7b905c1eb0c31b028bd5a312d SHA512 f4d0bd3fa81d0ef7ae8a689c29b11fa32f11c3fc66e2c910c303409d206b56afa45e48c6f037e4eef88312a3f0dccd677dc7ab5293f2d4abe0639aa29a9b91de WHIRLPOOL f15b571f67846686534f4cf50460c9d01867be8e543fcae4cbfc8545fece126f9f67d8839e81192ffaad2790d57683af4a7540260f85ecccc9d6a3e5851db6bb
 EBUILD swift-1.13.1-r1.ebuild 4015 SHA256 e4d8f924f067ac8f6061d895e05cad1797d4556bbe642eb9257a29702a929a83 SHA512 4ff489f2a40719d5b3663cf8d353ded1238a11820744130a5c035b91fb5d55a0651ba09f8ae91bf5bceb5ac7a2f38b22118c0b63266ae882ada8c0eeb8e8ce2a WHIRLPOOL cd07326709cfa9d3e3036b21713e29ecb162115c0025a2fbb8c01d814c7864a6dd13620683e435699da24598771a1b28aae86bb07c6b6d94fef32ea366c1aaa1
-EBUILD swift-1.13.1.ebuild 4021 SHA256 1e3b3f6f05fa00a53612036cfaea1f3d3bc103208b01ac0fad37397521d4aded SHA512 3f635ceff63337a6380bca53966787505d8969f15f033996dde20639e489ecde2fdb85be6541359b15d37581ed73156b627cf316ea3f2453bbfc507db940fe71 WHIRLPOOL ea77cb71b9a42e79493f45023f3d7dca689dc5a5fd74da38e3de2cd7037815aac62690cc907c57aeab4ca2fe6da6b604753e0e9b57c122f5e757046bcff246ec
 EBUILD swift-2013.2.9999.ebuild 4014 SHA256 3de1990c02c1f41f69c87444e0bf0fcb236a3ed35294ebd6b341c8a652aed127 SHA512 fbc8f06d994609217c6944e02f58a49a0f2c483ed3fa59690eb14a6410c7781d99d0ecdcab0cd4e0de2ecbd80b0836931b4b7112e786a15f5b6e89a6e2448c7d WHIRLPOOL d7ea0b53bdb30ac1b0fafc45a419f129a3e1245ff65804673ddf64f101e310b0769344a2fdfd6240cc094654935bb2425780ef1374c3bce181d285d764346ba6
 EBUILD swift-2014.1.9999.ebuild 4032 SHA256 320e03538a0367f7bde7818d66e2e6b6989204e3b0cc126ba60ec22c09695390 SHA512 78822409e7eb54934325428a55222c134d800911ae4b61a90038e5ec0b986028a426cc89a82148d77ed2b97022c956ddaf21b359449a4a480218d41e40ba6037 WHIRLPOOL e6f0b10e8ea003d0973100e2eee2d735654d397ed6c3e2d9e40cdc1451c8c59e151a28412c6a7810bf1406ae5024429188d476f54dbd0c168b1182fb0d8ebc60
 EBUILD swift-9999.ebuild 4115 SHA256 e7065fa4019f26a41180adb3074aa02dbb8a7fa88f1d4e3a09eedeb363e083c1 SHA512 88ca4c3bef9ba4a26cf103c89fc72d69618a8e5148d8055b0209585312f9be6edc16c9b6d3988cef482db4df6c9847de1ce2d21f87ad3ec88ddfb24b419e19f2 WHIRLPOOL aa7525858153ad4107115841b035d2c6cc321eadbfe2f500c0e1e180e5c609267628f9ac309e0cc8a62aeaee9fda477e20d8376b878ca2dcff76e17bb3b376a0
-MISC ChangeLog 5680 SHA256 47f96bd2c9e9c5b70b06f9cbceaa8cbc3e2ef97b889fa375ef8c95513547d4ee SHA512 f919caead49724fd391b09676a73c58db1ab217188edb1fc17049a23021607f136c19e77132de3fc59fc68216a85fea932ffd9d33499c5bc3d254c3234fb9192 WHIRLPOOL 490d3b2921cf8d502bb033617fff38f282ffbb00df1329c4b0981d5b79df26450973063fa46114a4ef66acc7b2a8014355e7d671095895fe75069f891e19d1d2
+MISC ChangeLog 5822 SHA256 d4eb41d33f97ffcac8b7d3b45f00442b69960bc31569714946883820ef6cd433 SHA512 70d27892a65d01020d6abf715c8dead9b89fe7785d162fd06bf7c9dc1b7cd12d9d6c982668033f47c356a0dd3e198f147b000185e18e51f816fcf4cb4d1fd40d WHIRLPOOL 275615bfbbed67d5a9747aa3dac2c23cee8174fe8b2b693110e49a70dbca1fea27996ada771032bbfd034cca0404ae302a067397878452ba06ccf877a71f9c0d
 MISC metadata.xml 718 SHA256 3b5950b308bb7bff9c0b1e1df0ec6d2616a42225c6a60f8d23f8774cf3dcb0d8 SHA512 e86d128b5c6ccacfcb8032d33cc1a7e00ecfaa1d0e1fe325ef067f0073a5d411e27e84f89e7f843a7d242d8aca2163978f08f71f91bef43675adb5156d4716df WHIRLPOOL 8fdfc74a8b54c32edc06618e7ac59227a79ab24b32ee8757f14cd2dbed49786422bed58b4dce1808397856604027d0a148f74bb0d0e97cbaa232030fb93e0454
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOpR7wACgkQso7CE7gHKw0M4wCdF30htadhlAw7L2LFXY1ZF0CX
-WLsAoMUNw0U+b3v/w+VuDtcjay+OjcAo
-=3npx
+iEYEAREIAAYFAlOpSXAACgkQso7CE7gHKw1+MwCfflSpequ65pO+GbbuSVcxeQHT
+MfcAnjpfj10krxIlJg1jNh5MEiNnVdfb
+=uc6O
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/swift-1.13.0.ebuild b/sys-cluster/swift/swift-1.13.0.ebuild
deleted file mode 100644
index 50ef0378a9a4..000000000000
--- a/sys-cluster/swift/swift-1.13.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.13.0.ebuild,v 1.1 2014/04/06 05:30:17 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A highly available, distributed, eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-SRC_URI="http://launchpad.net/${PN}/icehouse/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="proxy account container object test +memcache"
-REQUIRED_USE="|| ( proxy account container object )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( ~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
-				~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
-				~dev-python/flake8-2.0[${PYTHON_USEDEP}]
-				>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.6[${PYTHON_USEDEP}]
-				dev-python/nose[${PYTHON_USEDEP}]
-				dev-python/coverage[${PYTHON_USEDEP}]
-				dev-python/nosexcover[${PYTHON_USEDEP}]
-				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
-				>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}] )"
-
-RDEPEND=">=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.9.15[${PYTHON_USEDEP}]
-		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
-		>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-		dev-python/pyxattr[${PYTHON_USEDEP}]
-		dev-python/python-swiftclient[${PYTHON_USEDEP}]
-		memcache? ( net-misc/memcached )
-		net-misc/rsync[xattr]"
-
-CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-~ZFS"
-
-#PATCHES=( "${FILESDIR}/CVE-2014-0006-master.diff" )
-
-pkg_setup() {
-	enewuser swift
-	enewgroup swift
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' "${S}/swift.egg-info/requires.txt"
-	sed -i 's/xattr/pyxattr/g' "${S}/requirements.txt"
-	distutils-r1_python_prepare_all
-}
-
-src_test () {
-	# https://bugs.launchpad.net/swift/+bug/1249727
-	find . \( -name test_wsgi.py -o -name test_locale.py \) -delete || die
-	SKIP_PIP_INSTALL=1 PBR_VERSION=0.5.23 sh .unittests || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-#	newins "etc/swift-bench.conf-sample" "swift-bench.conf-sample"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcache; then
-			sed -i '/depend/a\
-    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	fowners swift:swift "/etc/swift" || die "fowners failed"
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}
diff --git a/sys-cluster/swift/swift-1.13.1.ebuild b/sys-cluster/swift/swift-1.13.1.ebuild
deleted file mode 100644
index 27c96b669e06..000000000000
--- a/sys-cluster/swift/swift-1.13.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.13.1.ebuild,v 1.1 2014/04/28 01:22:27 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A highly available, distributed, eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-SRC_URI="http://launchpad.net/${PN}/icehouse/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="proxy account container object test +memcache"
-REQUIRED_USE="|| ( proxy account container object )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				dev-python/coverage[${PYTHON_USEDEP}]
-				dev-python/nose[${PYTHON_USEDEP}]
-				dev-python/nosexcover[${PYTHON_USEDEP}]
-				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-				>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
-				dev-python/python-swiftclient[${PYTHON_USEDEP}] )"
-
-RDEPEND=">=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.9.15[${PYTHON_USEDEP}]
-		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
-		>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-		dev-python/pyxattr[${PYTHON_USEDEP}]
-		memcache? ( net-misc/memcached )
-		net-misc/rsync[xattr]"
-
-CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
-~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
-~ZFS"
-
-#PATCHES=( "${FILESDIR}/CVE-2014-0006-master.diff" )
-
-pkg_setup() {
-	enewuser swift
-	enewgroup swift
-}
-
-src_prepare() {
-	sed -i 's/xattr/pyxattr/g' "${S}/swift.egg-info/requires.txt"
-	sed -i 's/xattr/pyxattr/g' "${S}/requirements.txt"
-	distutils-r1_python_prepare_all
-}
-
-src_test () {
-	# https://bugs.launchpad.net/swift/+bug/1249727
-	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
-	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	keepdir /etc/swift
-	insinto /etc/swift
-
-	newins "etc/swift.conf-sample" "swift.conf"
-#	newins "etc/swift-bench.conf-sample" "swift-bench.conf-sample"
-	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
-	newins "etc/mime.types-sample" "mime.types-sample"
-	newins "etc/memcache.conf-sample" "memcache.conf-sample"
-	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
-	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
-
-	if use proxy; then
-		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
-		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcache; then
-			sed -i '/depend/a\
-    need memcached' "${D}/etc/init.d/swift-proxy"
-		fi
-	fi
-	if use account; then
-		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
-		newins "etc/account-server.conf-sample" "account-server.conf"
-	fi
-	if use container; then
-		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
-		newins "etc/container-server.conf-sample" "container-server.conf"
-	fi
-	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
-		newins "etc/object-server.conf-sample" "object-server.conf"
-		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
-	fi
-
-	fowners swift:swift "/etc/swift" || die "fowners failed"
-}
-
-pkg_postinst() {
-	elog "Openstack swift will default to using insecure http unless a"
-	elog "certificate is created in /etc/swift/cert.crt and the associated key"
-	elog "in /etc/swift/cert.key.  These can be created with the following:"
-	elog "  * cd /etc/swift"
-	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
-}