From nobody Sat Sep 17 10:50:14 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 4MV74k4jxYz4cN5y; Sat, 17 Sep 2022 10:50:14 +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 4MV74k4Xz8z3rkR; Sat, 17 Sep 2022 10:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663411814; 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=HX5j2XoeJmrBNyKwZ2ez0TiifN0+PnAfXxxb2r/NLcA=; b=CxGhwqkHaYmvnfYrpLMGPhTCx0IfwqNXZ40e3Hre3MQPxFRBoJEn5q/zrVjIAhyIFNm1nk +6zLm2cw0D0pH8VBPTQBCH4jrQfPB3sdEagvpGrd9THfV868MHCLyEJ2EXZrOUse/ZeqHd T0Dmb0fDfhqw+R8K6LAVHxsPsvWaRvwWkvNh9V8N8pjnratvzpcfKhu57rZrXuJvTnAyWG iHtiRoYHTqV7pN2/QJt5NozThV977cOs//p6RfInOxKvIiTF6FSa0OYnXG2NQhRozNk4mR a2MZNUsGmwtU6lzcwSXvl/IXXgbJg5WvHT/5lGe+2YW/gEdfpFe2351JOJOH2Q== 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 4MV74k3Z4szgmg; Sat, 17 Sep 2022 10:50:14 +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 28HAoEPc005706; Sat, 17 Sep 2022 10:50:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28HAoECi005701; Sat, 17 Sep 2022 10:50:14 GMT (envelope-from git) Date: Sat, 17 Sep 2022 10:50:14 GMT Message-Id: <202209171050.28HAoECi005701@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 8b9888a61283 - main - net-mgmt/netbox: Update to 3.3.4 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: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b9888a6128391ae12076603d39548cc9361b569 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663411814; 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=HX5j2XoeJmrBNyKwZ2ez0TiifN0+PnAfXxxb2r/NLcA=; b=ghCfivmDYRVQWasWAzYxtohrLbGPTVOmw6VVwAvYK/5uSp+I9Dyeuzo0+KqR1660pLMvDN VV0IhEjTjXuDdDRTd8drk+CrjC6uz1R60Gdrci1FGaXzbGd5Tlxu21b64FNGcHvTzwG38W 3vH/mA9LvZwT4vjajWmsCvVO5xVhzsjxmrVW7zwoFQ05unJZP51rLpRo58PttKlm6FyUCD U1eNNqnRwQVN+tkLHF6qSqVE0KfMPfGpUwxxjXn/OrYEzdhhQ0WNcnLQkW6e7G0lnCrjay 7eQAkbrD22E5mHDo7OLfpESBbPwtThrbOWOCx4obSklFDNYLgz5QPunYwXnMAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663411814; a=rsa-sha256; cv=none; b=Gbq9t5cZ9VlIWovMf6WzNwF9L9FX4JJ9p+t0U6a7hvaej3s+Sh4tMUvrQKH2Y8N4AOxX1g rOpB4RvUBUWaClzi+B5uVgVq71F2SqvfmWBOJFV4uqND7c/vluvRAGmV+sosD/eEPvFshq ViTHj7Wv8uVQ1SD0C5pCnmpGOtVJurwcvxyQZS9bw+2e3tnuQj4pTnhsAxHpksypq7250p 3ip3CnOeWS2fLoxhaWGRTB/kqPkaV+6PhYJcFXt8KlGBFoSfoN2T59H2Dh/ae2o1PV8RQ1 awbnMsKIAXhszo9QPcQKv6S/c4rdzoXJkCYPQL9sZkr1Fl5VikKOGUfK30baLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b9888a6128391ae12076603d39548cc9361b569 commit 8b9888a6128391ae12076603d39548cc9361b569 Author: Kai Knoblich AuthorDate: 2022-09-17 10:45:00 +0000 Commit: Kai Knoblich CommitDate: 2022-09-17 10:45:00 +0000 net-mgmt/netbox: Update to 3.3.4 * Prune obsolete update instructions/notes for NetBox releases older than 3.0. * Add a directive to the netbox rc sample script that also simplifies the upgrade process. [1] * Fix a typo regarding the housekeeping script in the upgrade instructions. [1] Changelog since 3.2.9: It contains many bugfixes/enhancements and the following new features: * Multi-object Cable Terminations * L2VPN Modeling * PoE Interface Attributes * Half-Height Rack Units * Restrict API Tokens by Client IP * Reference User in Permission Constraints * Custom Field Grouping * Toggle Custom Field Visibility https://netbox.readthedocs.io/en/stable/release-notes/version-3.3/ Reported by: Thomas Kurschel (via e-mail) [1] MFH: No (feature release) --- net-mgmt/netbox/Makefile | 17 ++-- net-mgmt/netbox/distinfo | 6 +- net-mgmt/netbox/files/netboxrc.sample.in | 19 ++++ net-mgmt/netbox/files/pkg-message.in | 161 +++++++++++-------------------- net-mgmt/netbox/pkg-plist | 130 +++++++++++++++++-------- 5 files changed, 176 insertions(+), 157 deletions(-) diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile index a9b500eaab9a..b69a8ec44c47 100644 --- a/net-mgmt/netbox/Makefile +++ b/net-mgmt/netbox/Makefile @@ -1,6 +1,6 @@ PORTNAME= netbox DISTVERSIONPREFIX= v -DISTVERSION= 3.2.9 +DISTVERSION= 3.3.4 CATEGORIES= net-mgmt python MAINTAINER= kai@FreeBSD.org @@ -25,35 +25,36 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt # RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django40>=4.0.7<4.1:www/py-django40@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj40-django-cors-headers>=3.13.0<4:www/py-dj40-django-cors-headers@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj40-django-debug-toolbar>=3.5.0<4:www/py-dj40-django-debug-toolbar@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj40-django-debug-toolbar>=3.6.0<4:www/py-dj40-django-debug-toolbar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj40-django-filter>=22.1<23:www/py-dj40-django-filter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj40-django-graphiql-debug-toolbar>=0.2.0<1:www/py-dj40-django-graphiql-debug-toolbar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj40-django-mptt>=0.13.4<0.14:www/py-dj40-django-mptt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj40-django-prometheus>=2.2.0<2.3:www/py-dj40-django-prometheus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj40-django-redis>=5.2.0<6:www/py-dj40-django-redis@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj40-django-rich>=1.4.0<2:www/py-dj40-django-rich@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj40-django-rq>=2.5.1<2.6:devel/py-dj40-django-rq@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj40-django-tables2>=2.4.1<2.5:www/py-dj40-django-tables2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj40-django-taggit>=2.1.0<3:www/py-dj40-django-taggit@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj40-django-taggit>=3.0.0<4:www/py-dj40-django-taggit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj40-django-timezone-field>=5.0<6:www/py-dj40-django-timezone-field@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj40-djangorestframework>=3.13.1<3.14.0:www/py-dj40-djangorestframework@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj40-drf-yasg>=1.20.0<1.22:www/py-dj40-drf-yasg@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj40-drf-yasg>=1.21.3<1.22:www/py-dj40-drf-yasg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj40-graphene-django>=2.15.0<3:devel/py-dj40-graphene-django@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-pglocks>=1.0.4<1.1:www/py-django-pglocks@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bleach>=5.0.1<6:www/py-bleach@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.1<4:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>=3.3.7<3.5:textproc/py-markdown@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}markdown-include>=0.6.0<1:textproc/py-markdown-include@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown-include>=0.7.0<1:textproc/py-markdown-include@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mkdocs-material>=8.2.11<9:textproc/py-mkdocs-material@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mkdocstrings>=0.17.0<1:textproc/py-mkdocstrings@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.8.0<1:net/py-netaddr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=9.1.1:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=9.2.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.3<3:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sentry-sdk>=1.5.12<2:devel/py-sentry-sdk@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}social-auth-app-django>=5.0.0<6:www/py-social-auth-app-django@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}social-auth-core>=4.2.0<5:security/py-social-auth-core@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}social-auth-core>=4.3.0<5:security/py-social-auth-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}svgwrite>=1.4.3<2:graphics/py-svgwrite@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tablib>=3.2.1<4:textproc/py-tablib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tzdata>=2022.1:devel/py-tzdata@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tzdata>=2022.2:devel/py-tzdata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1<7:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gunicorn>=20.1.0<21:www/py-gunicorn@${PY_FLAVOR} diff --git a/net-mgmt/netbox/distinfo b/net-mgmt/netbox/distinfo index a376ac85be58..ffc0da4ea2d1 100644 --- a/net-mgmt/netbox/distinfo +++ b/net-mgmt/netbox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660761613 -SHA256 (netbox-community-netbox-v3.2.9_GH0.tar.gz) = 4d22ed99ea9244b4c167b268eda0af2951f832a0a7b4e653c1b72ea4be2bcb3b -SIZE (netbox-community-netbox-v3.2.9_GH0.tar.gz) = 4837923 +TIMESTAMP = 1663407064 +SHA256 (netbox-community-netbox-v3.3.4_GH0.tar.gz) = 88de5e90a7632572416bcd52327bd208b2a96f569cbd2987206bd9f5c841f8ab +SIZE (netbox-community-netbox-v3.3.4_GH0.tar.gz) = 5217432 diff --git a/net-mgmt/netbox/files/netboxrc.sample.in b/net-mgmt/netbox/files/netboxrc.sample.in index 2502f9c0b14e..7510729b0701 100644 --- a/net-mgmt/netbox/files/netboxrc.sample.in +++ b/net-mgmt/netbox/files/netboxrc.sample.in @@ -44,10 +44,12 @@ name="netbox" rcvar=netbox_enable netbox_path=%%DATADIR%% +extra_commands="upgrade" load_rc_config $name start_precmd="netbox_precmd" +upgrade_cmd="netbox_upgrade" command=${netbox_program:-%%LOCALBASE%%/bin/gunicorn} procname=${netbox_procname:-%%PYTHON_CMD%%} netbox_chdir=${netbox_path} @@ -88,4 +90,21 @@ netbox_precmd() install -d -o ${netbox_user} `dirname ${pidfile}` } +netbox_upgrade() +{ + if [ -f ${pidfile} ]; then + cd ${netbox_path} + %%PYTHON_CMD%% manage.py migrate + %%PYTHON_CMD%% manage.py trace_paths --no-input + %%LOCALBASE%%/bin/mkdocs build + %%PYTHON_CMD%% manage.py collectstatic --no-input + %%PYTHON_CMD%% manage.py remove_stale_contenttypes --no-input + %%PYTHON_CMD%% manage.py clearsessions + %%PYTHON_CMD%% manage.py clearcache + echo "Please restart NetBox and the WSGI environment." + else + echo "NetBox is not running!" + fi +} + run_rc_command "$1" diff --git a/net-mgmt/netbox/files/pkg-message.in b/net-mgmt/netbox/files/pkg-message.in index 9cff229b226b..490cbeb03501 100644 --- a/net-mgmt/netbox/files/pkg-message.in +++ b/net-mgmt/netbox/files/pkg-message.in @@ -33,110 +33,6 @@ The following steps are required to finish the upgrade: 2. Restart WSGI/httpd environment (supervisord/apache/nginx/etc.) EOD } -{ type: upgrade - maximum_version: 2.9.8 - message: <) for more info. ->>> Region.objects.rebuild() ->>> RackGroup.objects.rebuild() ->>> TenantGroup.objects.rebuild() -EOD -} -{ type: upgrade - maximum_version: 2.9.9 - message: <