[openstack-glance/el6-grizzly] Updated patches from el6-grizzly-patches
Pádraig Brady
pbrady at fedoraproject.org
Tue Jul 23 11:39:41 UTC 2013
commit 062c33c2f1ed38a2e60b68977c9f48e72339fa32
Author: Pádraig Brady <P at draigBrady.com>
Date: Tue Jul 23 12:38:26 2013 +0100
Updated patches from el6-grizzly-patches
...-Don-t-access-the-net-while-building-docs.patch | 4 +-
...-parallel-install-versions-of-epel-packag.patch | 21 +++++++++++++++----
...d-the-uneeded-dependency-on-Crypto.Random.patch | 19 +++++++++++++----
...tch => 0004-Avoid-NULLs-in-crypto-padding.patch | 6 ++--
openstack-glance.spec | 14 +++++-------
5 files changed, 41 insertions(+), 23 deletions(-)
---
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 1b4fb45..cf54a0f 100644
--- a/0001-Don-t-access-the-net-while-building-docs.patch
+++ b/0001-Don-t-access-the-net-while-building-docs.patch
@@ -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 8b546d6..4d73f0d 100644
diff --git a/openstack-glance-newdeps.patch b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
similarity index 65%
rename from openstack-glance-newdeps.patch
rename to 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
index f3eecec..6524d60 100644
--- a/openstack-glance-newdeps.patch
+++ b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -1,10 +1,23 @@
+From 6d09c0dae260bba758f05609fcb7006ebb9286d3 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:37:12 +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 | 28 ++++++++++++++++++++++++++++
+ 1 files changed, 28 insertions(+), 0 deletions(-)
-diff -up glance-2011.3/glance/__init__.py.newdeps glance-2011.3/glance/__init__.py
---- glance-2011.3/glance/__init__.py.newdeps 2012-01-06 17:22:36.000000000 +0000
-+++ glance-2011.3/glance/__init__.py 2012-01-06 17:25:01.019063547 +0000
+diff --git a/glance/__init__.py b/glance/__init__.py
+index b6d314b..86ec0ab 100644
+--- a/glance/__init__.py
++++ b/glance/__init__.py
@@ -18,3 +18,31 @@
import gettext
@@ -37,5 +50,3 @@ diff -up glance-2011.3/glance/__init__.py.newdeps glance-2011.3/glance/__init__.
+# 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))
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..9c59f0c 100644
--- a/crypto.random.patch
+++ b/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
@@ -1,3 +1,8 @@
+From 716056eca710d50d9c5d53833f4def0ac6969d37 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..5582b1b 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 3fc73f66f23bf05c7b32d9da087dba48780f23a5 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 374baec..32fb685 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -19,11 +19,9 @@ Source4: openstack-glance.logrotate
# patches_base=2013.1.2
#
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
@@ -110,10 +108,10 @@ This package contains documentation files for glance.
%setup -q -n glance-%{version}
%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+%patch0004 -p1
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
# Remove bundled egg-info
rm -rf glance.egg-info
More information about the scm-commits
mailing list