[openstack-glance/el6-havana] update to Havana milestone 2
Pádraig Brady
pbrady at fedoraproject.org
Tue Jul 23 11:43:06 UTC 2013
commit dff57f7157527bc2a2581b044fa71782176fafdf
Author: Pádraig Brady <P at draigBrady.com>
Date: Tue Jul 23 11:59:50 2013 +0100
update to Havana milestone 2
Conflicts:
0001-Don-t-access-the-net-while-building-docs.patch
openstack-glance.spec
.gitignore | 1 +
...-Don-t-access-the-net-while-building-docs.patch | 6 ++--
...-parallel-install-versions-of-epel-packag.patch | 16 ++++++++++
...d-the-uneeded-dependency-on-Crypto.Random.patch | 19 +++++++++---
...tch => 0004-Avoid-NULLs-in-crypto-padding.patch | 6 ++--
openstack-glance.spec | 30 ++++++++++----------
sources | 2 +-
7 files changed, 53 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ebc8ea1..f273ffb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/glance-2013.1.tar.gz
/glance-2013.1.2.tar.gz
/glance-2013.2.b1.tar.gz
+/glance-2013.2.b2.tar.gz
diff --git a/0001-Don-t-access-the-net-while-building-docs.patch b/0001-Don-t-access-the-net-while-building-docs.patch
index 7589ab0..0a080c2 100644
--- a/0001-Don-t-access-the-net-while-building-docs.patch
+++ b/0001-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From 0ce965b1cca5c5076d60b997f015eaf9b3887634 Mon Sep 17 00:00:00 2001
+From 72557f680e05c9a2becba850b605b14921ef9cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Fri, 6 Jan 2012 17:12:54 +0000
Subject: [PATCH] Don't access the net while building docs
@@ -8,8 +8,8 @@ Subject: [PATCH] Don't access the net while building docs
Change-Id: I42c6e3a5062db209a0abe00cebc04d383c79cbcb
(cherry picked from commit f2b4bb4e45afcc178200966193a7b87401c534d7)
---
- doc/source/conf.py | 1 -
- 1 file changed, 1 deletion(-)
+ doc/source/conf.py | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
index f926b61..68b9973 100644
diff --git a/openstack-glance-newdeps.patch b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
similarity index 67%
rename from openstack-glance-newdeps.patch
rename to 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
index e8a3cf7..5b786d3 100644
--- a/openstack-glance-newdeps.patch
+++ b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -1,3 +1,19 @@
+From ce93cbf7e66ffa8ea99fc70e7fbb11dfed048a5d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
+Date: Tue, 23 Jul 2013 12:18:26 +0100
+Subject: [PATCH] Use updated parallel install versions of epel package
+
+Use sqlalchemy >= 0.6.3 WebOb >= 1.0 Routes >= 1.12.3 PasteDeploy >= 1.5.0
+and depend on the parallel installable
+versions of these packages to satisfy those requirements.
+
+Delve into pkg_resources a little to get it to modify sys.path,
+so that our parallel installed egg takes precedence over the
+system default module versions.
+---
+ glance/__init__.py | 32 ++++++++++++++++++++++++++++++++
+ 1 files changed, 32 insertions(+), 0 deletions(-)
+
diff --git a/glance/__init__.py b/glance/__init__.py
index b606957..dd75292 100644
--- a/glance/__init__.py
diff --git a/crypto.random.patch b/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
similarity index 67%
rename from crypto.random.patch
rename to 0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
index e67cc10..54449d3 100644
--- a/crypto.random.patch
+++ b/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
@@ -1,3 +1,8 @@
+From 290aebbea2d855ce272134db2e48c8e8d5baf1a5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
+Date: Tue, 23 Jul 2013 12:19:45 +0100
+Subject: [PATCH] avoid the uneeded dependency on Crypto.Random
+
Crypto.Random was added in python-crypto-2.1.0 to replace
the problematic randpool in 2.0.1: http://www.pycrypto.org/randpool-broken
However on Linux os.urandom() should be fine to set IV.
@@ -6,11 +11,15 @@ I'm not sure it's necessary to pad with random bytes,
but I'm leaving that as is for now:
http://www.codekoala.com/blog/2009/aes-encryption-python-using-pycrypto/#comment-25921785
http://eli.thegreenplace.net/2010/06/25/aes-encryption-of-files-in-python-with-pycrypto/
+---
+ glance/common/crypt.py | 8 ++------
+ 1 files changed, 2 insertions(+), 6 deletions(-)
-diff -Naur glance-2012.1.orig/glance/common/crypt.py glance-2012.1/glance/common/crypt.py
---- glance-2012.1.orig/glance/common/crypt.py 2012-03-30 13:12:40.000000000 +0000
-+++ glance-2012.1/glance/common/crypt.py 2012-04-09 01:46:38.244937150 +0000
-@@ -21,10 +21,7 @@
+diff --git a/glance/common/crypt.py b/glance/common/crypt.py
+index ee5f2dd..ef6496b 100644
+--- a/glance/common/crypt.py
++++ b/glance/common/crypt.py
+@@ -21,10 +21,7 @@ Routines for URL-safe encrypting/decrypting
"""
import base64
@@ -21,7 +30,7 @@ diff -Naur glance-2012.1.orig/glance/common/crypt.py glance-2012.1/glance/common
def urlsafe_encrypt(key, plaintext, blocksize=16):
-@@ -41,13 +38,12 @@
+@@ -41,13 +38,12 @@ def urlsafe_encrypt(key, plaintext, blocksize=16):
Pads text to be encrypted
"""
pad_length = (blocksize - len(text) % blocksize)
diff --git a/Avoid-NULLs-in-crypto-padding.patch b/0004-Avoid-NULLs-in-crypto-padding.patch
similarity index 89%
rename from Avoid-NULLs-in-crypto-padding.patch
rename to 0004-Avoid-NULLs-in-crypto-padding.patch
index 7ebb40b..f471c80 100644
--- a/Avoid-NULLs-in-crypto-padding.patch
+++ b/0004-Avoid-NULLs-in-crypto-padding.patch
@@ -1,4 +1,4 @@
-From 4458d6af24ba1e9dcb72b7b15b99cba9dce6b4ca Mon Sep 17 00:00:00 2001
+From 408f653ac5298bfd7d91c65bba8f8b6686b6fa46 Mon Sep 17 00:00:00 2001
From: Eoghan Glynn <eglynn at redhat.com>
Date: Wed, 30 Jan 2013 17:43:52 +0000
Subject: [PATCH] Avoid NULLs in crypto padding.
@@ -17,8 +17,8 @@ Reviewed-on: https://code.engineering.redhat.com/gerrit/2809
Reviewed-by: Nikola Dipanov <ndipanov at redhat.com>
Tested-by: Nikola Dipanov <ndipanov at redhat.com>
---
- glance/common/crypt.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ glance/common/crypt.py | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/glance/common/crypt.py b/glance/common/crypt.py
index ef6496b..3874de7 100644
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 4590f6a..e9acfe6 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,14 +1,12 @@
-%global milestone 1
-
Name: openstack-glance
Version: 2013.2
-Release: 0.3.b%{milestone}%{?dist}
+Release: 0.4.b2%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
License: ASL 2.0
URL: http://glance.openstack.org
-Source0: https://launchpad.net/glance/havana/havana-1/+download/glance-2013.2.b1.tar.gz
+Source0: https://launchpad.net/glance/havana/havana-2/+download/glance-2013.2.b2.tar.gz
Source1: openstack-glance-api.init
Source100: openstack-glance-api.upstart
Source2: openstack-glance-registry.init
@@ -18,14 +16,12 @@ Source300: openstack-glance-scrubber.upstart
Source4: openstack-glance.logrotate
#
-# patches_base=2013.2.b1
+# patches_base=2013.2.b2
#
Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
-
-# EPEL specific
-Patch100: openstack-glance-newdeps.patch
-Patch101: crypto.random.patch
-Patch102: Avoid-NULLs-in-crypto-padding.patch
+Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
+Patch0003: 0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
+Patch0004: 0004-Avoid-NULLs-in-crypto-padding.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -75,6 +71,7 @@ Requires: python-webob1.0
Requires: python-crypto
Requires: pyxattr
Requires: python-swiftclient
+Requires: python-cinderclient
Requires: python-oslo-config
#test deps: python-mox python-nose python-requests
@@ -108,13 +105,13 @@ and delivery services for virtual disk images.
This package contains documentation files for glance.
%prep
-%setup -q -n glance-%{version}.b%{milestone}
-sed -i 's/%{version}.b%{milestone}/%{version}/' PKG-INFO
+%setup -q -n glance-%{version}.b2
+sed -i 's/%{version}.b2/%{version}/' PKG-INFO
%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+%patch0004 -p1
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
# Remove bundled egg-info
rm -rf glance.egg-info
@@ -292,6 +289,9 @@ fi
%doc doc/build/html
%changelog
+* Tue Jul 23 2013 Pádraig Brady <pbrady at redhat.com> 2013.3-0.4.b2
+- Update to Havana milestone 2
+
* Fri Jun 7 2013 John Bresnahan <jbresnah at redhat.com> 2013.2.b1-3
- reinstate EPEL specific patches
diff --git a/sources b/sources
index e11aaa2..f21ac08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28b8f0fcfda939a0485da220f0f331ed glance-2013.2.b1.tar.gz
+b9a7986cdfd0eea4777b10eb7044bba7 glance-2013.2.b2.tar.gz
More information about the scm-commits
mailing list