commit 921433d5f9bd6a20f9d5b674dbe35e4d6a202a39 Author: Alan Pevec apevec@redhat.com Date: Fri Jan 31 18:07:00 2014 +0100

update to icehouse milestone 2

.gitignore | 1 + ...-Don-t-access-the-net-while-building-docs.patch | 6 ++-- ...-parallel-install-versions-of-epel-packag.patch | 29 ++++++++++++++----- ...d-the-uneeded-dependency-on-Crypto.Random.patch | 12 ++++---- 0004-Avoid-NULLs-in-crypto-padding.patch | 12 ++++---- 0005-Remove-runtime-dep-on-python-pbr.patch | 10 +++--- openstack-glance.spec | 13 +++++--- sources | 2 +- 8 files changed, 51 insertions(+), 34 deletions(-) --- diff --git a/.gitignore b/.gitignore index ec029e4..eb58bc0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /glance-2014.1.b1.tar.gz +/glance-2014.1.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 dcc3726..2ecbd43 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 9d8d412e5641371cc896a0fda18b064f6ef713c3 Mon Sep 17 00:00:00 2001 +From 52736f74a1b2a11ecd851d1e7659c394fd982b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= pbrady@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 files changed, 0 insertions(+), 1 deletions(-) + doc/source/conf.py | 1 - + 1 file changed, 1 deletion(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py index 04f4ebe..8ceeb43 100644 diff --git a/0002-Use-updated-parallel-install-versions-of-epel-packag.patch b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch index 885a447..8046420 100644 --- a/0002-Use-updated-parallel-install-versions-of-epel-packag.patch +++ b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch @@ -1,4 +1,4 @@ -From d5b59bee3a81878486eb7365ae0ac82bdf774107 Mon Sep 17 00:00:00 2001 +From 9a0f196a54e2ff404b4ec4fded3fa2b3c899ec61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= P@draigBrady.com Date: Tue, 23 Jul 2013 12:18:26 +0100 Subject: [PATCH] Use updated parallel install versions of epel package @@ -11,17 +11,30 @@ 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(-) + glance/__init__.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+)

diff --git a/glance/__init__.py b/glance/__init__.py -index c43a900..625552c 100644 +index e69de29..625552c 100644 --- a/glance/__init__.py +++ b/glance/__init__.py -@@ -14,3 +14,35 @@ - # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - # License for the specific language governing permissions and limitations - # under the License. +@@ -0,0 +1,48 @@ ++# vim: tabstop=4 shiftwidth=4 softtabstop=4 ++ ++# Copyright 2010-2011 OpenStack Foundation ++# All Rights Reserved. ++# ++# Licensed under the Apache License, Version 2.0 (the "License"); you may ++# not use this file except in compliance with the License. You may obtain ++# a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT ++# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the ++# License for the specific language governing permissions and limitations ++# under the License. + + +import sys diff --git a/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch b/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch index f191869..d6152ca 100644 --- a/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch +++ b/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch @@ -1,4 +1,4 @@ -From f55675bb535baaef1ba78db4cb332a42e24a491a Mon Sep 17 00:00:00 2001 +From b8f98a102a68fffc68f25265509d197d690b7417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= P@draigBrady.com Date: Tue, 23 Jul 2013 12:19:45 +0100 Subject: [PATCH] avoid the uneeded dependency on Crypto.Random @@ -12,14 +12,14 @@ but I'm leaving that as is for now: http://www.codekoala.com/blog/2009/aes-encryption-python-using-pycrypto/#com... http://eli.thegreenplace.net/2010/06/25/aes-encryption-of-files-in-python-wi... --- - glance/common/crypt.py | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) + glance/common/crypt.py | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/glance/common/crypt.py b/glance/common/crypt.py -index ee50544..8412717 100644 +index f719d11..971fe4f 100644 --- a/glance/common/crypt.py +++ b/glance/common/crypt.py -@@ -21,10 +21,7 @@ Routines for URL-safe encrypting/decrypting +@@ -20,10 +20,7 @@ Routines for URL-safe encrypting/decrypting """

import base64 @@ -30,7 +30,7 @@ index ee50544..8412717 100644

def urlsafe_encrypt(key, plaintext, blocksize=16): -@@ -41,13 +38,12 @@ def urlsafe_encrypt(key, plaintext, blocksize=16): +@@ -40,13 +37,12 @@ def urlsafe_encrypt(key, plaintext, blocksize=16): Pads text to be encrypted """ pad_length = (blocksize - len(text) % blocksize) diff --git a/0004-Avoid-NULLs-in-crypto-padding.patch b/0004-Avoid-NULLs-in-crypto-padding.patch index 3d30fa5..f717db9 100644 --- a/0004-Avoid-NULLs-in-crypto-padding.patch +++ b/0004-Avoid-NULLs-in-crypto-padding.patch @@ -1,4 +1,4 @@ -From d53ac28fcaefa2e0f81784b10ef6020e1d4ddcf1 Mon Sep 17 00:00:00 2001 +From 14fe9991540cd24a89603bbcb7118d5e4fcbeff7 Mon Sep 17 00:00:00 2001 From: Eoghan Glynn eglynn@redhat.com Date: Wed, 30 Jan 2013 17:43:52 +0000 Subject: [PATCH] Avoid NULLs in crypto padding. @@ -17,14 +17,14 @@ Reviewed-on: https://code.engineering.redhat.com/gerrit/2809 Reviewed-by: Nikola Dipanov ndipanov@redhat.com Tested-by: Nikola Dipanov ndipanov@redhat.com --- - glance/common/crypt.py | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + glance/common/crypt.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/glance/common/crypt.py b/glance/common/crypt.py -index 8412717..5ea7c59 100644 +index 971fe4f..15f72b4 100644 --- a/glance/common/crypt.py +++ b/glance/common/crypt.py -@@ -21,6 +21,10 @@ Routines for URL-safe encrypting/decrypting +@@ -20,6 +20,10 @@ Routines for URL-safe encrypting/decrypting """

import base64 @@ -35,7 +35,7 @@ index 8412717..5ea7c59 100644 from Crypto.Cipher import AES

-@@ -38,7 +42,8 @@ def urlsafe_encrypt(key, plaintext, blocksize=16): +@@ -37,7 +41,8 @@ def urlsafe_encrypt(key, plaintext, blocksize=16): Pads text to be encrypted """ pad_length = (blocksize - len(text) % blocksize) diff --git a/0005-Remove-runtime-dep-on-python-pbr.patch b/0005-Remove-runtime-dep-on-python-pbr.patch index 3de2dea..b20935c 100644 --- a/0005-Remove-runtime-dep-on-python-pbr.patch +++ b/0005-Remove-runtime-dep-on-python-pbr.patch @@ -1,17 +1,17 @@ -From 4e7ff2caf35014901e3fdeb8e551f4b7f702bbad Mon Sep 17 00:00:00 2001 +From 40fa0e094a05e126bf3427c20e4ee97b40cf3a6d Mon Sep 17 00:00:00 2001 From: John Bresnahan jbresnah@redhat.com Date: Wed, 18 Sep 2013 19:18:43 -1000 Subject: [PATCH] Remove runtime dep on python pbr

--- - glance/version.py | 29 +++++++++++++++++++++++++++-- - 1 files changed, 27 insertions(+), 2 deletions(-) + glance/version.py | 29 +++++++++++++++++++++++++++-- + 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/glance/version.py b/glance/version.py -index d815183..9e20ed0 100644 +index 0172206..ac67472 100644 --- a/glance/version.py +++ b/glance/version.py -@@ -15,6 +15,31 @@ +@@ -13,6 +13,31 @@ # under the License.

diff --git a/openstack-glance.spec b/openstack-glance.spec index 9361dce..62b818f 100644 --- a/openstack-glance.spec +++ b/openstack-glance.spec @@ -1,14 +1,14 @@ -%global release_name havana +%global release_name icehouse

Name: openstack-glance Version: 2014.1 -Release: 0.1.b1%{?dist} +Release: 0.2.b2%{?dist} Summary: OpenStack Image Service

Group: Applications/System License: ASL 2.0 URL: http://glance.openstack.org -Source0: https://launchpad.net/glance/%%7Brelease_name%7D/%%7Bversion%7D/+download/gl... +Source0: https://launchpad.net/glance/%%7Brelease_name%7D/%%7Brelease_name%7D-2/+down... Source1: openstack-glance-api.init Source100: openstack-glance-api.upstart Source2: openstack-glance-registry.init @@ -23,7 +23,7 @@ Source7: glance-cache-dist.conf Source8: glance-scrubber-dist.conf

# -# patches_base=2014.1.b1 +# patches_base=2014.1.b2 # Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch @@ -118,7 +118,7 @@ and delivery services for virtual disk images. This package contains documentation files for glance.

%prep -%setup -q -n glance-%{version}.b1 +%setup -q -n glance-%{version}.b2

%patch0001 -p1 %patch0002 -p1 @@ -338,6 +338,9 @@ fi %doc doc/build/html

%changelog +* Fri Jan 31 2014 Alan Pevec apevec@redhat.com 2014.1-0.2.b2 +- Update to Icehouse milestone 2 + * Mon Dec 23 2013 Pádraig Brady pbrady@redhat.com 2014.1-0.1.b1 - Update to Icehouse milestone 1

diff --git a/sources b/sources index c8bbe9c..14bcf6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95cfc14cc28f08d5a6f6ea96daafc55e glance-2014.1.b1.tar.gz +82ecdab0f44d4b94a80e43cbdc7d88fe glance-2014.1.b2.tar.gz