summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Thode <prometheanfire@gentoo.org>2014-01-18 06:34:26 +0000
committerMatt Thode <prometheanfire@gentoo.org>2014-01-18 06:34:26 +0000
commitc9f04db98f322cee25b97166d1e186e7a74a7bc5 (patch)
tree20978e2b58d99043fc59e9348c4b43a6a1719747 /sys-auth
parentAdd hack for gnulib acl check when cross-compiling #333887 by Luca Barbato. (diff)
downloadhistorical-c9f04db98f322cee25b97166d1e186e7a74a7bc5.tar.gz
historical-c9f04db98f322cee25b97166d1e186e7a74a7bc5.tar.bz2
historical-c9f04db98f322cee25b97166d1e186e7a74a7bc5.zip
the cve patches are in git, fixing build
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0x2471EB3E40AC5AC3
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/keystone/ChangeLog6
-rw-r--r--sys-auth/keystone/Manifest30
-rw-r--r--sys-auth/keystone/keystone-2013.2.9999.ebuild6
3 files changed, 22 insertions, 20 deletions
diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index d83fad1d8b81..25259a884638 100644
--- a/sys-auth/keystone/ChangeLog
+++ b/sys-auth/keystone/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-auth/keystone
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.55 2014/01/08 06:14:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.56 2014/01/18 06:34:12 prometheanfire Exp $
+
+ 18 Jan 2014; Matthew Thode <prometheanfire@gentoo.org>
+ keystone-2013.2.9999.ebuild:
+ the cve patches are in git, fixing build
08 Jan 2014; Mike Frysinger <vapier@gentoo.org> keystone-2013.2.1.ebuild,
keystone-2013.2.9999.ebuild:
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index f5e9f2572869..9b50950702ae 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -14,24 +14,24 @@ DIST keystone-2013.2.1.tar.gz 1404077 SHA256 1e52362557e5641e0dad580a68654d7813a
EBUILD keystone-2013.1.4-r1.ebuild 3153 SHA256 0a1ef5d65647f17dc70700d058d20cffc1379ca39f2a43d816ba9e260f9e686d SHA512 7b8288d4f205d2cd201ef6135aa1da527220d2b72896d24e0a99804091978adf88ca4a6a4d22f00acd3b199ffde73aa9ea259c253a582ccdfe0869c64a9151a9 WHIRLPOOL 94da411739945062ec72bb58cb78e718b673b7363e7999bd4be88f476aeedc9d0e66ab87fa6d8a116382c4e3bc8471defb5f7db4d389036bea56a78df2207839
EBUILD keystone-2013.1.9999.ebuild 3101 SHA256 58a93657711e2bd7fdd7a54f4e641ee87ad29f39211fea04a4bdbcd18fda8807 SHA512 d2ab9ab6aad68f468eb2606a7a439d77f39ea85d9f2e69eb6308439a6824e76845b52ba6eb4df19205635b730a0233998ed3c9a75f28d1c20eb11018f56b22df WHIRLPOOL 5bdadbaca00e25e8b8f595fa23a10bdce18c764d9f960f7ba5bc45d791bfc4567eeee7d65c51e25a6119cb4505316b18f1de8b65d5f4f22bcae3d1b181bd6715
EBUILD keystone-2013.2.1.ebuild 4818 SHA256 9af2916261db7765e8b1f0283d63d0d690509b8a133ab4d8ebebf97c0c831fb1 SHA512 a3c6132dd1f7646283a14a497dad7609a98ad2020508c778dc28db540da1db85a360117db168268a4ca50cbea8988b7f22df3c5c662665f79e85576ac97a93db WHIRLPOOL c5bfa14d1d157b1d9ae980fcf294cac3fb677812b8d6c05e8e2c26703aa6c3fdc4a17535e23968c09277d2b693c22f34cb31d8a7732af256a3d0d0f25d6b3e75
-EBUILD keystone-2013.2.9999.ebuild 4532 SHA256 e1858ca4008522eccffb2c9468ecce024b049120aa16c97f90e9c23aae50a18a SHA512 f3441bf49095366e8ec892bb469933f3c38cb1a12e56db65b7cc5ee7bcef60b1f696edcf5fc753cbb344dcf8df3cead1d2e7cef50511614763c8444378f2a843 WHIRLPOOL deb9d08bef7dd8184b20b51feb5ceff8bf41028e184d712dd57c146aaaa24af1eedc84c913dee9ae73edebd8d20c7f5a1d269f9d0d9b0a6c1df87dd665a10eaf
+EBUILD keystone-2013.2.9999.ebuild 4451 SHA256 5dbb66cb768ada1b5e51e48a59819d85a91d9cbc354bc71bcacc73040a2e7106 SHA512 8e9d8ba2a8f286ceda16d750414549df9640bb283e019ae68830484919e5c48539888d548ab7ea2c013a9d7eaaa0979e8a2fdd99d173859868ae0ac59ad15cc6 WHIRLPOOL 85c15dc2d375444ba966831789819c0bf304eaa19cc12fed7e2ddd4b8c2c3d7bff781edc753bf5cb3e2cde8fc4f1148482bbb39e5f8b2d1b2f153d8bc608aea7
EBUILD keystone-9999.ebuild 3057 SHA256 935d2e365eed7feb2e33d644c6e3c9cd2987286bdba757a62e0295213b521245 SHA512 dcbb6315d118186b2e41ca83957aa11d72c2f264f96d6d7e82df6097a3c54388440ed4b4e38ca340b10c5f56a7f4a5385995a52e7cafe665512408144963a3bc WHIRLPOOL d5809a8a54d41d01b0ca93ba24407a65375ac34a93242d2278b4d056eb4f916442b6f7d54f193c5a907d0b957a7c17c237e83abb7d24210f11d57f3e6c73616b
-MISC ChangeLog 11975 SHA256 0d7f1bd9e213a409bd0ff500d4592c62203cc02b0dee047388c2a028a66f4143 SHA512 95ad7e11c6cf6267ff92a0a48322fc6579b1f6749db1bf478f65b6e598ae8d5bd33523a9df763de4b93389f4c843028ebf3d218185830300d91731797d7d8d1c WHIRLPOOL 301df9c4f44227ffdb65b040dc5a533ddfdcd18a23e48f47c1e1c0e5ef04eb1bb11159a47bed47b04e44e5454f09a6b44431d19411ef6306b375ca82d3545ec1
+MISC ChangeLog 12115 SHA256 90fe8ee435fd9609a9b7c2712a1b366fdea25ae14bc5194d39be5f9a6f213599 SHA512 85b61cbe9cdf294a59e72a9528cbe89cbc7f828667e546b3b3b45814bc78ac2d558b98ec48f7067e899519829084c7331455f7209ab41f4b83eb7f827117ddf0 WHIRLPOOL bb97a538574ffdbbc6ba5a2a290cc19ccea240ab839299a047c06e665f421d8231fea5c2ad1c9b6bba1c2d815d82078bc37ca80636b45b70a93055aab2b5e1b3
MISC metadata.xml 424 SHA256 c89c0232e90df5d811d17941c1594e4c4c45db48c2b6240a3c62b232caad4e84 SHA512 9d7fcca89a6f35a93f1a57790103249cdc25424cbdb374bf26b691e81b27182dc3380a8ff67b77e7aabf4ce944e4a813d619838d4bc97086b4208e5312d76f11 WHIRLPOOL 4ec9d4c5ff5c484c341b06fe77fcac8e6fdd0e0b651dbd58b6f2d5aecd05db5bf70218b94733eb749ced7436f9df5ba5c93496bae06c0ff9a62b91ecb53ab77a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQIcBAEBCAAGBQJSzOzdAAoJEPGu1DbS6WIA9sQP/iyN1lgep6t1/HlBYsuPF/KH
-+O05wSsRSW7ESNSGBm7TrhDhThLdZr3xxVHwK6R0+t/FijCy4mVuizKcG4o3+UEB
-+RgeOsFhtlJXIQzCI+lBD45G/9jlcL3pHOIBiZMYNSxdzVd8XD39zcPdjSN+UiVm
-5G1deuebSSnuqvHYW6NASou9mLRDUSRzMNFVo/Oxt2oiSBo411R1dogZeOf30YgZ
-8ogmEwI+DEKcAKrNfdGGU6psi4sq5D+JlGiVOgUlzn2cFUpbGQkMAD/2oSKtRNtG
-hudSQV/+YFH3xK2FnQIWSAz+804+NBabZZZ4CIiZBsUqROIM+tuwAfKvDaFAzifB
-l5ROyR7ihNTGkIlfs3hhErLn0OXn5zRB9B+TYnl9TyL4Nhe43VD/D0pcYSKWDL0F
-XNj6pmMWTMSIj9z4HEOHjUt8J/KcFF5+1SS0oylcOTqlwJPkBuxP4qVqm43G9woB
-3jOu0cbXLMZ/Y7lC5MwlnUMeL4/Yuq2il2mlMRUKXKvLk1k+dodDgfoNUoJbcfRa
-BtaH5jJl2zjifb4mR0Fcrg2Q2j8u9hw5PclW3XspceQxBfb9arucMelzOzqVlzK5
-QesEvp0PVmrKxPSpEQxmZ7Oqn/99557pHuze5s54VdPV1fhMGcJYR+Le/GLgLMI9
-VjTH2Ya+Jx8oFkH+5O9f
-=rTn4
+iQIcBAEBCAAGBQJS2iCTAAoJECRx6z5ArFrDUbIQAMnROOV2jNP9vx/NNM18WnxG
+sgHs+mxozv/HYtiQBk2swCPQiXD7Y3E1lE+BpflMODY0gIS/Bw2Xi8pHYvlNtpM2
+4Bb0AVFlLhaSgKiPMxb4VwhNfQ/TB6Z6MqjlJPiONtY58xrPbV1FFODYxfPj+9jF
+LbKVQQ4B7lgK3ccZLbQMShE/lSiQE9kJIgMx5l8YqwBAuQ5rFu+y4CLkOyeksPFc
+vbEN9q7zwgpVnt5mUdILtiNXvGdHcvxYXMG7rMmPA8HPDij0jYzvPzM6reX0TAm7
+P4+D1G5lPT/DJihkct7FWqT9/FccDbQD6RTZjD4izF2ZrtKBzNQ9sJXJcZ+Vk8VR
+9T9Y2LVm74U4fWexNZnnnoCF0qHJbNd3hQ7dRFojDGWF2a0AAajvg6+om0/7C5Wj
+ZePWtKbLEYEqSXhZ/j5KEfIZFo9HN9Q4QGjzOeDahRoUX4/o+pe2SrMCrjSJxSRR
+usY9gZ1ycNSvBK5KYFc8kbDqIqzrQkfKGlBSbiGO2cT07Xf+hJr0eboruJmLMuQj
+8vctbgMpQZDmPI0G4Vbj79mHHr9QktWZbQLrUo/dZ31chwtH12eSsFp0QUKS2EsD
++COjlcYaeLPLE4dG8WsPtwhw2nKLg4RuXfJ8PrW+Iel9JTrmkPHJCBVXp/85J5Xd
+m4Xe+YNKq7RcGhQvAu/m
+=VEMf
-----END PGP SIGNATURE-----
diff --git a/sys-auth/keystone/keystone-2013.2.9999.ebuild b/sys-auth/keystone/keystone-2013.2.9999.ebuild
index 57307aaa5bcf..c2cd99ae1275 100644
--- a/sys-auth/keystone/keystone-2013.2.9999.ebuild
+++ b/sys-auth/keystone/keystone-2013.2.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.9999.ebuild,v 1.7 2014/01/08 06:14:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.9999.ebuild,v 1.8 2014/01/18 06:34:12 prometheanfire Exp $
EAPI=5
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/openstack/keystone.git"
EGIT_BRANCH="stable/havana"
LICENSE="Apache-2.0"
-SLOT="havana"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+sqlite mysql postgres ldap test"
REQUIRED_USE="|| ( mysql postgres sqlite )"
@@ -76,8 +76,6 @@ RDEPEND=">=dev-python/python-pam-0.1.4[${PYTHON_USEDEP}]
<dev-python/pbr-1.0[${PYTHON_USEDEP}]"
PATCHES=(
- "${FILESDIR}/2013.2-CVE-2013-4477.patch"
- "${FILESDIR}/cve-2013-6391_2013.2.patch"
)
pkg_setup() {