[graphite-web] update to 0.9.13 pre1 + patches
Piotr Popieluch
piotrp at fedoraproject.org
Sat Mar 7 16:35:11 UTC 2015
commit 7ba7aa54e948bac5e7cc13a241ae013d1f11e645
Author: Piotr Popieluch <piotr1212 at gmail.com>
Date: Sat Mar 7 17:35:01 2015 +0100
update to 0.9.13 pre1 + patches
graphite-web-0.9.12-Changes-for-django-1.5.patch | 176 ---------------------
graphite-web-0.9.12-carbonlink-exception-log.patch | 18 ---
graphite-web-0.9.12-dashboard-load.patch | 30 ----
...e-web-0.9.12-safe-unpickle-deque-addition.patch | 30 ----
...0.9.13-Amend-default-filesystem-locations.patch | 4 +-
...-web-0.9.13-Disable-internal-log-rotation.patch | 0
...e-web-0.9.13-Fix-build-index.sh-variables.patch | 0
...-web-0.9.13-Force-use-of-system-libraries.patch | 4 +-
graphite-web.spec | 48 ++----
9 files changed, 21 insertions(+), 289 deletions(-)
---
diff --git a/graphite-web-0.9.12-Amend-default-filesystem-locations.patch b/graphite-web-0.9.13-Amend-default-filesystem-locations.patch
similarity index 97%
rename from graphite-web-0.9.12-Amend-default-filesystem-locations.patch
rename to graphite-web-0.9.13-Amend-default-filesystem-locations.patch
index 7fcdabc..8eb783d 100644
--- a/graphite-web-0.9.12-Amend-default-filesystem-locations.patch
+++ b/graphite-web-0.9.13-Amend-default-filesystem-locations.patch
@@ -17,9 +17,9 @@ index 0527f53..fcb7a41 100755
import os, sys
-sys.path.append('/opt/graphite/webapp')
+sys.path.append('/usr/share/graphite/webapp')
- os.environ['DJANGO_SETTINGS_MODULE'] = 'graphite.settings'
+ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'graphite.settings')
- import django.core.handlers.wsgi
+ import django
diff --git a/setup.py b/setup.py
index 78d2b20..4dc0ce0 100644
--- a/setup.py
diff --git a/graphite-web-0.9.12-Disable-internal-log-rotation.patch b/graphite-web-0.9.13-Disable-internal-log-rotation.patch
similarity index 100%
rename from graphite-web-0.9.12-Disable-internal-log-rotation.patch
rename to graphite-web-0.9.13-Disable-internal-log-rotation.patch
diff --git a/graphite-web-0.9.12-Fix-build-index.sh-variables.patch b/graphite-web-0.9.13-Fix-build-index.sh-variables.patch
similarity index 100%
rename from graphite-web-0.9.12-Fix-build-index.sh-variables.patch
rename to graphite-web-0.9.13-Fix-build-index.sh-variables.patch
diff --git a/graphite-web-0.9.12-Force-use-of-system-libraries.patch b/graphite-web-0.9.13-Force-use-of-system-libraries.patch
similarity index 98%
rename from graphite-web-0.9.12-Force-use-of-system-libraries.patch
rename to graphite-web-0.9.13-Force-use-of-system-libraries.patch
index fec546f..d92a4e8 100644
--- a/graphite-web-0.9.12-Force-use-of-system-libraries.patch
+++ b/graphite-web-0.9.13-Force-use-of-system-libraries.patch
@@ -17,7 +17,7 @@ index 4dc0ce0..1b910d1 100644
--- a/setup.py
+++ b/setup.py
@@ -54,8 +54,6 @@ setup(
- 'graphite.graphlot',
+ 'graphite.dashboard',
'graphite.events',
'graphite.version',
- 'graphite.thirdparty',
@@ -44,7 +44,7 @@ index 55a644c..8adde3f 100644
+++ b/webapp/graphite/render/attime.py
@@ -16,10 +16,7 @@ from datetime import datetime,timedelta
from time import daylight
- from django.conf import settings
+ from django.utils import timezone
-try: # See if there is a system installation of pytz first
- import pytz
diff --git a/graphite-web.spec b/graphite-web.spec
index b16f198..8408ea5 100644
--- a/graphite-web.spec
+++ b/graphite-web.spec
@@ -4,11 +4,12 @@
%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
-%global commit 28cc7276784bcc4d8a1be6854a6add1145ec4109
+%global commit aa992b96273e6042660111d594ee62108cea52ae
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: graphite-web
-Version: 0.9.12
-Release: 8%{?dist}
+Version: 0.9.13
+Release: 0.3.%{shortcommit}%{?dist}
Summary: A Django web application for enterprise scalable realtime graphing
Group: Applications/Internet
@@ -19,14 +20,10 @@ Source0: https://github.com/graphite-project/graphite-web/archive/%{commi
Source1: graphite-web-vhost.conf
Source2: graphite-web-README.fedora
Source10: %{name}.logrotate
-Patch0: %{name}-0.9.12-Amend-default-filesystem-locations.patch
-Patch1: %{name}-0.9.12-Force-use-of-system-libraries.patch
-Patch2: %{name}-0.9.12-carbonlink-exception-log.patch
-Patch3: %{name}-0.9.12-dashboard-load.patch
-Patch4: %{name}-0.9.12-safe-unpickle-deque-addition.patch
-Patch5: %{name}-0.9.12-Fix-build-index.sh-variables.patch
-Patch6: %{name}-0.9.12-Changes-for-django-1.5.patch
-Patch7: %{name}-0.9.12-Disable-internal-log-rotation.patch
+Patch0: %{name}-0.9.13-Amend-default-filesystem-locations.patch
+Patch1: %{name}-0.9.13-Force-use-of-system-libraries.patch
+Patch5: %{name}-0.9.13-Fix-build-index.sh-variables.patch
+Patch7: %{name}-0.9.13-Disable-internal-log-rotation.patch
BuildArch: noarch
BuildRequires: python-devel
@@ -80,35 +77,15 @@ install -m0644 %{SOURCE2} README.fedora
# Force use of system libraries.
%patch1 -p1
-# To help diagnose some exceptions.
-# https://github.com/graphite-project/graphite-web/pull/446
-%patch2 -p1
-
-# Dashboard not loading when passed as /dashboard/name.
-# https://github.com/graphite-project/graphite-web/issues/411
-%patch3 -p1
-
-# Add deque to the PICKLE_SAFE filter.
-# https://github.com/graphite-project/graphite-web/issues/423
-%patch4 -p1
-
# Fix filesystem locations for variables in build-index.sh.
%patch5 -p1
-%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
-# Changes needed to run without warning using Django 1.5.
-# https://github.com/graphite-project/graphite-web/commit/fc3f018
-%patch6 -p1
-%endif
-
# Disable internal log rotation.
%patch7 -p1
-
%build
%{__python2} setup.py build
-
%install
%{__python2} setup.py install --optimize=1 --skip-build --root %{buildroot} \
--install-lib=%{python_sitelib} \
@@ -173,6 +150,15 @@ chmod 0644 %{buildroot}%{_datadir}/graphite/webapp/content/js/window/*
%changelog
+* Tue Feb 17 2015 Piotr Popieluch <piotr1212 at gmail.com> - 0.9.13-0.3.aa992b9
+- fix IE 10 javascript issues
+
+* Thu Feb 5 2015 Piotr Popieluch <piotr1212 at gmail.com> - 0.9.13-0.2.094cf54
+- update to later commit to fix XSS
+
+* Mon Jan 19 2015 Piotr Popieluch <piotr1212 at gmail.com> - 0.9.13-0.1.pre1
+- update to upstream pre-release
+
* Fri Nov 14 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.9.12-8
- obsolete hacky graphite-web-selinux subpackage
- remove EPEL 5 related packaging things
More information about the scm-commits
mailing list