From nobody Mon Oct 04 17:29:33 2021 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 09A5C10FA852; Mon, 4 Oct 2021 17:29:34 +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 4HNSQ559kRz3mlQ; Mon, 4 Oct 2021 17:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 620761D548; Mon, 4 Oct 2021 17:29:33 +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 194HTXdF002908; Mon, 4 Oct 2021 17:29:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 194HTXkJ002906; Mon, 4 Oct 2021 17:29:33 GMT (envelope-from git) Date: Mon, 4 Oct 2021 17:29:33 GMT Message-Id: <202110041729.194HTXkJ002906@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: 0627700a0bbe - main - net-mgmt/netbox: Update to 3.0.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: 0627700a0bbe12ba86c7c4e636ebb434c2d326a7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=0627700a0bbe12ba86c7c4e636ebb434c2d326a7 commit 0627700a0bbe12ba86c7c4e636ebb434c2d326a7 Author: Kai Knoblich AuthorDate: 2021-10-04 17:01:02 +0000 Commit: Kai Knoblich CommitDate: 2021-10-04 17:22:58 +0000 net-mgmt/netbox: Update to 3.0.4 Changelog since 2.11.12: It contains many bugfixes/enhancements and the following new features: * Updated User Interface * GraphQL API * IP Ranges * Custom Model Validation * SVG Cable Traces * New Views for Models Previously Under the Admin UI * REST API Token Provisioning * New Housekeeping Command * Custom Queue Support for Plugins https://netbox.readthedocs.io/en/stable/release-notes/version-3.0/ MFH: No (feature release) --- net-mgmt/netbox/Makefile | 22 +- net-mgmt/netbox/distinfo | 6 +- .../netbox/files/850.netbox-housekeeping.sample.in | 32 + net-mgmt/netbox/files/pkg-message.in | 68 +- net-mgmt/netbox/pkg-plist | 1429 ++++---------------- 5 files changed, 372 insertions(+), 1185 deletions(-) diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile index 1db82b279a22..090947a8c55d 100644 --- a/net-mgmt/netbox/Makefile +++ b/net-mgmt/netbox/Makefile @@ -1,6 +1,6 @@ PORTNAME= netbox DISTVERSIONPREFIX= v -DISTVERSION= 2.11.12 +DISTVERSION= 3.0.4 CATEGORIES= net-mgmt python MAINTAINER= kai@FreeBSD.org @@ -22,24 +22,25 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt # - www/py-dj32-django-tables2 # - www/py-dj32-djangorestframework (in conjunction with www/py-dj32-drf-yasg) # -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django32>=3.2.6<3.3:www/py-django32@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj32-django-cacheops>=6.0<7.0:www/py-dj32-django-cacheops@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj32-django-cors-headers>=3.8.0<3.9:www/py-dj32-django-cors-headers@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj32-django-debug-toolbar>=3.2.1<4:www/py-dj32-django-debug-toolbar@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj32-django-filter>=2.4.0<2.5:www/py-dj32-django-filter@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj32-django-mptt>=0.13.1<0.14:www/py-dj32-django-mptt@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django32>=3.2.7<3.3:www/py-django32@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj32-django-cors-headers>=3.9.0<4:www/py-dj32-django-cors-headers@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj32-django-debug-toolbar>=3.2.2<4:www/py-dj32-django-debug-toolbar@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj32-django-filter>=21.1<22:www/py-dj32-django-filter@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj32-django-graphiql-debug-toolbar>=0.2.0<1:www/py-dj32-django-graphiql-debug-toolbar@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj32-django-mptt>=0.13.4<0.14:www/py-dj32-django-mptt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj32-django-prometheus>=2.1.0<2.2:www/py-dj32-django-prometheus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj32-django-redis>=5.0.0<5.1:www/py-dj32-django-redis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj32-django-rq>=2.4.1<2.5:devel/py-dj32-django-rq@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj32-django-tables2>=2.4.0<2.5:www/py-dj32-django-tables2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj32-django-taggit>=1.5.1<2:www/py-dj32-django-taggit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj32-django-timezone-field>=4.1.2<5:www/py-dj32-django-timezone-field@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj32-djangorestframework>=3.12.4<3.13.0:www/py-dj32-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj32-drf-yasg>=1.20.0<1.21:www/py-dj32-drf-yasg@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj32-graphene-django>=2.15.0<3:devel/py-dj32-graphene-django@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-pglocks>=1.0.4<1.1:www/py-django-pglocks@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.11.2<4:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.1<4:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>=3.3.4<3.5:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.8.0<1:net/py-netaddr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.10.1<4:security/py-pycryptodome@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=8.2.0<9:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.1<3:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}svgwrite>=1.4.1<2:graphics/py-svgwrite@${PY_FLAVOR} \ @@ -52,7 +53,7 @@ CPE_VENDOR= netbox_project USE_GITHUB= yes GH_ACCOUNT= netbox-community -SUB_FILES= netbox_rq.sample netboxrc.sample pkg-message +SUB_FILES= 850.netbox-housekeeping.sample netbox_rq.sample netboxrc.sample pkg-message SUB_LIST= DATADIR=${DATADIR} PYTHON_CMD=${PYTHON_CMD} PYTHON_VER=${PYTHON_VER} WWWOWN=${WWWOWN} NO_BUILD= yes NO_ARCH= yes @@ -84,6 +85,7 @@ post-install-DOCS-on: post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKDIR}/850.netbox-housekeeping.sample ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKDIR}/netbox_rq.sample ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKDIR}/netboxrc.sample ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/contrib/apache.conf ${STAGEDIR}${EXAMPLESDIR} diff --git a/net-mgmt/netbox/distinfo b/net-mgmt/netbox/distinfo index de7b927fe43f..b8e664611e4d 100644 --- a/net-mgmt/netbox/distinfo +++ b/net-mgmt/netbox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629748683 -SHA256 (netbox-community-netbox-v2.11.12_GH0.tar.gz) = c51d8d386ead7523f7513b41d03500bf464fecc4129ccf1f74569a3e8d609684 -SIZE (netbox-community-netbox-v2.11.12_GH0.tar.gz) = 7125072 +TIMESTAMP = 1632927300 +SHA256 (netbox-community-netbox-v3.0.4_GH0.tar.gz) = 10273f484142e0607d5654c0fd1c62801390e8b78365674c8b552fce045edead +SIZE (netbox-community-netbox-v3.0.4_GH0.tar.gz) = 4490751 diff --git a/net-mgmt/netbox/files/850.netbox-housekeeping.sample.in b/net-mgmt/netbox/files/850.netbox-housekeeping.sample.in new file mode 100644 index 000000000000..14ad0e102a27 --- /dev/null +++ b/net-mgmt/netbox/files/850.netbox-housekeeping.sample.in @@ -0,0 +1,32 @@ +#!/bin/sh +# This shell script invokes NetBox's housekeeping management command, which +# intended to be run nightly. +# +# If you want to enable this script, copy it to %%PREFIX%%/etc/periodic/daily +# and place the following into /etc/periodic.conf: +# +# daily_netbox_housekeeping_enable="YES" +# +# If NetBox has been installed into a nonstandard location, update the paths +# below. +command="%%PYTHON_CMD%%" +netbox_root="%%DATADIR%%" + +# If there is a global system configuration file, suck it in. +# +if [ -r /etc/defaults/periodic.conf ]; then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +rc=0 + +case "$daily_netbox_housekeeping_enable" in + [Yy][Ee][Ss]) + echo "" + echo "Running NetBox housekeeping:" + $command "$netbox_root/manage.py" housekeeping + rc=$? +esac + +exit $rc diff --git a/net-mgmt/netbox/files/pkg-message.in b/net-mgmt/netbox/files/pkg-message.in index 2ecf2f9639bc..1a0d93f9a102 100644 --- a/net-mgmt/netbox/files/pkg-message.in +++ b/net-mgmt/netbox/files/pkg-message.in @@ -18,8 +18,7 @@ database migrations will be executed. The following steps are required to finish the upgrade: 1. Run database migrations, trace any missing cable paths, collect static - files, remove stale content files, delete any expired user sessions and - clear all cached data: + files, remove stale content files and delete any expired user sessions # cd %%DATADIR%% # python%%PYTHON_VER%% manage.py migrate @@ -27,7 +26,6 @@ The following steps are required to finish the upgrade: # python%%PYTHON_VER%% manage.py collectstatic --no-input # python%%PYTHON_VER%% manage.py remove_stale_contenttypes --no-input # python%%PYTHON_VER%% manage.py clearsessions -# python%%PYTHON_VER%% manage.py invalidate all 2. Restart WSGI/httpd environment (supervisord/apache/nginx/etc.) EOD @@ -244,4 +242,68 @@ Several changes to the REST API were made as well. Please check the changelogs for further details. EOD } +{ type: upgrade + maximum_version: 3.0.4 + message: <