1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00

databases/py-carbon: update to 0.9.15

PR:		206532
Submitted by:	Michael Zhilin <mizhka@gmail.com>
This commit is contained in:
Steve Wills 2016-02-07 00:16:57 +00:00
parent 6252bbf713
commit 4b848679a5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=408338
8 changed files with 111 additions and 116 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= carbon
PORTVERSION= 0.9.12
PORTREVISION= 2
PORTVERSION= 0.9.15
CATEGORIES= databases python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -22,4 +21,8 @@ USE_RC_SUBR= carbon
USE_GITHUB= yes
GH_ACCOUNT= graphite-project
post-stage:
${RM} -rf ${STAGEDIR}${PREFIX}/examples/init.d
${RMDIR} ${STAGEDIR}${PREFIX}/examples
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (graphite-project-carbon-0.9.12_GH0.tar.gz) = 06003f72fd022a7c571734cf3acdcd9c784d505c145acbf0906a2fef886abaa6
SIZE (graphite-project-carbon-0.9.12_GH0.tar.gz) = 52107
SHA256 (graphite-project-carbon-0.9.15_GH0.tar.gz) = 3bfab79b7bf11a0f49414a45fa5fcd71e104fec3242f6dec26869060e69924a0
SIZE (graphite-project-carbon-0.9.15_GH0.tar.gz) = 57328

View File

@ -1,5 +1,5 @@
--- conf/carbon.amqp.conf.example.orig 2014-02-13 17:04:10.949705742 +0000
+++ conf/carbon.amqp.conf.example 2014-02-13 17:04:42.404703056 +0000
--- conf/carbon.amqp.conf.example.orig 2015-11-27 18:37:07 UTC
+++ conf/carbon.amqp.conf.example
@@ -1,7 +1,7 @@
# This is a configuration file with AMQP enabled

View File

@ -1,10 +1,10 @@
--- conf/carbon.conf.example.orig 2014-02-13 16:47:59.689772807 +0000
+++ conf/carbon.conf.example 2014-02-13 16:48:17.904771292 +0000
--- conf/carbon.conf.example.orig 2015-11-27 18:37:07 UTC
+++ conf/carbon.conf.example
@@ -29,6 +29,7 @@
# PID_DIR = /var/run/
#
#LOCAL_DATA_DIR = /opt/graphite/storage/whisper/
+LOCAL_DATA_DIR = /var/db/carbon/whisper/
# Enable daily log rotation. If disabled, a kill -HUP can be used after a manual rotate
ENABLE_LOGROTATION = True
# Enable daily log rotation. If disabled, carbon will automatically re-open
# the file if it's rotated out of place (e.g. by logrotate daemon)

View File

@ -1,11 +0,0 @@
--- ./lib/carbon/util.py.orig 2013-12-22 16:45:46.061449090 +0000
+++ ./lib/carbon/util.py 2013-12-22 16:46:00.326083639 +0000
@@ -18,7 +18,7 @@
from time import sleep, time
from twisted.python.util import initgroups
from twisted.scripts.twistd import runApp
-from twisted.scripts._twistd_unix import daemonize
+from django.utils import daemonize
daemonize = daemonize # Backwards compatibility

View File

@ -1,6 +1,9 @@
--- setup.cfg.org 2011-05-05 20:55:25.000000000 -0400
+++ setup.cfg 2011-05-05 20:55:31.000000000 -0400
@@ -1,3 +1 @@
--- setup.cfg.orig 2015-11-27 18:37:07 UTC
+++ setup.cfg
@@ -1,6 +1,4 @@
[install]
-prefix = /opt/graphite
-install-lib = %(prefix)s/lib
[bdist_rpm]
requires = python-twisted

View File

@ -1,6 +1,6 @@
--- setup.py.orig 2013-08-20 17:37:08.000000000 +0000
+++ setup.py 2013-08-21 01:19:40.025390594 +0000
@@ -13,9 +13,9 @@
--- setup.py.orig 2015-11-27 18:37:07 UTC
+++ setup.py
@@ -13,9 +13,9 @@ else:
setup_kwargs = dict()

View File

@ -3,108 +3,108 @@ bin/carbon-cache.py
bin/carbon-client.py
bin/carbon-relay.py
bin/validate-storage-schemas.py
@sample %%ETCDIR%%/rewrite-rules.conf.example etc/carbon/rewrite-rules.conf
@sample %%ETCDIR%%/aggregation-rules.conf.example etc/carbon/aggregation-rules.conf
@sample %%ETCDIR%%/blacklist.conf.example etc/carbon/blacklist.conf
@sample %%ETCDIR%%/carbon.amqp.conf.example etc/carbon/carbon.amqp.conf
@sample %%ETCDIR%%/carbon.conf.example etc/carbon/carbon.conf
@sample %%ETCDIR%%/aggregation-rules.conf.example etc/carbon/aggregation-rules.conf
@sample %%ETCDIR%%/relay-rules.conf.example etc/carbon/relay-rules.conf
@sample %%ETCDIR%%/storage-schemas.conf.example etc/carbon/storage-schemas.conf
@sample %%ETCDIR%%/blacklist.conf.example etc/carbon/blacklist.conf
@sample %%ETCDIR%%/rewrite-rules.conf.example etc/carbon/rewrite-rules.conf
@sample %%ETCDIR%%/storage-aggregation.conf.example etc/carbon/storage-aggregation.conf
@sample %%ETCDIR%%/storage-schemas.conf.example etc/carbon/storage-schemas.conf
@sample %%ETCDIR%%/whitelist.conf.example etc/carbon/whitelist.conf
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_aggregator_plugin.py
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_relay_plugin.py
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_cache_plugin.py
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_aggregator_plugin.pyc
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_relay_plugin.pyc
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_cache_plugin.pyc
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_aggregator_plugin.pyo
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_relay_plugin.pyo
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_cache_plugin.pyo
%%PYTHON_SITELIBDIR%%/carbon/amqp_publisher.py
%%PYTHON_SITELIBDIR%%/carbon/cache.py
%%PYTHON_SITELIBDIR%%/carbon/client.py
%%PYTHON_SITELIBDIR%%/carbon/exceptions.py
%%PYTHON_SITELIBDIR%%/carbon/util.py
%%PYTHON_SITELIBDIR%%/carbon/relayrules.py
%%PYTHON_SITELIBDIR%%/carbon/hashing.py
%%PYTHON_SITELIBDIR%%/carbon/log.py
%%PYTHON_SITELIBDIR%%/carbon/manhole.py
%%PYTHON_SITELIBDIR%%/carbon/events.py
%%PYTHON_SITELIBDIR%%/carbon/__init__.py
%%PYTHON_SITELIBDIR%%/carbon/routers.py
%%PYTHON_SITELIBDIR%%/carbon/conf.py
%%PYTHON_SITELIBDIR%%/carbon/management.py
%%PYTHON_SITELIBDIR%%/carbon/writer.py
%%PYTHON_SITELIBDIR%%/carbon/amqp_listener.py
%%PYTHON_SITELIBDIR%%/carbon/rewrite.py
%%PYTHON_SITELIBDIR%%/carbon/instrumentation.py
%%PYTHON_SITELIBDIR%%/carbon/storage.py
%%PYTHON_SITELIBDIR%%/carbon/state.py
%%PYTHON_SITELIBDIR%%/carbon/service.py
%%PYTHON_SITELIBDIR%%/carbon/protocols.py
%%PYTHON_SITELIBDIR%%/carbon/aggregator/rules.py
%%PYTHON_SITELIBDIR%%/carbon/aggregator/__init__.py
%%PYTHON_SITELIBDIR%%/carbon/aggregator/receiver.py
%%PYTHON_SITELIBDIR%%/carbon/aggregator/buffers.py
%%PYTHON_SITELIBDIR%%/carbon/aggregator/rules.pyc
%%PYTHON_SITELIBDIR%%/carbon/aggregator/__init__.pyc
%%PYTHON_SITELIBDIR%%/carbon/aggregator/receiver.pyc
%%PYTHON_SITELIBDIR%%/carbon/aggregator/buffers.pyc
%%PYTHON_SITELIBDIR%%/carbon/aggregator/rules.pyo
%%PYTHON_SITELIBDIR%%/carbon/aggregator/__init__.pyo
%%PYTHON_SITELIBDIR%%/carbon/aggregator/receiver.pyo
%%PYTHON_SITELIBDIR%%/carbon/aggregator/buffers.pyo
%%PYTHON_SITELIBDIR%%/carbon/amqp0-8.xml
%%PYTHON_SITELIBDIR%%/carbon/amqp_publisher.pyc
%%PYTHON_SITELIBDIR%%/carbon/cache.pyc
%%PYTHON_SITELIBDIR%%/carbon/client.pyc
%%PYTHON_SITELIBDIR%%/carbon/exceptions.pyc
%%PYTHON_SITELIBDIR%%/carbon/util.pyc
%%PYTHON_SITELIBDIR%%/carbon/relayrules.pyc
%%PYTHON_SITELIBDIR%%/carbon/hashing.pyc
%%PYTHON_SITELIBDIR%%/carbon/log.pyc
%%PYTHON_SITELIBDIR%%/carbon/manhole.pyc
%%PYTHON_SITELIBDIR%%/carbon/events.pyc
%%PYTHON_SITELIBDIR%%/carbon/__init__.pyc
%%PYTHON_SITELIBDIR%%/carbon/routers.pyc
%%PYTHON_SITELIBDIR%%/carbon/conf.pyc
%%PYTHON_SITELIBDIR%%/carbon/management.pyc
%%PYTHON_SITELIBDIR%%/carbon/writer.pyc
%%PYTHON_SITELIBDIR%%/carbon/amqp_listener.pyc
%%PYTHON_SITELIBDIR%%/carbon/rewrite.pyc
%%PYTHON_SITELIBDIR%%/carbon/instrumentation.pyc
%%PYTHON_SITELIBDIR%%/carbon/storage.pyc
%%PYTHON_SITELIBDIR%%/carbon/state.pyc
%%PYTHON_SITELIBDIR%%/carbon/service.pyc
%%PYTHON_SITELIBDIR%%/carbon/protocols.pyc
%%PYTHON_SITELIBDIR%%/carbon/amqp_publisher.pyo
%%PYTHON_SITELIBDIR%%/carbon/cache.pyo
%%PYTHON_SITELIBDIR%%/carbon/client.pyo
%%PYTHON_SITELIBDIR%%/carbon/exceptions.pyo
%%PYTHON_SITELIBDIR%%/carbon/util.pyo
%%PYTHON_SITELIBDIR%%/carbon/relayrules.pyo
%%PYTHON_SITELIBDIR%%/carbon/hashing.pyo
%%PYTHON_SITELIBDIR%%/carbon/log.pyo
%%PYTHON_SITELIBDIR%%/carbon/manhole.pyo
%%PYTHON_SITELIBDIR%%/carbon/events.pyo
%%PYTHON_SITELIBDIR%%/carbon/__init__.pyo
%%PYTHON_SITELIBDIR%%/carbon/routers.pyo
%%PYTHON_SITELIBDIR%%/carbon/conf.pyo
%%PYTHON_SITELIBDIR%%/carbon/management.pyo
%%PYTHON_SITELIBDIR%%/carbon/writer.pyo
%%PYTHON_SITELIBDIR%%/carbon/aggregator/__init__.py
%%PYTHON_SITELIBDIR%%/carbon/aggregator/__init__.pyc
%%PYTHON_SITELIBDIR%%/carbon/aggregator/__init__.pyo
%%PYTHON_SITELIBDIR%%/carbon/aggregator/buffers.py
%%PYTHON_SITELIBDIR%%/carbon/aggregator/buffers.pyc
%%PYTHON_SITELIBDIR%%/carbon/aggregator/buffers.pyo
%%PYTHON_SITELIBDIR%%/carbon/aggregator/receiver.py
%%PYTHON_SITELIBDIR%%/carbon/aggregator/receiver.pyc
%%PYTHON_SITELIBDIR%%/carbon/aggregator/receiver.pyo
%%PYTHON_SITELIBDIR%%/carbon/aggregator/rules.py
%%PYTHON_SITELIBDIR%%/carbon/aggregator/rules.pyc
%%PYTHON_SITELIBDIR%%/carbon/aggregator/rules.pyo
%%PYTHON_SITELIBDIR%%/carbon/amqp0-8.xml
%%PYTHON_SITELIBDIR%%/carbon/amqp_listener.py
%%PYTHON_SITELIBDIR%%/carbon/amqp_listener.pyc
%%PYTHON_SITELIBDIR%%/carbon/amqp_listener.pyo
%%PYTHON_SITELIBDIR%%/carbon/rewrite.pyo
%%PYTHON_SITELIBDIR%%/carbon/amqp_publisher.py
%%PYTHON_SITELIBDIR%%/carbon/amqp_publisher.pyc
%%PYTHON_SITELIBDIR%%/carbon/amqp_publisher.pyo
%%PYTHON_SITELIBDIR%%/carbon/cache.py
%%PYTHON_SITELIBDIR%%/carbon/cache.pyc
%%PYTHON_SITELIBDIR%%/carbon/cache.pyo
%%PYTHON_SITELIBDIR%%/carbon/client.py
%%PYTHON_SITELIBDIR%%/carbon/client.pyc
%%PYTHON_SITELIBDIR%%/carbon/client.pyo
%%PYTHON_SITELIBDIR%%/carbon/conf.py
%%PYTHON_SITELIBDIR%%/carbon/conf.pyc
%%PYTHON_SITELIBDIR%%/carbon/conf.pyo
%%PYTHON_SITELIBDIR%%/carbon/events.py
%%PYTHON_SITELIBDIR%%/carbon/events.pyc
%%PYTHON_SITELIBDIR%%/carbon/events.pyo
%%PYTHON_SITELIBDIR%%/carbon/exceptions.py
%%PYTHON_SITELIBDIR%%/carbon/exceptions.pyc
%%PYTHON_SITELIBDIR%%/carbon/exceptions.pyo
%%PYTHON_SITELIBDIR%%/carbon/hashing.py
%%PYTHON_SITELIBDIR%%/carbon/hashing.pyc
%%PYTHON_SITELIBDIR%%/carbon/hashing.pyo
%%PYTHON_SITELIBDIR%%/carbon/instrumentation.py
%%PYTHON_SITELIBDIR%%/carbon/instrumentation.pyc
%%PYTHON_SITELIBDIR%%/carbon/instrumentation.pyo
%%PYTHON_SITELIBDIR%%/carbon/storage.pyo
%%PYTHON_SITELIBDIR%%/carbon/state.pyo
%%PYTHON_SITELIBDIR%%/carbon/service.pyo
%%PYTHON_SITELIBDIR%%/carbon/log.py
%%PYTHON_SITELIBDIR%%/carbon/log.pyc
%%PYTHON_SITELIBDIR%%/carbon/log.pyo
%%PYTHON_SITELIBDIR%%/carbon/management.py
%%PYTHON_SITELIBDIR%%/carbon/management.pyc
%%PYTHON_SITELIBDIR%%/carbon/management.pyo
%%PYTHON_SITELIBDIR%%/carbon/manhole.py
%%PYTHON_SITELIBDIR%%/carbon/manhole.pyc
%%PYTHON_SITELIBDIR%%/carbon/manhole.pyo
%%PYTHON_SITELIBDIR%%/carbon/protocols.py
%%PYTHON_SITELIBDIR%%/carbon/protocols.pyc
%%PYTHON_SITELIBDIR%%/carbon/protocols.pyo
%%PYTHON_SITELIBDIR%%/carbon/regexlist.py
%%PYTHON_SITELIBDIR%%/carbon/regexlist.pyc
%%PYTHON_SITELIBDIR%%/carbon/regexlist.pyo
@dir /var/db/carbon/whisper
@dir /var/db/carbon/rrd
@dir /var/db/carbon/log
%%PYTHON_SITELIBDIR%%/carbon/relayrules.py
%%PYTHON_SITELIBDIR%%/carbon/relayrules.pyc
%%PYTHON_SITELIBDIR%%/carbon/relayrules.pyo
%%PYTHON_SITELIBDIR%%/carbon/rewrite.py
%%PYTHON_SITELIBDIR%%/carbon/rewrite.pyc
%%PYTHON_SITELIBDIR%%/carbon/rewrite.pyo
%%PYTHON_SITELIBDIR%%/carbon/routers.py
%%PYTHON_SITELIBDIR%%/carbon/routers.pyc
%%PYTHON_SITELIBDIR%%/carbon/routers.pyo
%%PYTHON_SITELIBDIR%%/carbon/service.py
%%PYTHON_SITELIBDIR%%/carbon/service.pyc
%%PYTHON_SITELIBDIR%%/carbon/service.pyo
%%PYTHON_SITELIBDIR%%/carbon/state.py
%%PYTHON_SITELIBDIR%%/carbon/state.pyc
%%PYTHON_SITELIBDIR%%/carbon/state.pyo
%%PYTHON_SITELIBDIR%%/carbon/storage.py
%%PYTHON_SITELIBDIR%%/carbon/storage.pyc
%%PYTHON_SITELIBDIR%%/carbon/storage.pyo
%%PYTHON_SITELIBDIR%%/carbon/util.py
%%PYTHON_SITELIBDIR%%/carbon/util.pyc
%%PYTHON_SITELIBDIR%%/carbon/util.pyo
%%PYTHON_SITELIBDIR%%/carbon/writer.py
%%PYTHON_SITELIBDIR%%/carbon/writer.pyc
%%PYTHON_SITELIBDIR%%/carbon/writer.pyo
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_aggregator_plugin.py
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_aggregator_plugin.pyc
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_aggregator_plugin.pyo
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_cache_plugin.py
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_cache_plugin.pyc
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_cache_plugin.pyo
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_relay_plugin.py
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_relay_plugin.pyc
%%PYTHON_SITELIBDIR%%/twisted/plugins/carbon_relay_plugin.pyo
@dir /var/db/carbon/lists
@dir /var/db/carbon/log
@dir /var/db/carbon/rrd
@dir /var/db/carbon/whisper
@dir /var/db/carbon