[python-django-horizon] Updated patches from master-patches
Matthias Runge
mrunge at fedoraproject.org
Thu Nov 29 10:47:10 UTC 2012
commit 01da849cf03e78318eb77c1b03a1cbd40971ef9f
Author: Matthias Runge <mrunge at redhat.com>
Date: Wed Nov 28 12:20:01 2012 +0100
Updated patches from master-patches
.gitignore | 1 +
...-Don-t-access-the-net-while-building-docs.patch | 1 -
0001-disable-debug.patch | 71 +++++++++
...-Don-t-access-the-net-while-building-docs.patch | 22 +++
CVE-2012-2144-session_fixation.patch | 155 --------------------
python-django-horizon-default-db.patch | 19 ---
python-django-horizon-disable-nose.patch | 18 ---
python-django-horizon.spec | 9 +-
sources | 4 +-
xss-in-log-viewer.patch | 23 ---
10 files changed, 102 insertions(+), 221 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 164a895..c639cf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/python-django-horizon-compressed-css.tar.gz
/horizon-2012.2~rc2.tar.gz
/horizon-2012.2.tar.gz
+/horizon-2013.1~g1.tar.gz
diff --git a/0001-disable-debug.patch b/0001-disable-debug.patch
new file mode 100644
index 0000000..1fb0715
--- /dev/null
+++ b/0001-disable-debug.patch
@@ -0,0 +1,71 @@
+From 861c7dd0e53de6a72a1cdb1cdcef802d35f2c927 Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge at redhat.com>
+Date: Tue, 27 Nov 2012 14:08:00 +0100
+Subject: [PATCH] - disable debug - make url movable (currently moved to
+ /dashboard - enable offline compression
+
+---
+ openstack_dashboard/local/local_settings.py.example | 2 +-
+ openstack_dashboard/settings.py | 12 +++++++-----
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
+index e9918cd..2ca2de5 100644
+--- a/openstack_dashboard/local/local_settings.py.example
++++ b/openstack_dashboard/local/local_settings.py.example
+@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
+
+ from openstack_dashboard import exceptions
+
+-DEBUG = True
++DEBUG = False
+ TEMPLATE_DEBUG = DEBUG
+
+ # Set SSL proxy settings:
+diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
+index 790187c..95a78fb 100644
+--- a/openstack_dashboard/settings.py
++++ b/openstack_dashboard/settings.py
+@@ -29,7 +29,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \
+ '%s: %s' % (category.__name__, message)
+
+ ROOT_PATH = os.path.dirname(os.path.abspath(__file__))
+-BIN_DIR = os.path.abspath(os.path.join(ROOT_PATH, '..', 'bin'))
++BIN_DIR = '/usr/bin'
+
+ if ROOT_PATH not in sys.path:
+ sys.path.append(ROOT_PATH)
+@@ -39,12 +39,13 @@ TEMPLATE_DEBUG = DEBUG
+
+ SITE_BRANDING = 'OpenStack Dashboard'
+
+-LOGIN_URL = '/auth/login/'
+-LOGOUT_URL = '/auth/logout/'
++WEBROOT = '/dashboard'
++LOGIN_URL = WEBROOT + '/auth/login/'
++LOGOUT_URL = WEBROOT + '/auth/logout/'
+ # LOGIN_REDIRECT_URL can be used as an alternative for
+ # HORIZON_CONFIG.user_home, if user_home is not set.
+ # Do not set it to '/home/', as this will cause circular redirect loop
+-LOGIN_REDIRECT_URL = '/'
++LOGIN_REDIRECT_URL = WEBROOT
+
+ MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media'))
+ MEDIA_URL = '/media/'
+@@ -102,7 +103,7 @@ STATICFILES_FINDERS = (
+ 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+ )
+
+-less_binary = os.path.join(BIN_DIR, 'less', 'lessc')
++less_binary = os.path.join(BIN_DIR, 'lessc')
+ COMPRESS_PRECOMPILERS = (
+ ('text/less', (less_binary + ' {infile} {outfile}')),
+ )
+@@ -115,6 +116,7 @@ COMPRESS_ENABLED = True
+ COMPRESS_OUTPUT_DIR = 'dashboard'
+ COMPRESS_CSS_HASHING_METHOD = 'hash'
+ COMPRESS_PARSER = 'compressor.parser.HtmlParser'
++COMPRESS_OFFLINE = True
+
+ INSTALLED_APPS = (
+ 'openstack_dashboard',
diff --git a/0002-Don-t-access-the-net-while-building-docs.patch b/0002-Don-t-access-the-net-while-building-docs.patch
new file mode 100644
index 0000000..6b77381
--- /dev/null
+++ b/0002-Don-t-access-the-net-while-building-docs.patch
@@ -0,0 +1,22 @@
+From 0a6c500edfe5d0aaa64d5522cc34b177b7a1fe33 Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge at redhat.com>
+Date: Wed, 28 Nov 2012 11:37:48 +0100
+Subject: [PATCH] Don't access the net while building docs
+
+(Note this hasn't been submitted upstream)
+---
+ doc/source/conf.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 37b8813..e754d5c 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -141,7 +141,6 @@ write_autodoc_index()
+ # They can be extensions coming with Sphinx (named 'sphinx.ext.*')
+ # or your custom ones.
+ extensions = ['sphinx.ext.autodoc',
+- 'sphinx.ext.intersphinx',
+ 'sphinx.ext.todo',
+ 'sphinx.ext.coverage',
+ 'sphinx.ext.pngmath',
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index f5aaf2b..b354b89 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -18,7 +18,9 @@ Source3: python-django-horizon-compressed-css.tar.gz
#
# patches_base=grizzly-1
#
-Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
+Patch0001: 0001-disable-debug.patch
+Patch0002: 0002-Don-t-access-the-net-while-building-docs.patch
+
%if 0%{?rhel}<7 || 0%{?fedora} < 18
@@ -107,9 +109,10 @@ Documentation for the Django Horizon application for talking with Openstack
%prep
%setup -q -n horizon-%{version}
+%patch0001 -p1
+%patch0002 -p1
# remove unnecessary .po files
find . -name "django*.po" -exec rm -f '{}' \;
-
# patch settings
# %patch0 -p1
# disable debug also in local_settings.py
@@ -236,7 +239,7 @@ tar xzf %{SOURCE3}
%doc html
%changelog
-* Tue Nov 27 2012 Matthias Runge <mrunge at redhat.com> - 2013.1-0.1.g1
+* Thu Nov 29 2012 Matthias Runge <mrunge at redhat.com> - 2013.1-0.1.g1
- update to grizzly-1 milestone
* Tue Nov 13 2012 Matthias Runge <mrunge at redhat.com> - 2012.2-4
diff --git a/sources b/sources
index 4e89ef4..375383d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f1d6199c092d29f20499e47e88ed2c7d horizon-2012.2.tar.gz
-bb6791f3bd4fffeb6c7893384c89c337 python-django-horizon-compressed-css.tar.gz
+404346c05423ad38a33bfa6318671c12 python-django-horizon-compressed-css.tar.gz
+00eca3b722b7ab7772ee3c6334acdf83 horizon-2013.1~g1.tar.gz
More information about the scm-commits
mailing list