[openstack-keystone/el6-grizzly: 2/2] Merge branch 'master' into el6-grizzly
Alan Pevec
apevec at fedoraproject.org
Mon Dec 3 18:26:20 UTC 2012
commit 6a8ae1caf2a65752fffadcd32892e52e579e09ad
Merge: 20e9e45 3a93439
Author: Alan Pevec <apevec at redhat.com>
Date: Mon Dec 3 19:06:42 2012 +0100
Merge branch 'master' into el6-grizzly
.gitignore | 2 +-
0001-fix-man-page-build.patch | 137 --------------------
0001-match-egg-and-spec-requires.patch | 4 +-
0002-add-Quantum-endpoint-in-sample-data.patch | 39 ------
0002-fix-sphinx-warnings.patch | 67 ----------
0003-add-Swift-endpoint-in-sample-data.patch | 39 ------
0003-match-egg-and-spec-requires.patch | 34 -----
...ify-calling-process-we-are-ready-to-serve.patch | 29 ----
...Fix-default-port-for-identity.internalURL.patch | 28 ----
openstack-keystone-newdeps.patch | 8 +-
openstack-keystone.spec | 32 ++---
sources | 2 +-
12 files changed, 22 insertions(+), 399 deletions(-)
---
diff --cc openstack-keystone-newdeps.patch
index 899be79,0000000..0bdc51f
mode 100644,000000..100644
--- a/openstack-keystone-newdeps.patch
+++ b/openstack-keystone-newdeps.patch
@@@ -1,49 -1,0 +1,49 @@@
+--- keystone-2012.2/keystone/__init__.py.newdeps 2012-02-29 11:16:06.000000000 +0100
++++ keystone-2012.2/keystone/__init__.py 2012-03-01 22:42:08.546503618 +0100
+@@ -0,0 +1,29 @@
++import sys
++import pkg_resources
++
++# If there is a conflicting non egg module,
++# i.e. an older standard system module installed,
++# then replace it with this requirement
++def replace_dist(requirement):
++ try:
++ return pkg_resources.require(requirement)
++ except pkg_resources.VersionConflict:
++ e = sys.exc_info()[1]
++ dist=e.args[0]
++ req=e.args[1]
++ if dist.key == req.key and not dist.location.endswith('.egg'):
++ del pkg_resources.working_set.by_key[dist.key]
++ # We assume there is no need to adjust sys.path
++ # and the associated pkg_resources.working_set.entries
++ return pkg_resources.require(requirement)
++
++replace_dist("WebOb >= 1.0")
++replace_dist("SQLAlchemy >= 0.6.3")
++replace_dist("Routes >= 1.12.3")
++
++replace_dist("PasteDeploy >= 1.5.0")
++# This hack is needed because replace_dist() results in
++# the standard paste module path being at the start of __path__.
++# TODO: See can we get pkg_resources to do the right thing directly
++import paste
++paste.__path__.insert(0, paste.__path__.pop(-1))
- --- keystone-2012.2/bin/keystone-all.orig 2012-04-04 04:22:54.000000000 +0200
- +++ keystone-2012.2/bin/keystone-all 2012-05-29 19:32:51.728668936 +0200
- @@ -20,13 +20,12 @@
++--- keystone-2013.1/bin/keystone-all.orig 2012-11-22 10:19:01.000000000 +0100
+++++ keystone-2013.1/bin/keystone-all 2012-12-03 19:23:00.283712287 +0100
++@@ -19,13 +19,12 @@
++ sys.path.insert(0, possible_topdir)
+
- eventlet.patcher.monkey_patch(all=False, socket=True, time=True, thread=True)
+
+-from paste import deploy
+-
+ from keystone import config
+ from keystone.common import wsgi
+ from keystone.common import utils
+ from keystone.openstack.common import importutils
+
++from paste import deploy
+
+ CONF = config.CONF
+
diff --cc openstack-keystone.spec
index 49a65b2,2d86960..ddf83af
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -1,11 -1,13 +1,13 @@@
#
- # This is 2012.2.1 stable/folsom release
+ # This is 2013.1 grizzly-1 milestone
#
- %global release_name folsom
- %global snapdate 20121128
- %global git_revno 2549
+ %global release_name grizzly
+ %global release_letter g
+ %global milestone 1
+ %global snapdate 20121122
+ %global git_revno r2704
-%global snaptag ~%{release_letter}%{milestone}~%{snapdate}.%{git_revno}
+%global snaptag %{?milestone:~%{release_letter}%{milestone}}~%{snapdate}.%{git_revno}
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-keystone
@@@ -16,36 -17,25 +17,32 @@@ Summary: OpenStack Identity Serv
License: ASL 2.0
URL: http://keystone.openstack.org/
- Source0: http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
+ #Source0: http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
#Source0: http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}~%{release_letter}%{milestone}.tar.gz
- #Source0: http://tarballs.openstack.org/keystone/keystone-%{version}%{snaptag}.tar.gz
+ Source0: http://tarballs.openstack.org/keystone/keystone-%{version}%{snaptag}.tar.gz
Source1: openstack-keystone.logrotate
-Source2: openstack-keystone.service
+Source2: openstack-keystone.init
+Source3: openstack-keystone.upstart
Source5: openstack-keystone-sample-data
+Patch0: openstack-keystone-newdeps.patch
#
- # patches_base=2012.2.1
+ # patches_base=grizzly-1
#
Patch0001: 0001-match-egg-and-spec-requires.patch
- Patch0002: 0002-add-Quantum-endpoint-in-sample-data.patch
- Patch0003: 0003-add-Swift-endpoint-in-sample-data.patch
- Patch0004: 0004-notify-calling-process-we-are-ready-to-serve.patch
- Patch0005: 0005-Fix-default-port-for-identity.internalURL.patch
BuildArch: noarch
+
BuildRequires: python2-devel
-BuildRequires: python-sphinx >= 1.0
+BuildRequires: python-sphinx10
BuildRequires: openstack-utils
BuildRequires: python-iniparse
-BuildRequires: systemd-units
+# These are required to build due to the requirements check added
+BuildRequires: python-sqlalchemy0.7
+BuildRequires: python-webob1.0
+BuildRequires: python-paste-deploy1.5
+BuildRequires: python-routes1.12
Requires: python-keystone = %{version}-%{release}
Requires: python-keystoneclient >= 2012.1-0.4.e4
@@@ -109,13 -97,8 +106,9 @@@ This package contains documentation fo
%prep
%setup -q -n keystone-%{version}
+%patch0 -p1 -b .newdeps
%patch0001 -p1
- %patch0002 -p1
- %patch0003 -p1
- %patch0004 -p1
- %patch0005 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
@@@ -247,9 -213,9 +240,12 @@@ f
%endif
%changelog
-* Thu Nov 22 2012 Alan Pevec <apevec at redhat.com> 2013.1-0.1.g1
++* Mon Dec 03 2012 Alan Pevec <apevec at redhat.com> 2013.1-0.1.
+ - grizzly-1 milestone
+
+* Wed Nov 28 2012 Alan Pevec <apevec at redhat.com> 2012.2.1-1
+- updated to stable folsom release 2012.2.1 CVE-2012-5563 CVE-2012-5571
+
* Fri Nov 16 2012 Alan Pevec <apevec at redhat.com> 2012.2-5
- fix /etc/keystone directory permission CVE-2012-5483 (rhbz#873447)
More information about the scm-commits
mailing list