[python-django-horizon/f17] Update to 2012.1.1 stable/essex release
Nuno Santos
nsantos at fedoraproject.org
Fri Jul 6 18:31:05 UTC 2012
commit 917cb0c3e1cee0f81570d217f85eaf9f32bbb395
Author: Nuno Santos <nsantos at redhat.com>
Date: Fri Jul 6 12:15:33 2012 -0400
Update to 2012.1.1 stable/essex release
.gitignore | 1 +
0001-disable-debug-logging.patch | 25 +++
0002-default-database.patch | 30 ++++
...-removal-of-python-django-nose-dependency.patch | 29 ++++
CVE-2012-2144-session_fixation.patch | 155 --------------------
python-django-horizon-default-db.patch | 19 ---
python-django-horizon-disable-debug.patch | 12 --
python-django-horizon-disable-nose.patch | 18 ---
python-django-horizon.spec | 28 ++--
sources | 2 +-
xss-in-log-viewer.patch | 23 ---
11 files changed, 101 insertions(+), 241 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eb7fa05..99d0f9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/horizon-2012.1~e3.tar.gz
/horizon-2012.1~rc1~20120304.1447.tar.gz
/horizon-2012.1.tar.gz
+/horizon-2012.1.1.tar.gz
diff --git a/0001-disable-debug-logging.patch b/0001-disable-debug-logging.patch
new file mode 100644
index 0000000..877d52c
--- /dev/null
+++ b/0001-disable-debug-logging.patch
@@ -0,0 +1,25 @@
+From d0b788b5ec47432dcb689dc47f8a1b2823a38c09 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso at redhat.com>
+Date: Mon, 9 Apr 2012 18:40:54 -0400
+Subject: [PATCH] disable debug logging
+
+debug=True spewed a bunch of stuff to http logs
+also in debug mode there is django debug page on error which is not intended
+for production
+---
+ .../local/local_settings.py.example | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
+index 0be278a..c443687 100644
+--- a/openstack_dashboard/local/local_settings.py.example
++++ b/openstack_dashboard/local/local_settings.py.example
+@@ -2,7 +2,7 @@ import os
+
+ from django.utils.translation import ugettext_lazy as _
+
+-DEBUG = True
++DEBUG = False
+ TEMPLATE_DEBUG = DEBUG
+ PROD = False
+ USE_SSL = False
diff --git a/0002-default-database.patch b/0002-default-database.patch
new file mode 100644
index 0000000..c677617
--- /dev/null
+++ b/0002-default-database.patch
@@ -0,0 +1,30 @@
+From 8b973aa700f20f2af90211766f0faa4f9a7ccb81 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso at redhat.com>
+Date: Mon, 9 Apr 2012 18:40:54 -0400
+Subject: [PATCH] default database
+
+make sure to create the sqlite db under /var/lib rather than /usr/share
+---
+ .../local/local_settings.py.example | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
+index c443687..0b2b65b 100644
+--- a/openstack_dashboard/local/local_settings.py.example
++++ b/openstack_dashboard/local/local_settings.py.example
+@@ -20,6 +20,15 @@ SECRET_KEY = 'elj1IWiLoWHgcyYxFVLj7cM5rGOOxWl0'
+
+ LOCAL_PATH = os.path.dirname(os.path.abspath(__file__))
+
++# FIXME: We need to change this to mysql, instead of sqlite.
++DATABASES = {
++ 'default': {
++ 'ENGINE': 'django.db.backends.sqlite3',
++ 'NAME': '/var/lib/openstack-dashboard/dashboard_openstack.sqlite3',
++ 'TEST_NAME': os.path.join(LOCAL_PATH, 'test.sqlite3'),
++ },
++}
++
+ # We recommend you use memcached for development; otherwise after every reload
+ # of the django development server, you will have to login again. To use
+ # memcached set CACHE_BACKED to something like 'memcached://127.0.0.1:11211/'
diff --git a/0003-fix-removal-of-python-django-nose-dependency.patch b/0003-fix-removal-of-python-django-nose-dependency.patch
new file mode 100644
index 0000000..ae2b4b8
--- /dev/null
+++ b/0003-fix-removal-of-python-django-nose-dependency.patch
@@ -0,0 +1,29 @@
+From f603c7e43f8da8afb72ac7dcae6d96ee89047b33 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
+Date: Thu, 31 May 2012 23:42:11 +0100
+Subject: [PATCH] fix removal of python-django-nose dependency
+
+remove the references to python-django-nose in settings.py
+---
+ openstack_dashboard/settings.py | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
+index 5153759..664c1ea 100644
+--- a/openstack_dashboard/settings.py
++++ b/openstack_dashboard/settings.py
+@@ -94,14 +94,12 @@ INSTALLED_APPS = (
+ 'django.contrib.sessions',
+ 'django.contrib.messages',
+ 'django.contrib.staticfiles',
+- 'django_nose',
+ 'horizon',
+ 'horizon.dashboards.nova',
+ 'horizon.dashboards.syspanel',
+ 'horizon.dashboards.settings',
+ )
+
+-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
+ AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',)
+ MESSAGE_STORAGE = 'django.contrib.messages.storage.cookie.CookieStorage'
+
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 6182eb8..54c65b5 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -1,5 +1,5 @@
#
-# This is 2012.1 essex-3 milestone
+# This is 2012.1.1 stable/essex milestone
#
%global release_name essex
%global release_letter rc
@@ -9,8 +9,8 @@
%global snaptag ~%{release_letter}%{milestone}~%{snapdate}.%{git_revno}
Name: python-django-horizon
-Version: 2012.1
-Release: 4%{?dist}
+Version: 2012.1.1
+Release: 1%{?dist}
Summary: Django application for talking to Openstack
Group: Development/Libraries
@@ -22,11 +22,12 @@ BuildArch: noarch
Source0: http://launchpad.net/horizon/%{release_name}/%{version}/+download/horizon-%{version}.tar.gz
Source1: openstack-dashboard.conf
-Patch1: %{name}-disable-debug.patch
-Patch2: %{name}-default-db.patch
-Patch3: xss-in-log-viewer.patch
-Patch4: CVE-2012-2144-session_fixation.patch
-Patch5: %{name}-disable-nose.patch
+#
+# patches_base=2012.1.1
+#
+Patch0001: 0001-disable-debug-logging.patch
+Patch0002: 0002-default-database.patch
+Patch0003: 0003-fix-removal-of-python-django-nose-dependency.patch
Requires: Django >= 1.3.0
Requires: openstack-glance >= 2012.1
@@ -87,12 +88,10 @@ Documentation for the Django Horizon application for talking with Openstack
%prep
%setup -q -n horizon-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
%build
%{__python} setup.py build
@@ -141,6 +140,9 @@ python %{_datadir}/openstack-dashboard/manage.py collectstatic --noinput >/dev/n
%doc html
%changelog
+* Fri Jul 6 2012 Nuno Santos <nsantos at redhat.com> - 2012.1.1-1
+- Update to essex stable release 2012.1.1
+
* Wed May 09 2012 Alan Pevec <apevec at redhat.com> - 2012.1-4
- Remove the currently uneeded dependency on python-django-nose
diff --git a/sources b/sources
index 774f118..35566db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24306c7953fc2c4d1fb36951b61443c9 horizon-2012.1.tar.gz
+61bada14dd7dcc5957a8c50a6728cbbd horizon-2012.1.1.tar.gz
More information about the scm-commits
mailing list