Index: head/databases/py-carbon/Makefile =================================================================== --- head/databases/py-carbon/Makefile (revision 408337) +++ head/databases/py-carbon/Makefile (revision 408338) @@ -1,25 +1,28 @@ # Created by: Evan Sarmiento # $FreeBSD$ PORTNAME= carbon -PORTVERSION= 0.9.12 -PORTREVISION= 2 +PORTVERSION= 0.9.15 CATEGORIES= databases python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= swills@FreeBSD.org COMMENT= Backend storage application for graphite LICENSE= APACHE20 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:${PORTSDIR}/net/py-txamqp \ ${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:${PORTSDIR}/databases/py-whisper \ ${PYTHON_PKGNAMEPREFIX}django18>=1.4:${PORTSDIR}/www/py-django18 USE_PYTHON= distutils USES= python:2 twisted:run 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 Index: head/databases/py-carbon/distinfo =================================================================== --- head/databases/py-carbon/distinfo (revision 408337) +++ head/databases/py-carbon/distinfo (revision 408338) @@ -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 Index: head/databases/py-carbon/files/patch-lib__carbon__util.py =================================================================== --- head/databases/py-carbon/files/patch-lib__carbon__util.py (revision 408337) +++ head/databases/py-carbon/files/patch-lib__carbon__util.py (nonexistent) @@ -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 Property changes on: head/databases/py-carbon/files/patch-lib__carbon__util.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/py-carbon/files/patch-conf__carbon.amqp.conf.example =================================================================== --- head/databases/py-carbon/files/patch-conf__carbon.amqp.conf.example (revision 408337) +++ head/databases/py-carbon/files/patch-conf__carbon.amqp.conf.example (revision 408338) @@ -1,11 +1,11 @@ ---- 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 [cache] -LOCAL_DATA_DIR = +LOCAL_DATA_DIR = /var/db/carbon/whisper # Specify the user to drop privileges to # If this is blank carbon runs as the user that invokes it Index: head/databases/py-carbon/files/patch-conf__carbon.conf.example =================================================================== --- head/databases/py-carbon/files/patch-conf__carbon.conf.example (revision 408337) +++ head/databases/py-carbon/files/patch-conf__carbon.conf.example (revision 408338) @@ -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) Index: head/databases/py-carbon/files/patch-setup.cfg =================================================================== --- head/databases/py-carbon/files/patch-setup.cfg (revision 408337) +++ head/databases/py-carbon/files/patch-setup.cfg (revision 408338) @@ -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 Index: head/databases/py-carbon/files/patch-setup.py =================================================================== --- head/databases/py-carbon/files/patch-setup.py (revision 408337) +++ head/databases/py-carbon/files/patch-setup.py (revision 408338) @@ -1,15 +1,15 @@ ---- 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() -storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]), - ('storage/log',[]), ('storage/rrd',[]) ] -conf_files = [ ('conf', glob('conf/*.example')) ] +storage_dirs = [ ('/var/db/carbon/whisper',[]), ('/var/db/carbon/lists',[]), + ('/var/db/carbon/log',[]), ('/var/db/carbon/rrd',[]) ] +conf_files = [ ('/usr/local/etc/carbon', glob('conf/*.example')) ] install_files = storage_dirs + conf_files Index: head/databases/py-carbon/pkg-plist =================================================================== --- head/databases/py-carbon/pkg-plist (revision 408337) +++ head/databases/py-carbon/pkg-plist (revision 408338) @@ -1,110 +1,110 @@ bin/carbon-aggregator.py 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/__init__.pyc +%%PYTHON_SITELIBDIR%%/carbon/__init__.pyo %%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.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_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.py %%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_listener.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/util.pyo -%%PYTHON_SITELIBDIR%%/carbon/relayrules.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/log.py +%%PYTHON_SITELIBDIR%%/carbon/log.pyc %%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.py +%%PYTHON_SITELIBDIR%%/carbon/management.pyc %%PYTHON_SITELIBDIR%%/carbon/management.pyo -%%PYTHON_SITELIBDIR%%/carbon/writer.pyo -%%PYTHON_SITELIBDIR%%/carbon/amqp_listener.pyo -%%PYTHON_SITELIBDIR%%/carbon/rewrite.pyo -%%PYTHON_SITELIBDIR%%/carbon/instrumentation.pyo -%%PYTHON_SITELIBDIR%%/carbon/storage.pyo -%%PYTHON_SITELIBDIR%%/carbon/state.pyo -%%PYTHON_SITELIBDIR%%/carbon/service.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