[openstack-keystone/f18] updated to stable folsom release 2012.2.4
Alan Pevec
apevec at fedoraproject.org
Thu Apr 11 20:31:01 UTC 2013
commit abffdd8e1eefdbb8cefcbe45aad9516bfce57227
Author: Alan Pevec <apevec at redhat.com>
Date: Thu Apr 11 22:03:27 2013 +0200
updated to stable folsom release 2012.2.4
.gitignore | 2 +-
... 0001-add-Quantum-endpoint-in-sample-data.patch | 2 +-
...=> 0002-add-Swift-endpoint-in-sample-data.patch | 2 +-
...ify-calling-process-we-are-ready-to-serve.patch | 2 +-
...Fix-default-port-for-identity.internalURL.patch | 2 +-
0006-Add-size-validations-for-tokens.patch | 228 --------------------
0007-Disable-XML-entity-parsing.patch | 53 -----
0008-Ensure-user-and-tenant-enabled-in-EC2.patch | 92 --------
0009-validate-from-backend-bug-1129713.patch | 105 ---------
openstack-keystone.spec | 29 +--
sources | 2 +-
11 files changed, 18 insertions(+), 501 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 295cfff..caa715b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/keystone-2012.2.3.tar.gz
+/keystone-2012.2.4.tar.gz
diff --git a/0002-add-Quantum-endpoint-in-sample-data.patch b/0001-add-Quantum-endpoint-in-sample-data.patch
similarity index 95%
rename from 0002-add-Quantum-endpoint-in-sample-data.patch
rename to 0001-add-Quantum-endpoint-in-sample-data.patch
index ddf9eb7..c5eae76 100644
--- a/0002-add-Quantum-endpoint-in-sample-data.patch
+++ b/0001-add-Quantum-endpoint-in-sample-data.patch
@@ -1,4 +1,4 @@
-From 9ad8d48455f545d3cedce94443e1866d75d2d26b Mon Sep 17 00:00:00 2001
+From 1d5db54eecaf28ae5517303dc76c059edb6b4bc6 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Thu, 13 Sep 2012 14:28:12 +0200
Subject: [PATCH] add Quantum endpoint in sample data
diff --git a/0003-add-Swift-endpoint-in-sample-data.patch b/0002-add-Swift-endpoint-in-sample-data.patch
similarity index 96%
rename from 0003-add-Swift-endpoint-in-sample-data.patch
rename to 0002-add-Swift-endpoint-in-sample-data.patch
index 84a5504..f37c1ce 100644
--- a/0003-add-Swift-endpoint-in-sample-data.patch
+++ b/0002-add-Swift-endpoint-in-sample-data.patch
@@ -1,4 +1,4 @@
-From 78a1c11828cfe4040953832984211ae4e6e98437 Mon Sep 17 00:00:00 2001
+From 2e16ecd6432bc7f8e82716d722be921467e03abf Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Mon, 17 Sep 2012 20:51:49 +0200
Subject: [PATCH] add Swift endpoint in sample data
diff --git a/0004-notify-calling-process-we-are-ready-to-serve.patch b/0003-notify-calling-process-we-are-ready-to-serve.patch
similarity index 93%
rename from 0004-notify-calling-process-we-are-ready-to-serve.patch
rename to 0003-notify-calling-process-we-are-ready-to-serve.patch
index 1f7cd97..88d0192 100644
--- a/0004-notify-calling-process-we-are-ready-to-serve.patch
+++ b/0003-notify-calling-process-we-are-ready-to-serve.patch
@@ -1,4 +1,4 @@
-From 4acab332435253e1fe355fdafe17dab10e0e43d1 Mon Sep 17 00:00:00 2001
+From b13f9354b651ebc16a6732379678454be6a3aec5 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Wed, 19 Sep 2012 00:26:13 +0200
Subject: [PATCH] notify calling process we are ready to serve
diff --git a/0005-Fix-default-port-for-identity.internalURL.patch b/0004-Fix-default-port-for-identity.internalURL.patch
similarity index 93%
rename from 0005-Fix-default-port-for-identity.internalURL.patch
rename to 0004-Fix-default-port-for-identity.internalURL.patch
index db09ee7..838a4fc 100644
--- a/0005-Fix-default-port-for-identity.internalURL.patch
+++ b/0004-Fix-default-port-for-identity.internalURL.patch
@@ -1,4 +1,4 @@
-From 37f549569cee9683687755ff93f7c2c423ca875c Mon Sep 17 00:00:00 2001
+From 57b00997419a45e90feb8e96c344c9ec88f5c5d5 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Thu, 8 Nov 2012 22:58:54 +0100
Subject: [PATCH] Fix default port for identity.internalURL
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 0a4d5fe..bbc8d7f 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,13 +1,13 @@
#
-# This is 2012.2.3 stable/folsom release
+# This is 2012.2.4 stable/folsom release
#
%global release_name folsom
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-keystone
-Version: 2012.2.3
-Release: 5%{?dist}
+Version: 2012.2.4
+Release: 1%{?dist}
Summary: OpenStack Identity Service
License: ASL 2.0
@@ -19,16 +19,12 @@ Source5: openstack-keystone-sample-data
#
-# patches_base=2012.2.3
+# patches_base=2012.2.4
#
-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
-Patch0006: 0006-Add-size-validations-for-tokens.patch
-Patch0007: 0007-Disable-XML-entity-parsing.patch
-Patch0008: 0008-Ensure-user-and-tenant-enabled-in-EC2.patch
-Patch0009: 0009-validate-from-backend-bug-1129713.patch
+Patch0001: 0001-add-Quantum-endpoint-in-sample-data.patch
+Patch0002: 0002-add-Swift-endpoint-in-sample-data.patch
+Patch0003: 0003-notify-calling-process-we-are-ready-to-serve.patch
+Patch0004: 0004-Fix-default-port-for-identity.internalURL.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -99,14 +95,10 @@ This package contains documentation for Keystone.
%prep
%setup -q -n keystone-%{version}
+%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
-%patch0007 -p1
-%patch0008 -p1
-%patch0009 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
@@ -224,6 +216,9 @@ fi
%endif
%changelog
+* Thu Apr 11 2013 Alan Pevec <apevec at redhat.com> 2012.2.4-1
+- updated to stable folsom release 2012.2.4
+
* Fri Mar 29 2013 Alan Pevec <apevec at redhat.com> 2012.2.3-5
- Fix online revocation check for PKI tokens CVE-2013-1865
diff --git a/sources b/sources
index 8b4a824..6b8bcf8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44fddfb7ac00e2d6d921e818eee65b9e keystone-2012.2.3.tar.gz
+aa14a95341aa9028efe81c27d9e448a5 keystone-2012.2.4.tar.gz
More information about the scm-commits
mailing list