Attachment 166018 Details for Bug 206534 – SVN diff file

[patch] SVN diff file

svn-www-py-graphite-web.diff (text/plain), 11.26 KB, created by Michael Zhilin on 2016-01-23 17:55:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Zhilin

Created: 2016-01-23 17:55:43 UTC

Size: 11.26 KB

patch

obsolete

>Index: www/py-graphite-web/Makefile
>===================================================================
>--- www/py-graphite-web/Makefile	(revision 407034)
>+++ www/py-graphite-web/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	graphite-web
>-PORTVERSION=	0.9.12
>-PORTREVISION=	3
>+PORTVERSION=	0.9.15
> CATEGORIES=	www python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -14,7 +13,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:${PORTSDIR}/graphics/py-cairo \
> 		${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:${PORTSDIR}/databases/py-carbon \
>-		${PYTHON_PKGNAMEPREFIX}django18>=1.4:${PORTSDIR}/www/py-django18 \
>+		${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django \
> 		${PYTHON_PKGNAMEPREFIX}django-tagging>=0.3.1:${PORTSDIR}/www/py-django-tagging \
> 		xorg-fonts-truetype>=0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype
> 
>Index: www/py-graphite-web/distinfo
>===================================================================
>--- www/py-graphite-web/distinfo	(revision 407034)
>+++ www/py-graphite-web/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (graphite-project-graphite-web-0.9.12_GH0.tar.gz) = 03a4403fdb36e5707d3dbd6a71d9be1e80b1adbbe49e3e0989a15829d02f23d2
>-SIZE (graphite-project-graphite-web-0.9.12_GH0.tar.gz) = 2334147
>+SHA256 (graphite-project-graphite-web-0.9.15_GH0.tar.gz) = 75c53e9de089738280f1ed1084b6b4df79b9f94cb99a20c479645046c80ca677
>+SIZE (graphite-project-graphite-web-0.9.15_GH0.tar.gz) = 2434438
>Index: www/py-graphite-web/files/patch-bin__build-index.sh
>===================================================================
>--- www/py-graphite-web/files/patch-bin__build-index.sh	(revision 407034)
>+++ www/py-graphite-web/files/patch-bin__build-index.sh	(working copy)
>@@ -1,5 +1,5 @@
>---- bin/build-index.sh.orig	2014-02-14 15:05:38.180621787 +0000
>-+++ bin/build-index.sh	2014-02-14 15:31:54.580513137 +0000
>+--- bin/build-index.sh.orig	2015-11-27 18:37:16 UTC
>++++ bin/build-index.sh
> @@ -1,17 +1,19 @@
> -#!/bin/bash
> +#!/bin/sh
>@@ -25,7 +25,7 @@
>  
>  if [ ! -d "$WHISPER_DIR" ]
>  then
>-@@ -19,13 +21,17 @@
>+@@ -19,13 +21,17 @@ then
>    exit 1
>  fi
>  
>Index: www/py-graphite-web/files/patch-conf__graphite.wsgi.example
>===================================================================
>--- www/py-graphite-web/files/patch-conf__graphite.wsgi.example	(revision 407034)
>+++ www/py-graphite-web/files/patch-conf__graphite.wsgi.example	(working copy)
>@@ -1,14 +1,10 @@
>---- conf/graphite.wsgi.example.orig	2013-08-21 17:11:04.000000000 +0000
>-+++ conf/graphite.wsgi.example	2014-09-14 03:30:45.456594225 +0000
>-@@ -1,8 +1,10 @@
>- import os, sys
>+--- conf/graphite.wsgi.example.orig	2015-11-27 18:37:16 UTC
>++++ conf/graphite.wsgi.example
>+@@ -1,6 +1,6 @@
>+ import os
>+ import sys
> -sys.path.append('/opt/graphite/webapp')
> +sys.path.append('%%PREFIX%%/graphite/webapp')
>- os.environ['DJANGO_SETTINGS_MODULE'] = 'graphite.settings'
>  
>-+import django
>- import django.core.handlers.wsgi
>-+django.setup()
>- 
>- application = django.core.handlers.wsgi.WSGIHandler()
>- 
>+ try:
>+     from importlib import import_module
>Index: www/py-graphite-web/files/patch-setup.py
>===================================================================
>--- www/py-graphite-web/files/patch-setup.py	(revision 407034)
>+++ www/py-graphite-web/files/patch-setup.py	(working copy)
>@@ -1,6 +1,15 @@
>---- setup.py.orig	2013-08-21 17:11:04.000000000 +0000
>-+++ setup.py	2014-02-14 04:44:44.290189349 +0000
>-@@ -15,11 +15,11 @@
>+--- setup.py.orig	2015-11-27 18:37:16 UTC
>++++ setup.py
>+@@ -23,8 +23,6 @@ else:
>+         cf.add_section('install')
>+     except ConfigParser.DuplicateSectionError:
>+         pass
>+-    cf.set('install', 'prefix', '/opt/graphite')
>+-    cf.set('install', 'install-lib', '%(prefix)s/webapp')
>+ 
>+ with open('setup.cfg', 'wb') as f:
>+     cf.write(f)
>+@@ -41,11 +39,11 @@ else:
>  storage_dirs = []
>  
>  for subdir in ('whisper', 'rrd', 'log', 'log/webapp'):
>@@ -14,20 +23,21 @@
>    for filename in files:
>      filepath = os.path.join(root, filename)
>  
>-@@ -29,7 +29,7 @@
>+@@ -55,7 +53,7 @@ for root, dirs, files in os.walk('webapp
>      webapp_content[root].append(filepath)
>  
>  
> -conf_files = [ ('conf', glob('conf/*.example')) ]
>-+conf_files = [ ('/usr/local/etc/graphite', glob('conf/*.example')) ]
>++conf_files = [ ('%%PREFIX%%/etc/graphite', glob('conf/*.example')) ]
>  examples = [ ('examples', glob('examples/example-*')) ]
>  
>- setup(
>-@@ -60,6 +60,6 @@
>-   package_data={'graphite' :
>-     ['templates/*', 'local_settings.py.example']},
>-   scripts=glob('bin/*'),
>--  data_files=webapp_content.items() + storage_dirs + conf_files + examples,
>-+  data_files=conf_files,
>-   **setup_kwargs
>- )
>+ try:
>+@@ -87,7 +85,7 @@ try:
>+       package_data={'graphite' :
>+         ['templates/*', 'local_settings.py.example']},
>+       scripts=glob('bin/*'),
>+-      data_files=webapp_content.items() + storage_dirs + conf_files + examples,
>++      data_files=conf_files,
>+       **setup_kwargs
>+     )
>+ finally:
>Index: www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example
>===================================================================
>--- www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example	(revision 407034)
>+++ www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example	(working copy)
>@@ -1,5 +1,5 @@
>---- webapp/graphite/local_settings.py.example.orig	2013-08-21 17:11:04.000000000 +0000
>-+++ webapp/graphite/local_settings.py.example	2014-02-14 05:02:05.550117395 +0000
>+--- webapp/graphite/local_settings.py.example.orig	2015-11-27 18:37:16 UTC
>++++ webapp/graphite/local_settings.py.example
> @@ -62,6 +62,9 @@
>  #CONF_DIR = '/opt/graphite/conf'
>  #STORAGE_DIR = '/opt/graphite/storage'
>@@ -6,7 +6,7 @@
>  #CONTENT_DIR = '/opt/graphite/webapp/content'
> +CONF_DIR = '%%PREFIX%%/etc/graphite'
> +STORAGE_DIR = '/var/db/carbon'
>-+CONTENT_DIR = '%%DATADIR%%/content'
>++CONTENT_DIR = '%%PREFIX%%/share/graphite-web/content'
>  
>  # To further or fully customize the paths, modify the following. Note that the
>  # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
>Index: www/py-graphite-web/files/pkg-message.in
>===================================================================
>--- www/py-graphite-web/files/pkg-message.in	(revision 407034)
>+++ www/py-graphite-web/files/pkg-message.in	(working copy)
>@@ -58,6 +58,7 @@
> 	<Directory "%%PYTHON_SITELIBDIR%%/django/contrib/admin/static/">
> 		Order deny,allow
> 		Allow from all
>+		Require all granted
> 	</Directory>
> 
> 	# The graphite.wsgi file has to be accessible by apache. It won't
>@@ -65,11 +66,13 @@
> 	<Directory %%PREFIX%%/etc/graphite/>
> 		Order deny,allow
> 		Allow from all
>+		Require all granted
> 	</Directory>
> 
> 	<Directory %%DATADIR%%/content/>
> 		Order deny,allow
> 		Allow from all
>+		Require all granted
> 	</Directory>
> 
> </VirtualHost>
>Index: www/py-graphite-web/pkg-plist
>===================================================================
>--- www/py-graphite-web/pkg-plist	(revision 407034)
>+++ www/py-graphite-web/pkg-plist	(working copy)
>@@ -47,36 +47,26 @@
> %%DATADIR%%/content/css/default/top_left.gif
> %%DATADIR%%/content/css/default/top_mid.gif
> %%DATADIR%%/content/css/default/top_right.gif
>-%%DATADIR%%/content/css/jquery.autocomplete.css
> %%DATADIR%%/content/css/table.css
> %%DATADIR%%/content/html/completerHelp.html
> %%DATADIR%%/content/html/searchHelp.html
> %%DATADIR%%/content/html/timeHelp.html
>-%%DATADIR%%/content/img/I.gif
>-%%DATADIR%%/content/img/L.gif
>-%%DATADIR%%/content/img/Lminus.gif
>-%%DATADIR%%/content/img/Lplus.gif
>-%%DATADIR%%/content/img/T.gif
>-%%DATADIR%%/content/img/Tminus.gif
>-%%DATADIR%%/content/img/Tplus.gif
>-%%DATADIR%%/content/img/arrow1.gif
> %%DATADIR%%/content/img/blank.gif
>-%%DATADIR%%/content/img/calBt.gif
>+%%DATADIR%%/content/img/calendar.png
> %%DATADIR%%/content/img/carbon-fiber.png
>+%%DATADIR%%/content/img/clock.png
> %%DATADIR%%/content/img/clock_16.png
>-%%DATADIR%%/content/img/delete.gif
>-%%DATADIR%%/content/img/error.png
>-%%DATADIR%%/content/img/folder.png
> %%DATADIR%%/content/img/graphite.png
> %%DATADIR%%/content/img/graphite_short.png
>-%%DATADIR%%/content/img/indicator.png
> %%DATADIR%%/content/img/leaf.gif
>-%%DATADIR%%/content/img/line_chart.png
> %%DATADIR%%/content/img/mini-bottom2.gif
> %%DATADIR%%/content/img/mini-top2.gif
>-%%DATADIR%%/content/img/save.gif
>-%%DATADIR%%/content/img/searching.gif
>-%%DATADIR%%/content/img/updateGraph.gif
>+%%DATADIR%%/content/img/overview.png
>+%%DATADIR%%/content/img/refresh.png
>+%%DATADIR%%/content/img/save.png
>+%%DATADIR%%/content/img/share.png
>+%%DATADIR%%/content/img/trash.png
>+%%DATADIR%%/content/img/upload.png
> %%DATADIR%%/content/js/ace/ace.js
> %%DATADIR%%/content/js/ace/keybinding-vim.js
> %%DATADIR%%/content/js/ace/mode-c_cpp.js
>@@ -544,12 +534,6 @@
> %%DATADIR%%/content/js/ext/resources/images/default/window/top-bottom.png
> %%DATADIR%%/content/js/ext/resources/images/default/window/top-bottom.psd
> %%DATADIR%%/content/js/ext/ux/DataViewTransition.js
>-%%DATADIR%%/content/js/jquery.autocomplete.js
>-%%DATADIR%%/content/js/jquery.flot.crosshair.js
>-%%DATADIR%%/content/js/jquery.flot.js
>-%%DATADIR%%/content/js/jquery.flot.selection.js
>-%%DATADIR%%/content/js/jquery.graphite.js
>-%%DATADIR%%/content/js/jquery.js
> %%DATADIR%%/content/js/scriptaculous/builder.js
> %%DATADIR%%/content/js/scriptaculous/controls.js
> %%DATADIR%%/content/js/scriptaculous/dragdrop.js
>@@ -650,15 +634,6 @@
> %%PYTHON_SITELIBDIR%%/graphite/events/views.py
> %%PYTHON_SITELIBDIR%%/graphite/events/views.pyc
> %%PYTHON_SITELIBDIR%%/graphite/events/views.pyo
>-%%PYTHON_SITELIBDIR%%/graphite/graphlot/__init__.py
>-%%PYTHON_SITELIBDIR%%/graphite/graphlot/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/graphite/graphlot/__init__.pyo
>-%%PYTHON_SITELIBDIR%%/graphite/graphlot/urls.py
>-%%PYTHON_SITELIBDIR%%/graphite/graphlot/urls.pyc
>-%%PYTHON_SITELIBDIR%%/graphite/graphlot/urls.pyo
>-%%PYTHON_SITELIBDIR%%/graphite/graphlot/views.py
>-%%PYTHON_SITELIBDIR%%/graphite/graphlot/views.pyc
>-%%PYTHON_SITELIBDIR%%/graphite/graphlot/views.pyo
> %%PYTHON_SITELIBDIR%%/graphite/local_settings.py.example
> %%PYTHON_SITELIBDIR%%/graphite/local_settings.py
> %%PYTHON_SITELIBDIR%%/graphite/logger.py
>@@ -731,7 +706,6 @@
> %%PYTHON_SITELIBDIR%%/graphite/templates/editProfile.html
> %%PYTHON_SITELIBDIR%%/graphite/templates/event.html
> %%PYTHON_SITELIBDIR%%/graphite/templates/events.html
>-%%PYTHON_SITELIBDIR%%/graphite/templates/graphlot.html
> %%PYTHON_SITELIBDIR%%/graphite/templates/login.html
> %%PYTHON_SITELIBDIR%%/graphite/templates/version.html
> %%PYTHON_SITELIBDIR%%/graphite/thirdparty/__init__.py
>@@ -758,6 +732,18 @@
> %%PYTHON_SITELIBDIR%%/graphite/urls.py
> %%PYTHON_SITELIBDIR%%/graphite/urls.pyc
> %%PYTHON_SITELIBDIR%%/graphite/urls.pyo
>+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/__init__.py
>+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/baseconv.py
>+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/baseconv.pyc
>+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/baseconv.pyo
>+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/models.py
>+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/models.pyc
>+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/models.pyo
>+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/views.py
>+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/views.pyc
>+%%PYTHON_SITELIBDIR%%/graphite/url_shortener/views.pyo
> %%PYTHON_SITELIBDIR%%/graphite/util.py
> %%PYTHON_SITELIBDIR%%/graphite/util.pyc
> %%PYTHON_SITELIBDIR%%/graphite/util.pyo

Actions: View | Diff

Attachments on bug 206534: 166018 | 166019 | 166020 | 166021