diff options
| author | swills <swills@FreeBSD.org> | 2013-10-01 03:24:34 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2013-10-01 03:24:34 +0800 |
| commit | 44ca3cac9da8a20ab4639c9c1fc8c8086d3de640 (patch) | |
| tree | c723c0eedf082a2bb3715d5cfda78bfe0fed90b5 | |
| parent | 7f747771a309a0bc7f06a14d6e9113d899693dd9 (diff) | |
| download | freebsd-ports-gnome-44ca3cac9da8a20ab4639c9c1fc8c8086d3de640.tar.gz freebsd-ports-gnome-44ca3cac9da8a20ab4639c9c1fc8c8086d3de640.tar.zst freebsd-ports-gnome-44ca3cac9da8a20ab4639c9c1fc8c8086d3de640.zip | |
- Update to 0.9.12
PR: ports/181442
Approved by: maintainer timeout (bsdports@wayfair.com, >3 weeks)
Security: CVE-2013-5942 (vuxml entry on the way)
| -rw-r--r-- | databases/py-carbon/Makefile | 7 | ||||
| -rw-r--r-- | databases/py-carbon/distinfo | 4 | ||||
| -rw-r--r-- | databases/py-carbon/files/patch-setup.py | 12 | ||||
| -rw-r--r-- | databases/py-carbon/pkg-plist | 3 |
4 files changed, 14 insertions, 12 deletions
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile index 3a1ff20adc2f..a7e57120e100 100644 --- a/databases/py-carbon/Makefile +++ b/databases/py-carbon/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= carbon -PORTVERSION= 0.9.10 -PORTREVISION= 2 +PORTVERSION= 0.9.12 CATEGORIES= databases python -MASTER_SITES= http://launchpad.net/graphite/0.9/${PORTVERSION}/+download/ +MASTER_SITES= https://github.com/graphite-project/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy= PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= bsdports@wayfair.com @@ -19,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:${PORTSDIR}/net/py-txamqp \ USE_PYTHON= -2.7 USE_PYDISTUTILS= yes USE_TWISTED_RUN= yes -FETCH_ARGS= -pRr +FETCH_ARGS= -o ${DISTNAME}${EXTRACT_SUFX} USE_RC_SUBR= carbon NO_STAGE= yes diff --git a/databases/py-carbon/distinfo b/databases/py-carbon/distinfo index b32c59b8fe1d..14d777e4a656 100644 --- a/databases/py-carbon/distinfo +++ b/databases/py-carbon/distinfo @@ -1,2 +1,2 @@ -SHA256 (carbon-0.9.10.tar.gz) = 4f37e00595b5b078edb9b3f5cae318f752f4446a82623ea4da97dd7d0f6a5072 -SIZE (carbon-0.9.10.tar.gz) = 42201 +SHA256 (carbon-0.9.12.tar.gz) = 06003f72fd022a7c571734cf3acdcd9c784d505c145acbf0906a2fef886abaa6 +SIZE (carbon-0.9.12.tar.gz) = 52107 diff --git a/databases/py-carbon/files/patch-setup.py b/databases/py-carbon/files/patch-setup.py index 13c148185118..928f06c2aaf3 100644 --- a/databases/py-carbon/files/patch-setup.py +++ b/databases/py-carbon/files/patch-setup.py @@ -1,6 +1,6 @@ ---- setup.py.ori 2012-06-21 16:04:03.284808706 -0700 -+++ setup.py 2012-06-21 16:05:09.681811949 -0700 -@@ -12,9 +12,9 @@ +--- 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_kwargs = dict() @@ -10,6 +10,6 @@ +storage_dirs = [ ('/var/db/graphite/storage/whisper',[]), ('/var/db/graphite/storage/lists',[]), + ('/var/db/graphite/storage/log',[]), ('/var/db/graphite/storage/rrd',[]) ] +conf_files = [ ('/usr/local/etc/carbon', glob('conf/*.example')) ] - #XXX Need a way to have these work for bdist_rpm but be left alone for everything else - #init_scripts = [ ('/etc/init.d', ['distro/redhat/init.d/carbon-cache', - # 'distro/redhat/init.d/carbon-relay', + + install_files = storage_dirs + conf_files + diff --git a/databases/py-carbon/pkg-plist b/databases/py-carbon/pkg-plist index 85a534d0e56b..e7455365dd78 100644 --- a/databases/py-carbon/pkg-plist +++ b/databases/py-carbon/pkg-plist @@ -24,6 +24,7 @@ bin/validate-storage-schemas.py %%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 @@ -58,6 +59,7 @@ bin/validate-storage-schemas.py %%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 @@ -79,6 +81,7 @@ bin/validate-storage-schemas.py %%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 |