From nobody Sun Jul 31 17:47:51 2022 X-Original-To: dev-commits-ports-main@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 4Lwpcl5VK3z4Xrt0; Sun, 31 Jul 2022 17:47:51 +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 4Lwpcl54WPz47fK; Sun, 31 Jul 2022 17:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659289671; 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=e2mot+s2q+IwdE7NkLG9wv5FNxm4FzcRWFMvQTk6RJ8=; b=DSwktF0AO5k9UVtcjyvdj4wwktBHH+gkpYRgcd551RA8GQ0h5zNbTWcwzqAXwVbopN5E1H Y1CwZXskH4N8iYDPCtOQdgy+BnfVocuWfcwfnKGmQLYHHfPbHu8vPVyADwgzgW5JA8bZDi 71TGrG23XNDzt/h/xhJc4cQYzBYo8J+dMt/vy9x5ebIQlxVRTnH05UWsF390T4KOUTq6M+ SRX5bwgfwK+qZ2X43y0yb9696CH3eSyOlWUri9i7gkXMga56ulFqFAnfZAWvn8lM7QKrNf edQNby6ZUzde0S1bM0LRs42bPvsQLlVRVGOr7crFj4sTyuFZ5Sk7dtnxHbO/0w== 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 4Lwpcl45YCz12Ym; Sun, 31 Jul 2022 17:47:51 +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 26VHlpsa058301; Sun, 31 Jul 2022 17:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26VHlpXF058300; Sun, 31 Jul 2022 17:47:51 GMT (envelope-from git) Date: Sun, 31 Jul 2022 17:47:51 GMT Message-Id: <202207311747.26VHlpXF058300@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Romain=20Tarti=C3=A8re?= Subject: git: 7dbf50806b78 - main - www/py-puppetboard: Update to 4.0.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7dbf50806b78b2958e59433d807e4e4393dc2c1e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659289671; 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=e2mot+s2q+IwdE7NkLG9wv5FNxm4FzcRWFMvQTk6RJ8=; b=pbAyk9LxJltW3V0tUTgybD+VbxYHUa2HnABAGbWPFt6JZl7Zv6ukrI6x0lHHF2n20So1Ha JTUjhKVoGwoZqwdoYM/tZMMBKQU6ZVc+0IjmDplUhaPPlLrS3jhxe4nQJC6shTS7KlWKx8 S6oGFTFi76UATeGVrp55O89cl5lPtdGDLENkV3AKaEP49n2pSnZ2DgAK0rP9UHk2/V9UfK 5hnidM/PFpwneNLZubXBHtL9ZTEhCDvKVoaIJohHlXqje1tZ8xOZ/S/l8/vYFJjBB7eQcT t3tM3vIYYR6SuIT6u78Hk3ZbS4ngvqCbBAAUxHxsHtsVUccZe6A2HQY0VH8gTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659289671; a=rsa-sha256; cv=none; b=cQMsVes1nj3KLqJnUo8lB3CSvbS3mM4f7uTeY85dVKdetLh0VhBATQ36uy+a6uyEpblBK4 +I6zxSiwEb99IWnClLToJ9P1JqyfeacghBanoLYvTMESnMH3z3RY+KivjPL79m+BYW+ZRp Je2gVCjdh8Q5W594HOvC7hN3XpXzygcqT2I29maQs6ViBYtwjNCja6+68rTEPt+J0gUltt leWWZXPPJf25k1fm44nZnPR39wrAdkihji+7t15hPRIwoQ9KBPZM97OFb2TvGe7Kp3pU69 ZbbWRKnMxS72CC6tuq7eqYmU0v66hm9j4Nga3O/DvPYuq+bXgzlXqyPW8PujeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=7dbf50806b78b2958e59433d807e4e4393dc2c1e commit 7dbf50806b78b2958e59433d807e4e4393dc2c1e Author: Romain Tartière AuthorDate: 2022-07-31 17:40:27 +0000 Commit: Romain Tartière CommitDate: 2022-07-31 17:47:28 +0000 www/py-puppetboard: Update to 4.0.3 * Update and fix dependencies; * Ship a wsgi.py sample to run the application; * Remove outdated CONFLICTS; With hat: puppet --- www/py-puppetboard/Makefile | 33 +++++++++++++++++++----------- www/py-puppetboard/distinfo | 6 +++--- www/py-puppetboard/files/wsgi.py.sample.in | 11 ++++++++++ 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/www/py-puppetboard/Makefile b/www/py-puppetboard/Makefile index 11973e9a4b05..8a994cb5b834 100644 --- a/www/py-puppetboard/Makefile +++ b/www/py-puppetboard/Makefile @@ -1,5 +1,5 @@ PORTNAME= puppetboard -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.3 DISTVERSIONPREFIX= v CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,31 +10,40 @@ COMMENT= Web interface to PuppetDB LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}CommonMark>=0.7.2:textproc/py-CommonMark@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Flask>=0.12:www/py-flask@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.14.2:www/py-flask-wtf@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}markupsafe>=0.19:textproc/py-markupsafe@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}CommonMark>=0.9.1:textproc/py-CommonMark@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0:www/py-flask-wtf@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask>=2:www/py-flask@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=3:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}itsdangerous>=2:security/py-itsdangerous@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markupsafe>=2:textproc/py-markupsafe@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=3.0.9:devel/py-pyparsing@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pypuppetdb>=0.3.3:databases/py-pypuppetdb@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.13.0:www/py-requests@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}requests>=2.13.0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}werkzeug>=2:www/py-werkzeug@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wtforms>=0:textproc/py-wtforms@${PY_FLAVOR} USES= python:3.6+ USE_GITHUB= yes USE_PYTHON= autoplist distutils -NO_ARCH= yes +SUB_LIST= ETCDIR=${ETCDIR} +SUB_FILES= wsgi.py.sample -CONFLICTS_INSTALL=puppetboard02 puppetboard03 +NO_ARCH= yes GH_ACCOUNT= voxpupuli -PLIST_FILES= "@sample etc/puppetboard/settings.py.sample" +PLIST_FILES= "@sample etc/puppetboard/settings.py.sample" \ + "@sample %%WWWDIR%%/wsgi.py.sample" post-patch: ${REINPLACE_CMD} -e '/requirements_for_tests/,+2d' \ ${WRKSRC}/setup.py post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppetboard - ${CP} ${WRKSRC}/settings.py.sample ${STAGEDIR}${PREFIX}/etc/puppetboard/settings.py.sample + ${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/settings.py.sample ${STAGEDIR}${ETCDIR} + ${MKDIR} ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKDIR}/wsgi.py.sample ${STAGEDIR}${WWWDIR} .include diff --git a/www/py-puppetboard/distinfo b/www/py-puppetboard/distinfo index 15071e4e20d2..caf3cf1b5f58 100644 --- a/www/py-puppetboard/distinfo +++ b/www/py-puppetboard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657311310 -SHA256 (voxpupuli-puppetboard-v4.0.1_GH0.tar.gz) = 4d19ebcb0dfc69c63b581587c9a2362ce7b26e823ada9dd0352458e1c83be9b7 -SIZE (voxpupuli-puppetboard-v4.0.1_GH0.tar.gz) = 4399183 +TIMESTAMP = 1659123484 +SHA256 (voxpupuli-puppetboard-v4.0.3_GH0.tar.gz) = 071ca093af13a4e0f4ca4dc100883739342c6baae917f6582c44ed0d20b187c7 +SIZE (voxpupuli-puppetboard-v4.0.3_GH0.tar.gz) = 4399861 diff --git a/www/py-puppetboard/files/wsgi.py.sample.in b/www/py-puppetboard/files/wsgi.py.sample.in new file mode 100644 index 000000000000..a317fdf04a29 --- /dev/null +++ b/www/py-puppetboard/files/wsgi.py.sample.in @@ -0,0 +1,11 @@ +from __future__ import absolute_import +import os + +# Uncomment to enable logging +# import logging +# logging.basicConfig(filename='/var/log/puppetboard/puppetboard.log', level=logging.INFO) + +# Indicate where to find the configuration file +os.environ['PUPPETBOARD_SETTINGS'] = '%%ETCDIR%%/settings.py' + +from puppetboard.app import app as application