swift fix for CVE-2013-2161

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

6 files changed, 57 insertions, 138 deletions

diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog
index 7bd1d9e121e0..095823afd65c 100644
--- a/sys-cluster/swift/ChangeLog
+++ b/sys-cluster/swift/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/swift
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.8 2013/05/01 16:42:43 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.9 2013/06/14 22:11:19 prometheanfire Exp $
+
+*swift-1.7.6-r3 (14 Jun 2013)
+*swift-1.8.0-r2 (14 Jun 2013)
+
+  14 Jun 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +files/CVE-2013-2161.patch, +swift-1.7.6-r3.ebuild, +swift-1.8.0-r2.ebuild,
+  -swift-1.7.6-r1.ebuild, -swift-1.8.0-r1.ebuild, -swift-1.8.0.ebuild:
+  swift fix for CVE-2013-2161
 
   01 May 2013; Matthew Thode <prometheanfire@gentoo.org> swift-1.7.6-r2.ebuild,
   swift-1.8.0-r1.ebuild, swift-9999.ebuild:
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 266749e3b31d..719b2784047b 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -1,33 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX CVE-2013-2161.patch 664 SHA256 728949effcf3669658bb8017f89b1a3a6ed481cc74d2f2c8e4bb235ccde24ba6 SHA512 ac95d6cf50209ffcec48ad16ca730816d5891b4adc2f110bab5974c0d31f3062cb0cc5552f8440b602eb88ed15c78faa30afa9c58c00e05abf2714b5503a7cfd WHIRLPOOL 92db329e49df48745b6401b2fb64963f8548a29dcd530f3449cfe7fa1c38ae05e61fc05bf2250e73c85b295aba4362745faa58c458b5ed80ccce3ea0f0467e7b
 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.7.6.tar.gz 503775 SHA256 cf108786ecd0fbf1d2b7e422824d78210e17e93ec4a85c2be01c611092f95c14 SHA512 c549bafb25fac590dd76c5f17873e0921532dfc8542c450594788294e2c75253414ab2a5150d191b5b61b2c9b745bab4e30146d71c6b0c35714a8e3005dcd016 WHIRLPOOL ae8d6c0d6657473f2715f2ab70d823fe69e64dcc4d7b7b910d4f978df01ca7e0d14450cde297499a0b9f090c40ccfea82059cb12a4c888a5fbf09291cfdcb8a2
 DIST swift-1.8.0.tar.gz 556736 SHA256 613185473e0c6f11c77bdc6b65efee195303268117afd9024fee82ebde6ed8a3 SHA512 c7eb92b7b6c952633ccc519f0b9125d1f95db548885c3ccdeaf872f1729797dde1525bcd6f87a8b094cf54c256e472d8d2b11e52954391b1636dc3c966152d37 WHIRLPOOL af4a841829e1d3c2ba85fae97cd2364bb16697f7bccc32a5c419a15946950dc32c95fb86fab40b35ae96f8b3203e450e93c9b8806df265522ac67667ebf5a75a
-EBUILD swift-1.7.6-r1.ebuild 3490 SHA256 ca008bcf74287cfb8e51399cff409f6984a6a9345f5d886f273f07617853d773 SHA512 5f07e6bcb9a30d2ab0010238c30ae9d7768c647f821ba8bd7a6c98a04375a03be2ee84df0973fb6e134a19e7d2b7a8e2e42ebe0692f4e07545db1c570289a2a8 WHIRLPOOL 59170a265dd285d49f0afd76b019899aa4891ec344c555270acf018d473277b0577891a36394e7f1e008dcce012a7865e7590b0f781a87625d76e3a64a826cff
 EBUILD swift-1.7.6-r2.ebuild 3633 SHA256 4e00acff20822eb588c77b8252c72ed504781a7c6463fef3f93bb64a57c0d32c SHA512 fa4373490ef74ad27ce6b12eefcf8454fbc692aafddd27f59ad95728442d099195c9061a4b869ac1c318c81da99f87891766d7bda901bed04729184efc44e42b WHIRLPOOL 88e6204f8ee5a8eb2952fdd16978b747a0e0a8f6a08119237976ce59bd73799875008104528ee32f26c2dd824484e0052980c8bbd7827b5ce3eb85602cf689e5
-EBUILD swift-1.8.0-r1.ebuild 3920 SHA256 5262693ae499ef127cefc6dc1875612bcc9e3c1242bc5923b98ff5502a73d4e7 SHA512 9a3129fae3400bc5292a1196fe9f8e34b0e0a0e1a122c1c41bc3106605a609e5a5e8a2e60b7e6379128f4eb89e4a668ac419ef80ef9acf5dd54d23e20f51fe18 WHIRLPOOL ce9e1ae32bfeb08c0d3348f65eb516ab1bfc5cb6cbb36da245a9c09e55bf134713e9d2df22889d74040c75af4a0b7d44a7e252e759252d57d4ff1555480ce878
-EBUILD swift-1.8.0.ebuild 3774 SHA256 23568ef0fbd3542e40f8d9eda96fdffb581c5b156789814659743871dba950b2 SHA512 72705f49e3d6c4cb753a65c873353a6550bd7602da265eaf6af90ed649faf85341ccbeb7d0f63d0c04c046af7a033e39b0a51cf1da3c5ea394e845e5be49b1b0 WHIRLPOOL e62b60b791d471ab2c2acafaf695224fe23f2c68d5aecce9d90385f8a0d18fcb0dc31de30e2827217ebd3d3cb861dd360c5c9c946301e6097b58089e06d919f9
+EBUILD swift-1.7.6-r3.ebuild 3714 SHA256 36c72c7d909ae4a01a7d57bcbcf031aa32b74ddc8f8348fb48eed5798751649c SHA512 c5a76985799db87be8b4808e1b7ec512655a750897bce9363fb90671302ec4feb5509c5f8d4b46f7a3743ce7c4509f97c5401f65ddc9c36c28b02a158ab53e05 WHIRLPOOL 1d09055fe71ce16e7bc00115bbe7bec83f42dad972bbf63dc3b33f56e53268f044814f80f1b6a7e5cb3db1659cc74ff7c572376feac8c17d619ae4386ebba9bb
+EBUILD swift-1.8.0-r2.ebuild 4001 SHA256 e4a5ada179f773d1f27dab0cd15ee99fb8a890402661e1a4a3bfd082a788e8bf SHA512 e533a4f4306ba64c32a0c4a4ac66a000917ae968d0ae4820f5507807c65fb93c86032f0243af8e94b346a60c3d59e8086dd6eb0a32d3976a7e833ec0bb2b7f76 WHIRLPOOL 9ea0d5eb948d52b44af2450c7b0611309ac3f4e7aa01ea8a447b492352d52d9f4375e404db95947447b21bdb873e893cbc93d0e32df0cdb68a2df9e24a05e7e3
 EBUILD swift-9999.ebuild 3893 SHA256 531bbb8b7b8f6cc9b69e51a1e80bd56fa58ecf9c31f7cc902549c774e43b5980 SHA512 b71f69869bdc3fa3bdae88af7fdcd15a310f28912ddae9ab639be35db91dc4fbf049a2be5bca87bd8277d06287b2db8cd4a941223c85909390f01e00ce429395 WHIRLPOOL 66177e526818ebce34f91512b5a9542ee61b2e7b6c99082d7cc60af55ae9964db435e5299c99f3f7aa39a05420cbc107232cf474ce7e29aa0239eaded8d77d9b
-MISC ChangeLog 1649 SHA256 7b09e29c29823dd67b4ce292396f603624163c515f37a779999ec57e35d58009 SHA512 8d4ede2fcd1a929198f8d448d6e7945b52e589899b3071f459d45932992841c1eabec784ad897fdbf4828fa5fda51377c3fd6e8cade57745d6c9729de4fed311 WHIRLPOOL 9b1ff2a7d92ab2fc339643eab292661c86a4b718aee65c53ac3f146046d85424744da551e930e539543beb5fecb8b86f5afe74add118e941efd15d0a154d67c0
+MISC ChangeLog 1947 SHA256 1a381006dcf617ce4fc051297a002656065b4e184ddfe087508286ffb4ef4751 SHA512 46d0bd16dd84b75484eff877838981cd2a73620060cffcf141f5675063f234570df3435f7dcf039937d79299b956edf6f40117c1c6f2958d8b2ac1b2bcfd0fa7 WHIRLPOOL f71634acc1ace65eccf27b17043b855b8cb8818b4e84b2dbb07057a690ca9295ba441c44427e59c0782ba598a6d94be0db11ac8c76a52191c42d7845d214fefc
 MISC metadata.xml 694 SHA256 556c5cbba5f35997a06f1fb8225937b4d10d6c42540ea6263a58e8bdc27df514 SHA512 c23f67ab88832263600ee73a99ea4298043b11d397ea3375cd99e057af1d4d3dff397f510da1d5d6abb9b16cf6bca53c3fca0ea28c80627970a3da8f7076360d WHIRLPOOL f75febd6cc17191e3dab0dbe9a05f02c5bed3999549ae268968b39fc1fe0ccb62a47d881cd412bc14e67f5320a9fabb6d177359b936a62e219fe8362a18805c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRgUZHAAoJECRx6z5ArFrD3YkQAK652NTh3sMUALyxgF9FthFI
-14QDwOraul3DFJyUGI8GYlGaW72+XIn3bXqZw9a3RqAcyJBTlTFldByZIM3T0bZ5
-PeWU6pKqD0ugqWiqjJ9lf+dLQav6X+rbmM0N2wmxPuKC5mDD06/UApnpvX/JADFS
-hdfqkmNobixRfFQ5dKzI8sB5Bso/yI3Ug5v1sdaIx3ifWOiXQacRbfeiii4ADuno
-kwAeoAmQ19FcL44PqGkP1+dJ4qNIPuwkRTW/cPtGCbZ3iRou0OtAKPCKbtGlt1sY
-TU8dTjUpjNcpl1vG1JKxJHOZ2bMrDo7uW25Opa4cK2R8Iuw0JRb6CapR0pTaf09h
-cq42MYk8hV1wIpfVxvWy8mv21EQVfj+Nw3D9lkQEmJIzPCB1XLsLQpGJNg0IKjwE
-qdFgNvJb9PjntEeBpFFnC5IxtawfwpkiPJqSkNRHNOeaG9nBVM3JXsJUS1xf5X7B
-Ynf5290QqjTt9UfXwEcq888flrSQaC8m/+wTcTvFqVCtelBPm7qUkqhMm34PgMT9
-4stjwwzWSvqLgTcjz2IU/lHzIpzJXa8Kj3iRV4P4F9ZmUMKb1s9Qt77y5qjcaR5X
-zDaTCbssguJha55W68sRz8hh0J3WqyDkiGy9MwQAOJ1SHeWocEX9R2U5nbJ6YqlD
-sfF4WUBq9OHscRpsjjJl
-=8LDl
+iQIcBAEBCAAGBQJRu5UOAAoJECRx6z5ArFrDtsUQAJ+f13umNuQfdJcjRniSul1+
+/tw4N97P6n16EP/+K9nPg5nGjqXYv2tJmmL7G1E32tJ/cWd3bAAPXRjrGIKjW6+b
+CA7NYEX6GUN7KHKvv7VwUoSbl+GE8PSU1OyPVUvG7Le0iyl4T6SebSldFf1EMJFv
+YerPqYp4vqP8HRnZAaqsjdQHuVpwx1sAcIrsO2YsWPd5xI/7wydjeSr68p65eeFK
+rvab6gqZQ10I+gGMyi7vRIA5LJGCw9LUNkM0hllZvGs0wWEed5zLWQpIsTsONHXJ
+qV7jd0vtRHkOlUgY+zPOquJoSucW6XRoTsPkOxB77aJrqqbqiiTV9CXOOG/I7+T4
+kvb3bbPatjMK6kT77psymlyTCkkRTpLlg4U4xN+W3pQWQNRI+M49dqF6z8MiFAbo
+m6Lr7BltVxm6yeW1YdiG+Aaciltms3IhpLBkFlf3E8FDWbBRo0smT7E8euEfCnCM
+uytYKdOzn4ofVJnUZ3kkqXRhsivpYzGQN2XJk7T1nysQ+TIA+WeOG/jRrFHJObto
+8ZtV6AJWBOV3m/6gEl7pQ78m8cuZC3PgfxKd7Tt7GCOYWPiEbKaTvTntYef2XVdf
+iVcVl9TnssIrkn/7ERiRtPzLugsClQs90GEldMpoP6hT8+oHlMNtUyIzWjE3QWNm
+4YN5FEGkXDbj2wq3xHIZ
+=0V5v
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/files/CVE-2013-2161.patch b/sys-cluster/swift/files/CVE-2013-2161.patch
new file mode 100644
index 000000000000..19ff3b48e741
--- /dev/null
+++ b/sys-cluster/swift/files/CVE-2013-2161.patch
@@ -0,0 +1,13 @@
+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/swift-1.7.6-r1.ebuild b/sys-cluster/swift/swift-1.7.6-r3.ebuild
index 1ee3372c2610..e85db75bf929 100644
--- a/sys-cluster/swift/swift-1.7.6-r1.ebuild
+++ b/sys-cluster/swift/swift-1.7.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.7.6-r1.ebuild,v 1.1 2013/03/04 21:56:56 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.7.6-r3.ebuild,v 1.1 2013/06/14 22:11:19 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -36,7 +36,7 @@ RDEPEND="dev-python/eventlet
 		<dev-python/webob-1.3
 		>=dev-python/python-swiftclient-1.2.0
 		memcache? ( net-misc/memcached )
-		net-misc/rsync"
+		net-misc/rsync[xattr]"
 
 REQUIRED_USE="|| ( proxy account container object )"
 
@@ -44,6 +44,10 @@ 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-2013-2161.patch"
+)
+
 src_test () {
 	sh .unittests || die
 }
@@ -53,6 +57,12 @@ pkg_setup() {
 	enewgroup swift
 }
 
+src_prepare() {
+	sed -i 's/xattr/pyxattr/g' "${S}/swift.egg-info/requires.txt"
+	sed -i 's/xattr/pyxattr/g' "${S}/tools/pip-requires"
+	distutils-r1_python_prepare_all
+}
+
 python_install() {
 	distutils-r1_python_install
 	keepdir /etc/swift
diff --git a/sys-cluster/swift/swift-1.8.0-r1.ebuild b/sys-cluster/swift/swift-1.8.0-r2.ebuild
index b1eefbe11605..da8d5c9aa99b 100644
--- a/sys-cluster/swift/swift-1.8.0-r1.ebuild
+++ b/sys-cluster/swift/swift-1.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.8.0-r1.ebuild,v 1.2 2013/05/01 16:42:43 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.8.0-r2.ebuild,v 1.1 2013/06/14 22:11:19 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -45,6 +45,10 @@ 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-2013-2161.patch"
+)
+
 src_test () {
 	sh .unittests || die
 }
@@ -57,6 +61,7 @@ pkg_setup() {
 src_prepare() {
 	sed -i 's/xattr/pyxattr/g' "${S}/swift.egg-info/requires.txt"
 	sed -i 's/xattr/pyxattr/g' "${S}/tools/pip-requires"
+	distutils-r1_python_prepare_all
 }
 
 python_install() {
diff --git a/sys-cluster/swift/swift-1.8.0.ebuild b/sys-cluster/swift/swift-1.8.0.ebuild
deleted file mode 100644
index c5efc6846816..000000000000
--- a/sys-cluster/swift/swift-1.8.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.8.0.ebuild,v 1.1 2013/04/10 16:24:16 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info
-
-DESCRIPTION="A highly available, distributed, eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-SRC_URI="http://launchpad.net/${PN}/grizzly/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="proxy account container object test +memcache"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/nose[${PYTHON_USEDEP}]
-				dev-python/coverage[${PYTHON_USEDEP}]
-				dev-python/nosexcover
-				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
-				=dev-python/pep8-1.3.3
-				>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] )"
-
-RDEPEND="dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/greenlet[${PYTHON_USEDEP}]
-		dev-python/netifaces
-		dev-python/pastedeploy[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/pyxattr[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.0.8[${PYTHON_USEDEP}]
-		<dev-python/webob-1.3[${PYTHON_USEDEP}]
-		dev-python/python-swiftclient[${PYTHON_USEDEP}]
-		memcache? ( net-misc/memcached )
-		net-misc/rsync"
-
-REQUIRED_USE="|| ( proxy account container object )"
-
-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"
-
-src_test () {
-	sh .unittests || die
-}
-
-pkg_setup() {
-	enewuser swift
-	enewgroup swift
-}
-
-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"
-}
-
-#src_install()
-#{
-#	distutils_src_install
-#
-#	dodir "/var/run/swift"
-#
-#	if use proxy-server; then
-#		newinitd "${FILESDIR}/swift-proxy-server.initd" swift-proxy-server
-#	fi
-#
-#	if use storage-server; then
-#		newinitd "${FILESDIR}/swift-storage-server.initd" swift-storage-server
-#		newconfd "${FILESDIR}/swift-storage-server.confd" swift-storage-server
-#	fi
-#}