From nobody Thu Jun 2 05:30:50 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0AC3C1B49B1E; Thu, 2 Jun 2022 05:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LDF3b1FpSz4r0w; Thu, 2 Jun 2022 05:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654147851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3V64A4EZmT7rIG3hDv/bAG2kwLoesB876fEtP741Sco=; b=v3B0shfzdFxP/DK0MUV++kjDpqZWq8nEJayYui7ExJ+7l1EjIPdp+KYFrY6I3Ej0qt2kRB XPkVJSzVGyaaIjhuJ6+GhK1+BHh0OKy3B9GlPgSHphl0kPH4rjKjR8hNDJ+FTewohQ2T4o p1IN39i9kyeeEAKI37NoH6TUTmK+is2TRwM+6BtJrQACZnmker+0O0Ue3xutgUWvG1OVsX qwmHjgw7R06Vj6U8eY+SLpkSaI8/s6HHw59cUYNU85lGdhYGBwJQWnP8YJDeX2GaQLL6tt LiXdozQLa7Cht0Bdm323l0ylXcvcyIU30M1kweqW6mP8yj4ghC1kDRLy+YvlnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 867EC6AA8; Thu, 2 Jun 2022 05:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2525UoY9059389; Thu, 2 Jun 2022 05:30:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2525Uor7059388; Thu, 2 Jun 2022 05:30:50 GMT (envelope-from git) Date: Thu, 2 Jun 2022 05:30:50 GMT Message-Id: <202206020530.2525Uor7059388@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 5ad25e88592d - main - www/py-graphite-web: Update version 1.1.8=>1.1.10 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ad25e88592d312a76159538a85469195a41bbc8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654147851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3V64A4EZmT7rIG3hDv/bAG2kwLoesB876fEtP741Sco=; b=GXr38SX4dRPP/bR3GBWJMnVgOmj4nAbkyPZCRpTKSInEK01e81uLy0ugc3BrsVOm3FQGFz 1ubLK4gSshTI5OPvWFPcjaTmWiaL68Q+UwePW+lpT5c9NoFhymUyhSuH/eDYrFMsfuv2Ae 916xsFRo2Kau23XnMPlK882YXU2a3fgcL8CEYq0yQZjSTS/K8mYhCWtY8imV5hz6y6CNxm 2iY7sdgvhHLbgbTEX4XxSjjDCjaRlQFkoDW2mrfE/iGhms2mx/XZ0D/OLH4CdwnO2j0A0w rVsQvCTigMmTPq4Jt1xkDgXxqDG0TD73kUmkJSROC/9lIQTN9ObMHYdXPjlv3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654147851; a=rsa-sha256; cv=none; b=MOoRKMDQvo8/BuqtrR+Kxc/5ErD8lYpFNAQPMy81ZR/V4A5P+ZU9HjxS0vuQ1IazGCmRAp /gEpX7XzRSl8wPIknBA41Eciih3L/9UxRyAaPcNVOHJcnGR0Mo5zrLsqniok5x01PVUuRr +wGRAmNwq4qLq4OSkGQ2pCXBT4RwwiZq3ThR5IFi5/UVOcAo3b3RUybkMZQsN8oLHoKS+G j9It6RPskxo4GauQX5LuVFwiNv5CN5FN9pUdLH4E5mfuGxKaZI/VpRaXOZeT6GS8WgDz1X FIQpreYHkgBH2xgR7W0q0II9vUfof0pPHtk0xYfNElQXVaQttv1jf7FP/uPXng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ad25e88592d312a76159538a85469195a41bbc8 commit 5ad25e88592d312a76159538a85469195a41bbc8 Author: Muhammad Moinur Rahman AuthorDate: 2022-06-02 05:23:05 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-06-02 05:30:30 +0000 www/py-graphite-web: Update version 1.1.8=>1.1.10 - Pet portclippy/portfmt - Refresh legacy patches Relnotes: https://graphite.readthedocs.io/en/latest/releases/1_1_10.html --- www/py-graphite-web/Makefile | 34 +++++++++++++--------- www/py-graphite-web/distinfo | 6 ++-- .../files/patch-conf__graphite.wsgi.example | 4 +-- www/py-graphite-web/files/patch-setup.py | 13 ++++----- ...tch-webapp__graphite__local_settings.py.example | 16 +++++----- 5 files changed, 39 insertions(+), 34 deletions(-) diff --git a/www/py-graphite-web/Makefile b/www/py-graphite-web/Makefile index 17ecc32487dd..28b27522f966 100644 --- a/www/py-graphite-web/Makefile +++ b/www/py-graphite-web/Makefile @@ -1,8 +1,7 @@ # Created by: Evan Sarmiento PORTNAME= graphite-web -PORTVERSION= 1.1.8 -PORTREVISION= 1 +PORTVERSION= 1.1.10 CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,21 +15,25 @@ EXPIRATION_DATE= 2022-06-30 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:graphics/py-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:databases/py-carbon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}django-tagging>=0.4.2:www/py-django-tagging@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-tagging>=0.4.6:www/py-django-tagging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django22>=1.8<3.1:www/py-django22@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gunicorn>0:www/py-gunicorn@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing2>=2.3.0:devel/py-pyparsing2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-memcached>=1.58:databases/py-python-memcached@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}scandir>=0:sysutils/py-scandir@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyparsing2>=0:devel/py-pyparsing2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ - xorg-fonts-truetype>=0:x11-fonts/xorg-fonts-truetype \ - bash:shells/bash + ${PYTHON_PKGNAMEPREFIX}txamqp>=0.8:net/py-txamqp@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}whisper>0:databases/py-whisper@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}whitenoise>=4.1.2:www/py-whitenoise@${PY_FLAVOR} \ + bash:shells/bash \ + xorg-fonts-truetype>=0:x11-fonts/xorg-fonts-truetype -USES= cpe python:3.5+ shebangfix -USE_GITHUB= yes -GH_ACCOUNT= graphite-project +USES= cpe python:3.4-3.8 shebangfix CPE_VENDOR= graphite_project CPE_PRODUCT= graphite +USE_GITHUB= yes +GH_ACCOUNT= graphite-project USE_PYTHON= distutils SHEBANG_FILES= bin/build-index.sh @@ -39,9 +42,12 @@ CONFLICTS_INSTALL= py??-graphite-web FETCH_ARGS= -o ${DISTNAME}${EXTRACT_SUFX} NO_ARCH= yes SUB_FILES= pkg-message -SUB_LIST= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} WWWOWN=${WWWOWN} \ - WWWGRP=${WWWGRP} DATADIR=${DATADIR} -PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} +SUB_LIST= DATADIR=${DATADIR} \ + PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \ + WWWGRP=${WWWGRP} \ + WWWOWN=${WWWOWN} +PLIST_SUB= WWWGRP=${WWWGRP} \ + WWWOWN=${WWWOWN} post-patch: @${RM} ${WRKSRC}/bin/build-index.sh.orig diff --git a/www/py-graphite-web/distinfo b/www/py-graphite-web/distinfo index 1dfb6150ab98..02c166f97dea 100644 --- a/www/py-graphite-web/distinfo +++ b/www/py-graphite-web/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618863438 -SHA256 (graphite-project-graphite-web-1.1.8_GH0.tar.gz) = 6e35629493b9be77fa9902471053f6789e300c06fe74a0215253d986fc0b866c -SIZE (graphite-project-graphite-web-1.1.8_GH0.tar.gz) = 1458080 +TIMESTAMP = 1654111675 +SHA256 (graphite-project-graphite-web-1.1.10_GH0.tar.gz) = 1ac42a2871ea58b76b42aa3671affb87c7a92616e949bf1312fca831075a501b +SIZE (graphite-project-graphite-web-1.1.10_GH0.tar.gz) = 1462045 diff --git a/www/py-graphite-web/files/patch-conf__graphite.wsgi.example b/www/py-graphite-web/files/patch-conf__graphite.wsgi.example index 1e2b7d2ec0bf..ce86260c60be 100644 --- a/www/py-graphite-web/files/patch-conf__graphite.wsgi.example +++ b/www/py-graphite-web/files/patch-conf__graphite.wsgi.example @@ -1,10 +1,10 @@ ---- conf/graphite.wsgi.example.orig 2021-04-19 05:24:42 UTC +--- conf/graphite.wsgi.example.orig 2022-05-22 18:11:01 UTC +++ conf/graphite.wsgi.example @@ -2,6 +2,6 @@ import sys # In case of multi-instance graphite, uncomment and set appropriate name # import os # os.environ['GRAPHITE_SETTINGS_MODULE'] = 'graphite.local_settings' -sys.path.append('/opt/graphite/webapp') -+sys.path.append('%%PYTHON_SITELIBDIR%%/graphite') ++sys.path.append('/usr/local/lib/python3.8/site-packages/graphite') from graphite.wsgi import application diff --git a/www/py-graphite-web/files/patch-setup.py b/www/py-graphite-web/files/patch-setup.py index 557c74aa3348..e3cb0fbd36c0 100644 --- a/www/py-graphite-web/files/patch-setup.py +++ b/www/py-graphite-web/files/patch-setup.py @@ -1,4 +1,4 @@ ---- setup.py.orig 2021-04-19 05:24:42 UTC +--- setup.py.orig 2022-05-22 18:11:01 UTC +++ setup.py @@ -39,10 +39,6 @@ else: cf.add_section('install') @@ -11,7 +11,7 @@ with open('setup.cfg', 'w') as f: cf.write(f) -@@ -58,17 +54,17 @@ else: +@@ -58,17 +54,17 @@ storage_dirs = [] storage_dirs = [] @@ -29,19 +29,18 @@ webapp_content[root].append(filepath) -conf_files = [ ('conf', glob('conf/*.example')) ] -+conf_files = [ ('%%PREFIX%%/etc/graphite', glob('conf/*.example')) ] ++conf_files = [ ('/usr/local/etc/graphite', glob('conf/*.example')) ] examples = [ ('examples', glob('examples/example-*')) ] -@@ -116,8 +112,9 @@ try: +@@ -116,8 +112,8 @@ try: package_data={'graphite' : ['templates/*', 'local_settings.py.example']}, scripts=glob('bin/*'), - data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, - install_requires=['Django>=1.8,<3.1', 'django-tagging==0.4.3', 'pytz', + data_files=list(conf_files), -+ + install_requires=['Django>=1.8,<3.1', 'django-tagging>=0.4.3', 'pytz', - 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], + 'pyparsing', 'cairocffi', 'urllib3', + 'scandir;python_version<"3.5"', 'six'], classifiers=[ - 'Intended Audience :: Developers', diff --git a/www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example b/www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example index cdfb9db732fb..95cac148c58f 100644 --- a/www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example +++ b/www/py-graphite-web/files/patch-webapp__graphite__local_settings.py.example @@ -1,12 +1,12 @@ ---- webapp/graphite/local_settings.py.example.orig 2018-02-13 06:01:34.000000000 -0500 -+++ webapp/graphite/local_settings.py.example 2018-03-22 09:10:17.659675000 -0400 -@@ -108,15 +108,27 @@ +--- webapp/graphite/local_settings.py.example.orig 2022-05-22 18:11:01 UTC ++++ webapp/graphite/local_settings.py.example +@@ -112,15 +112,27 @@ DEFAULT_XFILES_FACTOR = 0 #CONF_DIR = '/opt/graphite/conf' #STORAGE_DIR = '/opt/graphite/storage' #STATIC_ROOT = '/opt/graphite/static' -+CONF_DIR = '%%PREFIX%%/etc/graphite' ++CONF_DIR = '/usr/local/etc/graphite' +STORAGE_DIR = '/var/db/carbon' -+STATIC_ROOT = '%%PREFIX%%/share/graphite-web/content' ++STATIC_ROOT = '/usr/local/share/graphite-web/content' + #LOG_DIR = '/opt/graphite/storage/log/webapp' #INDEX_FILE = '/opt/graphite/storage/index' # Search index file @@ -23,12 +23,12 @@ ## Webapp config files #DASHBOARD_CONF = '/opt/graphite/conf/dashboard.conf' #GRAPHTEMPLATES_CONF = '/opt/graphite/conf/graphTemplates.conf' -+DASHBOARD_CONF = '%%PREFIX%%/etc/graphite/dashboard.conf' -+GRAPHTEMPLATES_CONF = '%%PREFIX%%/etc/graphite/graphTemplates.conf' ++DASHBOARD_CONF = '/usr/local/etc/graphite/dashboard.conf' ++GRAPHTEMPLATES_CONF = '/usr/local/etc/graphite/graphTemplates.conf' ## Data directories # -@@ -253,7 +265,12 @@ +@@ -257,7 +269,12 @@ DEFAULT_XFILES_FACTOR = 0 # } #} #