[openstack-keystone/el6-folsom: 22/22] Merge branch 'master' into el6
Alan Pevec
apevec at fedoraproject.org
Thu Oct 18 17:36:57 UTC 2012
commit ef970b56575f3fb08f14bc6830397366f1adbeef
Merge: 58c623c 5d7dc94
Author: Alan Pevec <apevec at redhat.com>
Date: Thu Oct 18 19:04:24 2012 +0200
Merge branch 'master' into el6
.gitignore | 2 +-
0001-match-egg-and-spec-requires.patch | 34 +++++++++++++++++
0002-add-Quantum-endpoint-in-sample-data.patch | 39 ++++++++++++++++++++
0003-add-Swift-endpoint-in-sample-data.patch | 39 ++++++++++++++++++++
...ify-calling-process-we-are-ready-to-serve.patch | 29 +++++++++++++++
openstack-keystone-newdeps.patch | 17 +++++----
openstack-keystone.spec | 35 ++++++++++++------
sources | 2 +-
8 files changed, 176 insertions(+), 21 deletions(-)
---
diff --cc openstack-keystone-newdeps.patch
index b6f88aa,0000000..899be79
mode 100644,000000..100644
--- a/openstack-keystone-newdeps.patch
+++ b/openstack-keystone-newdeps.patch
@@@ -1,48 -1,0 +1,49 @@@
- --- keystone-2012.1/keystone/__init__.py.newdeps 2012-02-29 11:16:06.000000000 +0100
- +++ keystone-2012.1/keystone/__init__.py 2012-03-01 22:42:08.546503618 +0100
++--- 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.1/bin/keystone-all.orig 2012-04-04 04:22:54.000000000 +0200
- +++ keystone-2012.1/bin/keystone-all 2012-05-29 19:32:51.728668936 +0200
- @@ -16,11 +16,11 @@
- '__init__.py')):
- sys.path.insert(0, possible_topdir)
++--- 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 @@
++
++ 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 b54cbd5,070cebf..cf51216
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -15,32 -19,27 +19,34 @@@ 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}/%{release_name}-%{milestone}/+download/keystone-%{version}~%{release_letter}%{milestone}.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.1.3
+ # patches_base=2012.2
#
- Patch0001: 0001-fix-man-page-build.patch
- Patch0002: 0002-fix-sphinx-warnings.patch
- Patch0003: 0003-match-egg-and-spec-requires.patch
+ 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
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
@@@ -137,6 -133,7 +143,8 @@@ openstack-config --set etc/keystone.con
openstack-config --set etc/keystone.conf identity driver keystone.identity.backends.sql.Identity
openstack-config --set etc/keystone.conf token driver keystone.token.backends.sql.Token
openstack-config --set etc/keystone.conf ec2 driver keystone.contrib.ec2.backends.sql.Ec2
-openstack-config --set etc/keystone.conf DEFAULT onready keystone.common.systemd
++# don't try systemd notification on el6
++#openstack-config --set etc/keystone.conf DEFAULT onready keystone.common.systemd
%{__python} setup.py build
@@@ -244,9 -227,10 +253,10 @@@ f
%{_bindir}/keystone-manage
%{_bindir}/openstack-keystone-sample-data
%{_datadir}/%{name}
-%{_unitdir}/openstack-keystone.service
+%{_initrddir}/openstack-keystone
%dir %{_sysconfdir}/keystone
%config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/keystone.conf
+ %config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/logging.conf
%config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/default_catalog.templates
%config(noreplace) %attr(-, keystone, keystone) %{_sysconfdir}/keystone/policy.json
%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-keystone
@@@ -276,42 -259,41 +286,45 @@@
%endif
%changelog
-* Thu Sep 27 2012 Alan Pevec <apevec at redhat.com> 2012.2-1
-- Update to folsom final
++* Thu Oct 18 2012 Alan Pevec <apevec at redhat.com> 2012.2-1
++- Update to folsom
+
-* Wed Sep 26 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.9.rc2
-- folsom rc2
+* Fri Oct 12 2012 Alan Pevec <apevec at redhat.com> 2012.1.3-1
+- updated to stable essex release 2012.1.3
-* Fri Sep 21 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.8.rc1
-- fix systemd notification (rhbz#858188)
+* Sun Sep 16 2012 Alan Pevec <apevec at redhat.com> 2012.1.2-4
+- Limit token revocation to tenant (lp#1050025)
-* Fri Sep 14 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.7.rc1
-- folsom rc1 (CVE-2012-4413)
+* Wed Sep 12 2012 Alan Pevec <apevec at redhat.com> 2012.1.2-3
+- Delete user tokens after role grant/revoke (CVE-2012-4413)
-* Thu Aug 30 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.6.f3
+* Thu Aug 30 2012 Alan Pevec <apevec at redhat.com> 2012.1.2-2
- Require authz to update user's tenant (CVE-2012-3542)
-* Wed Aug 29 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.5.f3
-- allow middleware configuration from app config
+* Mon Aug 13 2012 Alan Pevec <apevec at redhat.com> 2012.1.2-1
+- updated to stable essex release 2012.1.2
-* Mon Aug 20 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.4.f3
-- folsom-3 milestone
+* Fri Jun 22 2012 Alan Pevec <apevec at redhat.com> 2012.1.1-1
+- updated to stable essex release 2012.1.1 (CVE-2012-3426)
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012.2-0.3.f2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Thu Jun 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-9
+- add upstart job, alternative to sysv initscript
-* Fri Jul 06 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.2.f2
-- folsom-2 milestone (CVE-2012-3426)
+* Fri Jun 15 2012 Alan Pevec <apevec at redhat.com> 2012.1-8
+- fix upgrade case with python-keystone-auth-token (rhbz#824034#c20)
-* Fri May 25 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.1.f1
-- folsom-1 milestone
+* Mon Jun 11 2012 Alan Pevec <apevec at redhat.com> 2012.1-7
+- Corrects url conversion in export_legacy_catalog (lp#994936)
+- Invalidate user tokens when password is changed (lp#996595)
+- Invalidate user tokens when a user is disabled (lp#997194)
+- Carrying over token expiry time when token chaining (lp#998185)
-* Thu May 24 2012 Alan Pevec <apevec at redhat.com> 2012.1-3
+* Tue May 29 2012 Alan Pevec <apevec at redhat.com> 2012.1-6
- python-keystone-auth-token subpackage (rhbz#824034)
- use reserved user id for keystone (rhbz#752842)
+- fix paste.deploy dependency (rhbz#826120)
-* Mon May 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-2
+* Mon May 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-5
- Sync up with Essex stable branch
- Remove dependencies no loner needed by Essex
More information about the scm-commits
mailing list