summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2014-01-18 06:34:12 +0000
committerMatthew Thode <prometheanfire@gentoo.org>2014-01-18 06:34:12 +0000
commit88f579053a855ee3732bf6b07549fa58ae729bee (patch)
tree1c677685275301ad66ea83255b13efd97b5fe507 /sys-auth/keystone
parentAdd hack for gnulib acl check when cross-compiling #333887 by Luca Barbato. (diff)
downloadgentoo-2-88f579053a855ee3732bf6b07549fa58ae729bee.tar.gz
gentoo-2-88f579053a855ee3732bf6b07549fa58ae729bee.tar.bz2
gentoo-2-88f579053a855ee3732bf6b07549fa58ae729bee.zip
the cve patches are in git, fixing build
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'sys-auth/keystone')
-rw-r--r--sys-auth/keystone/ChangeLog6
-rw-r--r--sys-auth/keystone/keystone-2013.2.9999.ebuild6
2 files changed, 7 insertions, 5 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/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() {