[openstack-keystone] folsom rc1
Alan Pevec
apevec at fedoraproject.org
Fri Sep 14 21:12:14 UTC 2012
commit 182512aa4e42fcdc8ae52cafd9068571df60ad2c
Author: Alan Pevec <apevec at redhat.com>
Date: Fri Sep 14 23:07:08 2012 +0200
folsom rc1
.gitignore | 1 +
...-middleware-configuration-from-app-config.patch | 269 --------------------
...patch => 0001-match-egg-and-spec-requires.patch | 2 +-
0002-add-Quantum-endpoint-in-sample-data.patch | 39 +++
0003-Check-for-expected-cfg-impl-bug-1043479.patch | 23 --
...authz-to-update-user-s-tenant-bug-1040626.patch | 22 --
openstack-keystone.spec | 27 +-
sources | 2 +-
8 files changed, 55 insertions(+), 330 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b882599..ba6689e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/keystone-2012.2~f2.tar.gz
/keystone-2012.2~f3.tar.gz
+/keystone-2012.2~rc1.tar.gz
diff --git a/0002-match-egg-and-spec-requires.patch b/0001-match-egg-and-spec-requires.patch
similarity index 93%
rename from 0002-match-egg-and-spec-requires.patch
rename to 0001-match-egg-and-spec-requires.patch
index 1537cea..114f942 100644
--- a/0002-match-egg-and-spec-requires.patch
+++ b/0001-match-egg-and-spec-requires.patch
@@ -1,4 +1,4 @@
-From e55653f8ab242e1dd23729c137bcf3b1e30bfd2f Mon Sep 17 00:00:00 2001
+From 197f7ba0e5fe6136c391beddb30d69888931785b Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Sat, 30 Jun 2012 01:00:25 +0200
Subject: [PATCH] match egg and spec requires
diff --git a/0002-add-Quantum-endpoint-in-sample-data.patch b/0002-add-Quantum-endpoint-in-sample-data.patch
new file mode 100644
index 0000000..188e4de
--- /dev/null
+++ b/0002-add-Quantum-endpoint-in-sample-data.patch
@@ -0,0 +1,39 @@
+From 5ba3b6e0df35018619f900599ecab9b980913f86 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
+
+Change-Id: Icd8166efec04e4adc18ecf7c96d43fbc4962cbeb
+---
+ tools/sample_data.sh | 9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/tools/sample_data.sh b/tools/sample_data.sh
+index 3dda911..18419a8 100755
+--- a/tools/sample_data.sh
++++ b/tools/sample_data.sh
+@@ -220,9 +220,10 @@ if [[ -n "$ENABLE_SWIFT" ]]; then
+ fi
+
+ if [[ -n "$ENABLE_QUANTUM" ]]; then
++ QUANTUM_SERVICE=$(get_id \
+ keystone service-create --name=quantum \
+ --type=network \
+- --description="Quantum Service"
++ --description="Quantum Service")
+ QUANTUM_USER=$(get_id keystone user-create --name=quantum \
+ --pass="$SERVICE_PASSWORD" \
+ --tenant_id $SERVICE_TENANT \
+@@ -230,6 +231,12 @@ if [[ -n "$ENABLE_QUANTUM" ]]; then
+ keystone user-role-add --tenant_id $SERVICE_TENANT \
+ --user_id $QUANTUM_USER \
+ --role_id $ADMIN_ROLE
++ if [[ -n "$ENABLE_ENDPOINTS" ]]; then
++ keystone endpoint-create --region RegionOne --service_id $QUANTUM_SERVICE \
++ --publicurl http://localhost:9696 \
++ --adminurl http://localhost:9696 \
++ --internalurl http://localhost:9696
++ fi
+ fi
+
+
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 2f1d10f..f57fef1 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,18 +1,18 @@
#
-# This is 2012.2 folsom-3 milestone
+# This is 2012.2 folsom RC1
#
%global release_name folsom
-%global release_letter f
-%global milestone 3
-%global snapdate 20120817
-%global git_revno r2454
+%global release_letter rc
+%global milestone 1
+%global snapdate 20120914
+%global git_revno r2537
%global snaptag ~%{release_letter}%{milestone}~%{snapdate}.%{git_revno}
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-keystone
Version: 2012.2
-Release: 0.6.%{release_letter}%{milestone}%{?dist}
+Release: 0.7.%{release_letter}%{milestone}%{?dist}
Summary: OpenStack Identity Service
License: ASL 2.0
@@ -26,12 +26,10 @@ Source5: openstack-keystone-sample-data
#
-# patches_base=folsom-3
+# patches_base=folsom-rc1
#
-Patch0001: 0001-allow-middleware-configuration-from-app-config.patch
-Patch0002: 0002-match-egg-and-spec-requires.patch
-Patch0003: 0003-Check-for-expected-cfg-impl-bug-1043479.patch
-Patch0004: 0004-Require-authz-to-update-user-s-tenant-bug-1040626.patch
+Patch0001: 0001-match-egg-and-spec-requires.patch
+Patch0002: 0002-add-Quantum-endpoint-in-sample-data.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -115,8 +113,6 @@ This package contains documentation for Keystone.
%patch0001 -p1
%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
@@ -258,6 +254,9 @@ fi
%endif
%changelog
+* Fri Sep 14 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.7.rc1
+- folsom rc1 (CVE-2012-4413)
+
* Thu Aug 30 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.6.f3
- Require authz to update user's tenant (CVE-2012-3542)
@@ -271,7 +270,7 @@ fi
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri Jul 06 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.2.f2
-- folsom-2 milestone
+- folsom-2 milestone (CVE-2012-3426)
* Fri May 25 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.1.f1
- folsom-1 milestone
diff --git a/sources b/sources
index 33728fd..706a3e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d247e69099093c44cc7d38ed884ba756 keystone-2012.2~f3.tar.gz
+ec1f8415ef884b5cc89e90be62fa8780 keystone-2012.2~rc1.tar.gz
More information about the scm-commits
mailing list