removing old, vulnerable versions

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

10 files changed, 23 insertions, 663 deletions

diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog
index 6337414f65f8..d447df8e1dc2 100644
--- a/sys-cluster/swift/ChangeLog
+++ b/sys-cluster/swift/ChangeLog
@@ -1,6 +1,13 @@
 # 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.35 2014/11/18 19:27:57 prometheanfire Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.36 2015/01/13 03:24:49 prometheanfire Exp $
+
+  13 Jan 2015; Matthew Thode <prometheanfire@gentoo.org>
+  -files/CVE-2013-2161.patch, -files/CVE-2014-0006-havana.diff,
+  -files/CVE-2014-0006-master.diff, -files/CVE-2014-3497-1.13.patch,
+  -swift-1.13.1-r1.ebuild, -swift-2.0.0.ebuild, -swift-2.1.0.ebuild,
+  -swift-2014.1.9999.ebuild:
+  removing old, vulnerable versions
 
 *swift-2.2.0 (18 Nov 2014)
 
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 7f27dc6cb061..3d28fae7f8e3 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -1,40 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX CVE-2013-2161.patch 664 SHA256 728949effcf3669658bb8017f89b1a3a6ed481cc74d2f2c8e4bb235ccde24ba6 SHA512 ac95d6cf50209ffcec48ad16ca730816d5891b4adc2f110bab5974c0d31f3062cb0cc5552f8440b602eb88ed15c78faa30afa9c58c00e05abf2714b5503a7cfd WHIRLPOOL 92db329e49df48745b6401b2fb64963f8548a29dcd530f3449cfe7fa1c38ae05e61fc05bf2250e73c85b295aba4362745faa58c458b5ed80ccce3ea0f0467e7b
-AUX CVE-2014-0006-havana.diff 2400 SHA256 c639027cfe28bba61d6993d506868034c901748858c19666d10541e50a9caadf SHA512 436ddbe29e89eec3d5695b68fa91eb52f4ba6961433a9aeea13d9970e186f087dca35dff500158fddc114925134e3e64a82e13d5f191c84df142e71349e4cfac WHIRLPOOL f27c76330601ee4cb7a230aefd01ca03c0bbe7e0195f9bb78ce952b287dbdc3a360de049838fe159e4363334c230b257cd7f5c959d73a8c68558c244ba0287fd
-AUX CVE-2014-0006-master.diff 1341 SHA256 a43596a5244c99a8ee636e9a3541e8096627fde8c25542213151bfe8af4ef055 SHA512 ff309f6aab878b1e1e9d102f91a84a1a8a75f5150491617f4e4242864858eaf1df2c13fed1210bcfda4c7ebd93ecd2b11adecc52cea75600cec59f6017c83418 WHIRLPOOL 4eaa3c5f41a1f962fe0f1e052db4e92b2b9eb3fa40911f020fbb25fba08c7c799cb3ffe86d751705e687fc6d6e13114b0bd841afaf720d9d6bb63f7d7e7cb056
-AUX CVE-2014-3497-1.13.patch 3655 SHA256 ec2fda0313ad4c2ac3f94601926d4e0a2684921120dbc260b6202efa8bcdbcb8 SHA512 7932b7f7d2a785f1af7d39d11581637df6dcf5bc8692bba7281f1b26e7599e45da530801cd3f7143c1e98f4bfb1bfc76ab1f6310200fb89eeaf615911984abc1 WHIRLPOOL a799aa1b68b47573f4abad130a2a1728c074b4eec3311a802b6fd5cef3a94e2f4f2264d1bad9d80a6dd2157b1de66048fbcb5c5dadfb1e34d0c0852e7e8fb5e9
 AUX swift-account.initd 995 SHA256 f1d4594504b53de480abc69ccb72d37e002ad85118b9d90df12bfda42f4b5faa SHA512 93fcd08508f3efd4d1a75aa51c20b256a0f8c34f9b6ee27501d14376efd7a55e28ffd20fbf91b6406883603fc145e80c39d714b6eaa168fbf4a8c5be7ea63368 WHIRLPOOL ff3c69ad4801d742082dbe7131330b2fb154d1b30c8abfd688234a9f955515c9a1ffceb0ced432b1dd81d375e32e8416fa64b9d45eb199af4cc0ba3aa3c87e1a
 AUX swift-container.initd 1007 SHA256 aba09a5e3396f79c5e49a258c283d37652e182ac62ef8952618ad32b4df1db86 SHA512 1202212955a6a0836abee2c8a2190e359c910037c2f38dbf6874253b21c0739548d9f48c75e3333d0d73376e35c43866b8d0dc38990d4d3b99c04efaab2407c2 WHIRLPOOL d1dc6e468fdd3ab616a53b5357dad09ef089927347a59b95961e7e6b395eec43dedef059fed8eed06f8f324ff0ec7121023953156dcf2266e00dc947aeb8da98
 AUX swift-object.initd 989 SHA256 19a252739dca026435b0a861eea10ff76c22a41ec71d94cc6ce3dddd70b5df58 SHA512 1982f2f76df5d279c51a0a2fd5619dd12a6899559761ac7c0013aa5e5098058430e1a8dcc7cf46d5081bd6dffa17e4223de9b6a85bea4cddaf495b3ca91bacc9 WHIRLPOOL d2a16db387e6d3ff3452854672b5a9c64f03f485d3ddf7e2e67aa51dcb4aa4ab80fd375158dac99943f6c52fefc233cce503be26617110765fc859d82d6b01ab
 AUX swift-proxy.initd 1505 SHA256 8e1ee2051116e869f5e51de426d640c7f57278f1fc2681bd80ec9393fa834c92 SHA512 a030a5b8ceedb69f89fca93abdd08d9f527d2789ed9983f7cca616b4a318176f84913e1d01ed09d5a1a9e55bd0d697d501f5698ea5b3f8ccce7f76b95984dff1 WHIRLPOOL e8653ceb1e19fead4b0941d158661fe6e81d66c71f032aa1be7aa56dd839d43a82adb090a7e509142bfa9a341c49fdf82c8f86e3a9159be63b538b588cca6e66
-DIST swift-1.13.1.tar.gz 802273 SHA256 cbe6e807c0c0115570fc3da4dd7e3f3c2477fb48f865f29d648fb5714734eabd SHA512 3a18df9bb440723ff88429bea215b25b2d3790193bb1e0bef155c8cb9c260db79099794145ab7bd3a99eb25e8441cf527c82a803408078212ca0145cab8c2258 WHIRLPOOL ba10c6e110eb6b7de99b6f6733e05bb092837ce3e6aefdc0a74a9fc693625dbf3f182e8c637dbfc07d3f6ecca8fa26aebc89ba65917d952551793b28689f9523
-DIST swift-2.0.0.tar.gz 947369 SHA256 2dbe98186d6c78ab3e57708dfd46416f3a33001d94322b33e8f7a0c722a976b4 SHA512 c7f81771ae76d2b86da80d3c199a4bea84f2fe9968adaac658d56c4717c3f33f0de9e01e8bceaaa1875762ce28a943eee80f33d84e1bbe966e0e95750c01bc72 WHIRLPOOL 5db150dd48611eacc179066b633a8fe3ecd2d7e76b3dd8a76438027a79729df07ef0b189b88623505e645efd3d146a6b1b1e74dd7a2c57acee1fb88f239addfd
-DIST swift-2.1.0.tar.gz 957329 SHA256 8e4ce540fb8221a010190dc901cb076578de18b1b370bec38d3cf9739e664dd5 SHA512 4b064d00b18276a2669ba212fafddbaa03000caa8c88032f306e568e2ae100197b98f66eb4f1232a7ddab6b6a389d92455e0f76e501104e2445c9375ec047128 WHIRLPOOL 69231b596c7332dfc4b9bb905d184192cda9dd40903521de229e583ff5dd5c3c9daccc0b1d1b6a5068c373d55fb0a8fdae6f56bf881edfe6608482f8fe66b9c8
 DIST swift-2.2.0.tar.gz 996021 SHA256 be3bc94faf57af64f689bbe65855624ea711ada1eaf55d234a0536d76b3065f7 SHA512 606eaa777dea842588d59b3e751e346d144fa82312c40d62e7158f148da364686d29524fc7f5f1b3b9b3aab88332fa4a0515bb2fba5bcd310a2a0aa8572beaf6 WHIRLPOOL 8922e70afc797664e1aa70b5d43493c92ca7c44c3143fe028474b796cb76724b502db3d95a885e7c3bf427e1313a32c14844c103d9a260a841cb21d7637ad355
-EBUILD swift-1.13.1-r1.ebuild 4015 SHA256 e4d8f924f067ac8f6061d895e05cad1797d4556bbe642eb9257a29702a929a83 SHA512 4ff489f2a40719d5b3663cf8d353ded1238a11820744130a5c035b91fb5d55a0651ba09f8ae91bf5bceb5ac7a2f38b22118c0b63266ae882ada8c0eeb8e8ce2a WHIRLPOOL cd07326709cfa9d3e3036b21713e29ecb162115c0025a2fbb8c01d814c7864a6dd13620683e435699da24598771a1b28aae86bb07c6b6d94fef32ea366c1aaa1
-EBUILD swift-2.0.0.ebuild 4073 SHA256 b4f1b6e9b412562df4425d69164c68601cef9cacde83d4cded98f6e50b7ee367 SHA512 8cdfd3e297103699e3a6105575aff6a70c7eba93cba938ec1af59b7db9cd6641e5ff5747d6391ee6ad9a917231ae8a1344734ac865bd22bf4c8e34d187d27015 WHIRLPOOL 1893469bd42290b058a6b0824d6e3fdce0508214e0621185c61d75b3cfae19f023ed5bd8b2b266fdd75c4fec54a69c0340726a7adc5fd03e02a3ecc5749f69e1
-EBUILD swift-2.1.0.ebuild 4118 SHA256 37c4249e7a75b37f66bd7231151e67fbc509a7c66e5fb3de0427828639560621 SHA512 3e7930d3004e05093a320311c667975e0eb0357356d90ff2c4266f23d1ba4ce1fbc0d2560d1bfd5f5469c17f173a558f37d353941f0b653b1d95534f87c0a61a WHIRLPOOL 9e4231b6ed471bf6c35614cfdb60139e2fa4a89ea019051d625bd4c4403b3ce67bda692b6a8b519ea149d14b567e61b1ab71c7ef8d51d6a7933287a6b8f81240
 EBUILD swift-2.2.0.ebuild 4118 SHA256 1b8fff08bd913c6b75c9484cdf54549530d155d106b2c1c1577f17f95432e8e5 SHA512 def7126e0817d2445b3b68ed61a353db13656cff35a9893477d57613382a59fcf4cb618fcfe4b254c8dd6fe6ebce4e4ea87df00c90a907285b2c04a3da06315a WHIRLPOOL 42c139e41ffc6f6362a4753804fe48f0d1d57221d913723cffa7482c491e18a5bc1c350726d7af9400fb1d08ec881583b7f33e363f56c5a66be10a5e0221bcf1
-EBUILD swift-2014.1.9999.ebuild 4032 SHA256 320e03538a0367f7bde7818d66e2e6b6989204e3b0cc126ba60ec22c09695390 SHA512 78822409e7eb54934325428a55222c134d800911ae4b61a90038e5ec0b986028a426cc89a82148d77ed2b97022c956ddaf21b359449a4a480218d41e40ba6037 WHIRLPOOL e6f0b10e8ea003d0973100e2eee2d735654d397ed6c3e2d9e40cdc1451c8c59e151a28412c6a7810bf1406ae5024429188d476f54dbd0c168b1182fb0d8ebc60
 EBUILD swift-9999.ebuild 3995 SHA256 0e9b13e7327e541b2afd5cce0b25118452d2df36a0b00355b4a1bf78af07ea8f SHA512 b9dfadc3a915c5c24c6ed34415023f06ce0e736f5a892b8266311eb79a7c81f722750f5356aa7fbf2709594517df61fd1c78cb6816b98bc8f15efdfb16f73f61 WHIRLPOOL 9319a30f1c3320a81fb6c13770ca7852f2eda5f1d589a3c6d02d9c4154af6d35d6c5609a86affaf602f15774dcb4302b12ee29aa64420a114630b321ed9b194b
-MISC ChangeLog 6409 SHA256 dc2b5deb77ce22446daeed5653d74f13410c21f0c8399e21f23470273138a133 SHA512 de82987f14fbf5fb61e1d4471437de11c9313a4167f963013a7f522b9989d985d3b5202e6f8c66cc1b2988ba026cca1e604355a0b4150d734783531ad407a9fa WHIRLPOOL e79ad804d6b56891ec589a4f0bb58040a6d764961bb1e30d271d10311a3c97d02727aac6af88fca448b889ada1a6e408e4187758ee4e4f0bf03fee0d337d3d53
+MISC ChangeLog 6734 SHA256 c2f4a2e3f37dfdce5e54485277fe7b0eb406bfc235f40eb75e9161fdd80d92f5 SHA512 83751e4da2b487df1fd4e5b2a0213a4c47325bcfe3d4eb34b746426c1125dd7f1606ec73e0f1a6c1264e99087a950464f04f4e08ecab7f944fd17449f1458704 WHIRLPOOL 4031458db03e811b82c82095078f93d1594d92804a383f65806a04ac3aebc86b2445453f2223e5068b0a8a995a2458d9542b3021c27b4205aa1cbea4bca5d7e3
 MISC metadata.xml 718 SHA256 3b5950b308bb7bff9c0b1e1df0ec6d2616a42225c6a60f8d23f8774cf3dcb0d8 SHA512 e86d128b5c6ccacfcb8032d33cc1a7e00ecfaa1d0e1fe325ef067f0073a5d411e27e84f89e7f843a7d242d8aca2163978f08f71f91bef43675adb5156d4716df WHIRLPOOL 8fdfc74a8b54c32edc06618e7ac59227a79ab24b32ee8757f14cd2dbed49786422bed58b4dce1808397856604027d0a148f74bb0d0e97cbaa232030fb93e0454
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUa53zAAoJECRx6z5ArFrDlroP/3982+8MdYG5FU61g8q5p79D
-qEk9pAzk+KX04tAqiFQjhsx2fBPeh8vK74+Fi/w2axVvuImIW0F2dqeO4aUmhvxl
-DonG4Mm17QXJQtvQ0BcFEi76MWyF+eAHN77Eii2AjdNyB/WwNKBMpcedHFI44a/b
-s32VQ3YzMmnKP1lF5fQUh3ygGj4OhZQVI7BXCPABv+VNI0Mh1s6LDVRaz3V0Ba9p
-LK//lWQ3a7+aZmwABfx4/tkevK/dy1CkiGqMXmEECZ0uejOPweYPwHO4EC/6S4GN
-rYMrVsq5c6DN6Md0XCPXUbaTFpClf4nIHqGe+5baXDDnUN1wjeki6vr0CDPUk0Gb
-tAZGCEXk0kq81Eu0TOQSe8Xr0JNOXs4ADTyp3GIQHtwFPD6jSrqj4oeAGwTehnQj
-8xlvmYdaQYKSTAD1ENqEy+BXRvI/VUKTOUEoT57SbxzaxxR4cY7v3OFmx1ZdG6cN
-+rlWsdi/ygMPgAi6DD1WcQVPGww988uvkHXFWzAoSkFmIWm8X5LRBkvqdU7ZOwpT
-J73FCWaPRx71DWAHKbxtXNIHr2cwiveasnGDwX/27Qr9JbebDy4dijDzL2mtcu3r
-/aK2nN1fz0VJMA3goIDaZW1Rr9y75GfXbQt2Rtj/SfeEEE3FhCFwL4SwswkMUKgi
-BF+tnLykQCqPVBSKaFuY
-=MLQ9
+iQIcBAEBCAAGBQJUtJAKAAoJEGSje+quGaTozWcP/jqULHHk+rPbdVcyeVwMfchg
+4tRtlH/0bWKLIEZa/XVu4usiIXy/SgrGrNZNJl4LJc3U4CfEOuyQH3+czea4WIs+
+QhhxJLw47XHwyZcFFOg7tQUCn7x5/Ltjb2BgZpbwR6XShKciEdzQifZI2x6PZmgD
+TtuSXfPF3Jw/yYgEJQvmo7UMXgyHnbH8/NpXgAfqjjT4qo8iuD+zFWEhqf1b4f/A
+ha6S7L6pYg/z69HIf5hvV0V712PV85cBcdgtmhwe06SXBzqxbB7mqNeggiacNDr1
+gFU5tQkEOCfzdugipJs/5VZoGooWi+vLPEWfoyz5pm+DzqyjjcZdIdhBPfMlfJKV
+n+MXlDnb41ZlYlCbarq/XBQ133YCJhO/H7z9029BZxxHWdkzngcfa3/qqEk6CBoC
+xp5ZZYL39V6l0AModTTdt80sUqPf4vYpvBkDGePExwmoXIqmlpKDySvf29fAFvbF
+7dVK/ZzzKrgxbz7tzJccch8MD0SnAdssq8Ky8XzeEe5lgpHcrfGT+fr2enHdfow/
+HTXMm/6kawqYJPptWpBjV9ociZhobuNz3T8bEdkb1/fuzVB2aSA+hUyEoe2DFDip
+1xv4H1zM362rt8rXT10euEL4XwJjbr0F09y/o7dQNzZsxGUvwakdlZZcBtbRAOtd
+Pg317aV76tWODjjxwRmb
+=hNKt
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/files/CVE-2013-2161.patch b/sys-cluster/swift/files/CVE-2013-2161.patch
deleted file mode 100644
index 19ff3b48e741..000000000000
--- a/sys-cluster/swift/files/CVE-2013-2161.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/swift/account/server.py b/swift/account/server.py
-index 4c08fc1..8acd5f5 100644
---- a/swift/account/server.py
-+++ b/swift/account/server.py
-@@ -253,7 +253,7 @@ class AccountController(object):
-             account_list = json.dumps(data)
-         elif out_content_type.endswith('/xml'):
-             output_list = ['<?xml version="1.0" encoding="UTF-8"?>',
--                           '<account name="%s">' % account]
-+                           '<account name="%s">' % saxutils.escape(account)]
-             for (name, object_count, bytes_used, is_subdir) in account_list:
-                 name = saxutils.escape(name)
-                 if is_subdir:
diff --git a/sys-cluster/swift/files/CVE-2014-0006-havana.diff b/sys-cluster/swift/files/CVE-2014-0006-havana.diff
deleted file mode 100644
index e0c0634f6e1c..000000000000
--- a/sys-cluster/swift/files/CVE-2014-0006-havana.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 6c378b4b65524ea3b485c47d829ed0aebbdb86c0
-Author: Samuel Merritt <sam@swiftstack.com>
-Date:   Fri Jan 3 09:26:11 2014 -0800
-
-    Backported tempurl const time compare for 1.10.0
-    
-    Change-Id: I6db8f9a568dab8403ed74a83ba0c9548f06425e1
-
-diff --git a/swift/common/middleware/tempurl.py b/swift/common/middleware/tempurl.py
-index ffc1431..ae2f4a1 100644
---- a/swift/common/middleware/tempurl.py
-+++ b/swift/common/middleware/tempurl.py
-@@ -98,7 +98,7 @@ from urlparse import parse_qs
- 
- from swift.proxy.controllers.base import get_account_info
- from swift.common.swob import HeaderKeyDict
--from swift.common.utils import split_path
-+from swift.common.utils import split_path, streq_const_time
- 
- 
- #: Default headers to remove from incoming requests. Simply a whitespace
-@@ -267,17 +267,20 @@ class TempURL(object):
-         if not keys:
-             return self._invalid(env, start_response)
-         if env['REQUEST_METHOD'] == 'HEAD':
--            hmac_vals = self._get_hmacs(env, temp_url_expires, keys,
--                                        request_method='GET')
--            if temp_url_sig not in hmac_vals:
--                hmac_vals = self._get_hmacs(env, temp_url_expires, keys,
--                                            request_method='PUT')
--                if temp_url_sig not in hmac_vals:
--                    return self._invalid(env, start_response)
-+            hmac_vals = (self._get_hmacs(env, temp_url_expires, keys,
-+                                         request_method='GET') +
-+                         self._get_hmacs(env, temp_url_expires, keys,
-+                                         request_method='PUT'))
-         else:
-             hmac_vals = self._get_hmacs(env, temp_url_expires, keys)
--            if temp_url_sig not in hmac_vals:
--                return self._invalid(env, start_response)
-+
-+        # While it's true that any() will short-circuit, this doesn't affect
-+        # the timing-attack resistance since the only way this will
-+        # short-circuit is when a valid signature is passed in.
-+        is_valid_hmac = any(streq_const_time(temp_url_sig, h)
-+                            for h in hmac_vals)
-+        if not is_valid_hmac:
-+            return self._invalid(env, start_response)
-         self._clean_incoming_headers(env)
-         env['swift.authorize'] = lambda req: None
-         env['swift.authorize_override'] = True
diff --git a/sys-cluster/swift/files/CVE-2014-0006-master.diff b/sys-cluster/swift/files/CVE-2014-0006-master.diff
deleted file mode 100644
index bf545908434b..000000000000
--- a/sys-cluster/swift/files/CVE-2014-0006-master.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/swift/common/middleware/tempurl.py b/swift/common/middleware/tempurl.py
-index c9b9d94..5748694 100644
---- a/swift/common/middleware/tempurl.py
-+++ b/swift/common/middleware/tempurl.py
-@@ -106,7 +106,7 @@ from urlparse import parse_qs
- from swift.proxy.controllers.base import get_account_info
- from swift.common.swob import HeaderKeyDict, HTTPUnauthorized
- from swift.common.utils import split_path, get_valid_utf8_str, \
--    register_swift_info, get_hmac
-+    register_swift_info, get_hmac, streq_const_time
- 
- 
- #: Default headers to remove from incoming requests. Simply a whitespace
-@@ -284,7 +284,13 @@ class TempURL(object):
-                                 request_method='PUT'))
-         else:
-             hmac_vals = self._get_hmacs(env, temp_url_expires, keys)
--        if temp_url_sig not in hmac_vals:
-+
-+        # While it's true that any() will short-circuit, this doesn't affect
-+        # the timing-attack resistance since the only way this will
-+        # short-circuit is when a valid signature is passed in.
-+        is_valid_hmac = any(streq_const_time(temp_url_sig, hmac)
-+                            for hmac in hmac_vals)
-+        if not is_valid_hmac:
-             return self._invalid(env, start_response)
-         self._clean_incoming_headers(env)
-         env['swift.authorize'] = lambda req: None
diff --git a/sys-cluster/swift/files/CVE-2014-3497-1.13.patch b/sys-cluster/swift/files/CVE-2014-3497-1.13.patch
deleted file mode 100644
index 9164933849b5..000000000000
--- a/sys-cluster/swift/files/CVE-2014-3497-1.13.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-https://review.openstack.org/gitweb?p=openstack%2Fswift.git;a=commitdiff;h=b223322ed1ef44f61490f820240aa01f1047ae2e
-author	John Dickinson <me@not.mn>	
-	Sat, 7 Jun 2014 02:46:41 +0800 (11:46 -0700)
-committer	John Dickinson <me@not.mn>	
-	Thu, 19 Jun 2014 06:28:33 +0800 (15:28 -0700)
-HTTP header values should be quoted. Since the WWW-Authenticate
-header value contains user-supplied strings, it's important to
-ensure it's properly quoted to ensure the integrity of the protocol.
-
-Previous to this patch, the URL was unquoted and then the unquoted
-value was returned in the header. This patch re-quotes the value
-when it is set on the response.
-
-This is filed as CVS-2014-3497
-
-Fixes bug 1327414
-
-Change-Id: If8bd8842f2ce821756e9b4461a18a8ac8d42fb8c
-diff --git a/swift/common/swob.py b/swift/common/swob.py
-index 638086e..f4f38c7 100644 (file)
---- a/swift/common/swob.py
-+++ b/swift/common/swob.py
-@@ -1203,7 +1203,7 @@ class Response(object):
-                 realm = 'unknown'
-         except (AttributeError, ValueError):
-             realm = 'unknown'
--        return 'Swift realm="%s"' % realm
-+        return 'Swift realm="%s"' % urllib2.quote(realm)
- 
-     @property
-     def is_success(self):
-diff --git a/test/functional/tests.py b/test/functional/tests.py
-index ad8c398..7983815 100644 (file)
---- a/test/functional/tests.py
-+++ b/test/functional/tests.py
-@@ -333,6 +333,19 @@ class TestAccount(Base):
-             self.assertEqual(sorted(containers, cmp=locale.strcoll),
-                              containers)
- 
-+    def testQuotedWWWAuthenticateHeader(self):
-+        conn = Connection(config)
-+        conn.authenticate()
-+        inserted_html = '<b>Hello World'
-+        hax = 'AUTH_haxx"\nContent-Length: %d\n\n%s' % (len(inserted_html),
-+                                                        inserted_html)
-+        quoted_hax = urllib.quote(hax)
-+        conn.connection.request('GET', '/v1/' + quoted_hax, None, {})
-+        resp = conn.connection.getresponse()
-+        resp_headers = resp.getheaders()
-+        expected = ('www-authenticate', 'Swift realm="%s"' % quoted_hax)
-+        self.assert_(expected in resp_headers)
-+
- 
- class TestAccountUTF8(Base2, TestAccount):
-     set_up = False
-diff --git a/test/unit/common/test_swob.py b/test/unit/common/test_swob.py
-index 7cc5439..b0452b9 100644 (file)
---- a/test/unit/common/test_swob.py
-+++ b/test/unit/common/test_swob.py
-@@ -601,6 +601,28 @@ class TestRequest(unittest.TestCase):
-         self.assertEquals('Me realm="whatever"',
-                           resp.headers['Www-Authenticate'])
- 
-+    def test_401_www_authenticate_is_quoted(self):
-+
-+        def test_app(environ, start_response):
-+            start_response('401 Unauthorized', [])
-+            return ['hi']
-+
-+        hacker = 'account-name\n\n<b>foo<br>'  # url injection test
-+        quoted_hacker = quote(hacker)
-+        req = swift.common.swob.Request.blank('/v1/' + hacker)
-+        resp = req.get_response(test_app)
-+        self.assertEquals(resp.status_int, 401)
-+        self.assert_('Www-Authenticate' in resp.headers)
-+        self.assertEquals('Swift realm="%s"' % quoted_hacker,
-+                          resp.headers['Www-Authenticate'])
-+
-+        req = swift.common.swob.Request.blank('/v1/' + quoted_hacker)
-+        resp = req.get_response(test_app)
-+        self.assertEquals(resp.status_int, 401)
-+        self.assert_('Www-Authenticate' in resp.headers)
-+        self.assertEquals('Swift realm="%s"' % quoted_hacker,
-+                          resp.headers['Www-Authenticate'])
-+
-     def test_not_401(self):
- 
-         # Other status codes should not have WWW-Authenticate in response
diff --git a/sys-cluster/swift/swift-1.13.1-r1.ebuild b/sys-cluster/swift/swift-1.13.1-r1.ebuild
deleted file mode 100644
index 359d5c792530..000000000000
--- a/sys-cluster/swift/swift-1.13.1-r1.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-r1.ebuild,v 1.1 2014/06/24 09:49:27 idella4 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-3497-1.13.patch )
-
-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"
-}
diff --git a/sys-cluster/swift/swift-2.0.0.ebuild b/sys-cluster/swift/swift-2.0.0.ebuild
deleted file mode 100644
index 3e222578f7e8..000000000000
--- a/sys-cluster/swift/swift-2.0.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-2.0.0.ebuild,v 1.1 2014/07/08 23:30:31 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}/juno/${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-1.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/netifaces-0.10.0[${PYTHON_USEDEP}]
-		!~dev-python/netifaces-0.10.1[${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=(
-)
-
-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"
-}
diff --git a/sys-cluster/swift/swift-2.1.0.ebuild b/sys-cluster/swift/swift-2.1.0.ebuild
deleted file mode 100644
index 4018359045a2..000000000000
--- a/sys-cluster/swift/swift-2.1.0.ebuild
+++ /dev/null
@@ -1,116 +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-2.1.0.ebuild,v 1.1 2014/10/11 22:15: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}/juno/${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/oslo-sphinx[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.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/netifaces-0.10.0[${PYTHON_USEDEP}]
-		!~dev-python/netifaces-0.10.1[${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=(
-)
-
-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"
-}
diff --git a/sys-cluster/swift/swift-2014.1.9999.ebuild b/sys-cluster/swift/swift-2014.1.9999.ebuild
deleted file mode 100644
index d43b3ee08a35..000000000000
--- a/sys-cluster/swift/swift-2014.1.9999.ebuild
+++ /dev/null
@@ -1,113 +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-2014.1.9999.ebuild,v 1.1 2014/04/28 01:22:27 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils git-2 linux-info user
-
-DESCRIPTION="A highly available, distributed, eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-EGIT_REPO_URI="https://github.com/openstack/swift.git"
-EGIT_BRANCH="stable/icehouse"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-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"
-}