4 files changed, 85 insertions, 0 deletions
diff --git a/app-admin/glance/files/CVE-2015-3289_2015.1.0.patch b/app-admin/glance/files/CVE-2015-3289_2015.1.0.patch
new file mode 100644
index 000000000000..5b697741e408
--- /dev/null
+++ b/app-admin/glance/files/CVE-2015-3289_2015.1.0.patch
@@ -0,0 +1,50 @@
+From 88f92eb11d556bf43e2800a05973ad2da0db0195 Mon Sep 17 00:00:00 2001
+From: Flavio Percoco <flaper87@gmail.com>
+Date: Fri, 8 May 2015 11:44:14 +0200
+Subject: [PATCH] Save image data after setting the data
+
+The image's locations are missing when image's are imported using tasks
+because the ImportToStore task is not saving the image metadata after
+the import. This patch fixes that.
+
+Change-Id: I43dec450d5fc4bee2131d78dbe3c2b2373c3f739
+Closes-bug: #1453068
+(cherry picked from commit 4efb56aae9288952bdb0d368a7c307e8524b80d8)
+---
+ glance/async/flows/base_import.py            | 4 ++++
+ glance/tests/unit/async/flows/test_import.py | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/glance/async/flows/base_import.py b/glance/async/flows/base_import.py
+index 487247c..7656bde 100644
+--- a/glance/async/flows/base_import.py
++++ b/glance/async/flows/base_import.py
+@@ -283,6 +283,10 @@ class _ImportToStore(task.Task):
+ 
+         image_import.set_image_data(image, file_path or self.uri, None)
+ 
++        # NOTE(flaper87): We need to save the image again after the locations
++        # have been set in the image.
++        self.image_repo.save(image)
++
+ 
+ class _SaveImage(task.Task):
+ 
+diff --git a/glance/tests/unit/async/flows/test_import.py b/glance/tests/unit/async/flows/test_import.py
+index 0f355bc..7acd599 100644
+--- a/glance/tests/unit/async/flows/test_import.py
++++ b/glance/tests/unit/async/flows/test_import.py
+@@ -112,6 +112,10 @@ class TestImportTask(test_utils.BaseTestCase):
+                                           "%s.tasks_import" % image_path)
+             self.assertFalse(os.path.exists(tmp_image_path))
+             self.assertTrue(os.path.exists(image_path))
++            self.assertEqual(1, len(list(self.image.locations)))
++            self.assertEqual("file://%s/%s" % (self.test_dir,
++                                               self.image.image_id),
++                             self.image.locations[0]['url'])
+ 
+     def test_import_flow_missing_work_dir(self):
+         self.config(engine_mode='serial', group='taskflow_executor')
+-- 
+2.3.6
+
diff --git a/app-admin/glance/files/glance-2013.2-sphinx_mapping.patch b/app-admin/glance/files/glance-2013.2-sphinx_mapping.patch
new file mode 100644
index 000000000000..0a0f575ca0d3
--- /dev/null
+++ b/app-admin/glance/files/glance-2013.2-sphinx_mapping.patch
@@ -0,0 +1,12 @@
+diff -ur glance-2013.2.orig/doc/source/conf.py glance-2013.2/doc/source/conf.py
+--- doc/source/conf.py	2013-10-17 21:39:46.000000000 +0800
++++ doc/source/conf.py	2013-11-13 18:51:29.099839976 +0800
+@@ -250,8 +250,3 @@
+ 
+ # If false, no module index is generated.
+ #latex_use_modindex = True
+-
+-# Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'python': ('http://docs.python.org/', None),
+-                       'nova': ('http://nova.openstack.org', None),
+-                       'swift': ('http://swift.openstack.org', None)}
diff --git a/app-admin/glance/files/glance.confd b/app-admin/glance/files/glance.confd
new file mode 100644
index 000000000000..4eb2893090a0
--- /dev/null
+++ b/app-admin/glance/files/glance.confd
@@ -0,0 +1 @@
+PID_PATH=/var/run/glance
diff --git a/app-admin/glance/files/glance.initd b/app-admin/glance/files/glance.initd
new file mode 100644
index 000000000000..81e42b341511
--- /dev/null
+++ b/app-admin/glance/files/glance.initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="Starts ${SVCNAME} service for OpenStack"
+
+command=/usr/bin/${SVCNAME}
+command_background=yes
+pidfile=/var/run/glance/${SVCNAME}.pid
+required_files=/etc/glance/${SVCNAME}.conf
+
+start_stop_daemon_args="--quiet --user ${GLANCE_USER:-glance}"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	checkpath --directory --owner ${GLANCE_USER:-glance}:${GLANCE_GROUP:-glance} --mode 0755 ${GLANCE_RUN:-/var/run/glance}
+}
+