From nobody Thu Jun 16 16:30:30 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 A5066842BE2; Thu, 16 Jun 2022 16:30:31 +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 4LP72G5c2Rz4gGS; Thu, 16 Jun 2022 16:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655397031; 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=BWnGbl1xMmGWWWbmjQunXLDTmCdRdOYuWK5h26Wx/po=; b=Omp7bSxRnD7UmwjKVVhTf+Q+anEbMbhnWyzf0k5aKA9PQqzAgOKu77qrSR2mA4pq90WdWO CEg71JreaOKjlCeb/pEMzqXeH/Ygw562QP8oK5mvDZoe6+vnaoyp79V7IOoRPzPS7lKOOu WlyohIrqZwQY7Cdejys8KcefFstExeEX5A8ITRtwhNFy6eS35DVj+D7rAsk2VX92Rx52Al ORDOL+8OZuWT6753tKz+C4XCZ9+QybGhXyePvOIMyjJqTaJ6cQCqh+z3aHlmJHoLp4e7bP LNdkfqcCuSsPOwWzAMD3FUp4l2kZOSpF3KGufxbxChhfJOFfCOLWk7g1LqCzhg== 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 63DCF6C8A; Thu, 16 Jun 2022 16:30:30 +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 25GGUUdg014870; Thu, 16 Jun 2022 16:30:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25GGUUHj014869; Thu, 16 Jun 2022 16:30:30 GMT (envelope-from git) Date: Thu, 16 Jun 2022 16:30:30 GMT Message-Id: <202206161630.25GGUUHj014869@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: d96a960530f3 - main - net-mgmt/netbox: Update to 3.2.4 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: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d96a960530f3c20a9edd7837583ff7bec092566f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655397031; 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=BWnGbl1xMmGWWWbmjQunXLDTmCdRdOYuWK5h26Wx/po=; b=JfsQ7plJm0kCBxMvrHxcCyQqHSA8mSFxGTSspeEol+zLHvBxsJaDiLyF883DAqY4xYCAUy 3R5+GHr35N0FuLxtgwPbqBWwmuqSUi0SzjFYBKmxzD3gszLSNlJSOI8AfW0Y/RUeQWXrNl 6GZ7oU0R4MSCXrJhTOCWg6cLx7GMGnmrASsxDqjpTRePplmcySqFY7t37Jsx/JNKLiL+W3 9WyV+SeG+PIqa6ppj5bPPmayM0rIZPd51Q0T6yGjjeUHs5JRMQ51Cta03kHyXfnxcfNTv6 DTJ45MgOPCQGCWk7q+BaPEY8xt8HxEgJCFtFB/v3Zss4tVJDu/j/pVM0NXojfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655397031; a=rsa-sha256; cv=none; b=U93qYevx6DZcmHoikERaSsLbbUaITWDMNwz7gxR3AP1UDkZDbLQBlgi2K/fTXZ/NS1FvQX gsSzo4Eh167oo4UHbocd6yKK7fuV3AwhIhe06S0ZGyyq1PwsrQunRLGrSrnvm6hP6ePvdV AkqP4Su9TneDmp79Z5n/cdLdljbhBcN6sCVx64FTgea46f+uPa30HKh0lCGOdDF+cCXdwp /Hr8E4TU2j2DDyVuO7ubKUfAWZAMMNla4Ggr+pXmlog8oX1tNHCGBsabtg8zqRqx7pgKdf m7C2l+eDWFOgtaXncZscwtp8uF1Pk3vcBCw+uvrTlJ1htj7Gnr0P/tYxryCGPg== 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=d96a960530f3c20a9edd7837583ff7bec092566f commit d96a960530f3c20a9edd7837583ff7bec092566f Author: Kai Knoblich AuthorDate: 2022-06-16 16:03:50 +0000 Commit: Kai Knoblich CommitDate: 2022-06-16 16:28:34 +0000 net-mgmt/netbox: Update to 3.2.4 * Prune obsolete update instructions/notes for NetBox releases older than 2.9. * Remove the DOCS option as the embedded documentation for NetBox now needs to be built locally because the necessary procedure requires a running instance of NetBox. Changelog since 3.1.11: It contains many bugfixes/enhancements and the following new features: * Plugins Framework Extensions * Modules & Module Types * Custom Object Fields * Custom Status Choices * Improved User Preferences * Inventory Item Roles * Inventory Item Templates * Service Templates * Automatic Provisioning of Next Available VLANs https://netbox.readthedocs.io/en/stable/release-notes/version-3.2/ MFH: No (feature release) --- net-mgmt/netbox/Makefile | 80 ++-- net-mgmt/netbox/distinfo | 6 +- net-mgmt/netbox/files/patch-mkdocs.yml | 17 + net-mgmt/netbox/files/pkg-message.in | 188 ++++----- net-mgmt/netbox/pkg-plist | 709 +++++++++++++++------------------ 5 files changed, 448 insertions(+), 552 deletions(-) diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile index b0e513535b8c..8a2d45c33a81 100644 --- a/net-mgmt/netbox/Makefile +++ b/net-mgmt/netbox/Makefile @@ -1,6 +1,6 @@ PORTNAME= netbox DISTVERSIONPREFIX= v -DISTVERSION= 3.1.11 +DISTVERSION= 3.2.4 CATEGORIES= net-mgmt python MAINTAINER= kai@FreeBSD.org @@ -17,55 +17,55 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt # Django packages that are known for regressions in conjunction with NetBox and # should therefore only be updated with caution. # -# - devel/py-dj32-django-rq -# - www/py-dj32-django-filter -# - www/py-dj32-django-tables2 -# - www/py-dj32-djangorestframework (in conjunction with www/py-dj32-drf-yasg) +# - devel/py-dj40-django-rq +# - www/py-dj40-django-filter +# - www/py-dj40-django-tables2 +# - www/py-dj40-djangorestframework (in conjunction with www/py-dj40-drf-yasg) # -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown-include>=0.6.0<1:textproc/py-markdown-include@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mkdocs-material>=8.2.7<9:textproc/py-mkdocs-material@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django32>=3.2.11<3.3:www/py-django32@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj32-django-cors-headers>=3.11.0<4:www/py-dj32-django-cors-headers@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj32-django-debug-toolbar>=3.2.4<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.3:www/py-dj32-django-prometheus@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj32-django-redis>=5.2.0<6:www/py-dj32-django-redis@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj32-django-rq>=2.5.1<2.6:devel/py-dj32-django-rq@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj32-django-tables2>=2.4.1<2.5:www/py-dj32-django-tables2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj32-django-taggit>=2.1.0<3:www/py-dj32-django-taggit@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj32-django-timezone-field>=5.0<6: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} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django40>=4.0.4<4.1:www/py-django40@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj40-django-cors-headers>=3.12.0<4:www/py-dj40-django-cors-headers@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj40-django-debug-toolbar>=3.2.4<4:www/py-dj40-django-debug-toolbar@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj40-django-filter>=21.1<22: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-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-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.21: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}Jinja2>=3.0.1<4:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}markdown>=3.3.6<3.5:textproc/py-markdown@${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}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>=8.2.0:graphics/py-pillow@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.9.2<3:databases/py-psycopg2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=9.1.1: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.1.0<5:security/py-social-auth-core@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}social-auth-core>=4.2.0<5:security/py-social-auth-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}svgwrite>=1.4.2<2:graphics/py-svgwrite@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tablib>=3.2.0<4:textproc/py-tablib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tzdata>=2021.5:devel/py-tzdata@${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}yaml>=5.4.1<7:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gunicorn>=20.1.0<21:www/py-gunicorn@${PY_FLAVOR} -USES= cpe pgsql:10+ python:3.7+ +USES= cpe pgsql:10+ python:3.8+ CPE_VENDOR= netbox_project USE_GITHUB= yes GH_ACCOUNT= netbox-community 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 -OPTIONS_DEFINE= DOCS EXAMPLES - -do-build: - cd ${WRKSRC} && ${PYTHON_CMD} -m mkdocs build +OPTIONS_DEFINE= EXAMPLES do-install: cd ${WRKSRC}/netbox ; \ @@ -77,18 +77,8 @@ do-install: ${INSTALL_DATA} "$$src" "$$dst" ; \ fi \ done - -post-install-DOCS-on: - cd ${WRKSRC}/docs ; \ - ${MKDIR} ${STAGEDIR}${DOCSDIR} ; \ - for src in $$( ${FIND} . ! -name '*.bak' ) ; do \ - dst=${STAGEDIR}${DOCSDIR}$${src#.} ; \ - if ${TEST} -d "$$src" ; then \ - ${MKDIR} "$$dst" ; \ - else \ - ${INSTALL_DATA} "$$src" "$$dst" ; \ - fi \ - done + cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/mkdocs.yml ${STAGEDIR}${DATADIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/net-mgmt/netbox/distinfo b/net-mgmt/netbox/distinfo index 0374696db26f..df9d4b1fad14 100644 --- a/net-mgmt/netbox/distinfo +++ b/net-mgmt/netbox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1649185847 -SHA256 (netbox-community-netbox-v3.1.11_GH0.tar.gz) = d7f6f4ad5b1305aabbc9bee133455e913be3765972b35ed030d689d73ba7daa7 -SIZE (netbox-community-netbox-v3.1.11_GH0.tar.gz) = 4408997 +TIMESTAMP = 1654793742 +SHA256 (netbox-community-netbox-v3.2.4_GH0.tar.gz) = 6eaf5b63812f2055c6a1d11a4465086e11a8968eec0b3c055e4abbb8512f6550 +SIZE (netbox-community-netbox-v3.2.4_GH0.tar.gz) = 4828917 diff --git a/net-mgmt/netbox/files/patch-mkdocs.yml b/net-mgmt/netbox/files/patch-mkdocs.yml new file mode 100644 index 000000000000..af37b9b07ff0 --- /dev/null +++ b/net-mgmt/netbox/files/patch-mkdocs.yml @@ -0,0 +1,17 @@ +--- mkdocs.yml.orig 2022-04-28 19:00:11 UTC ++++ mkdocs.yml +@@ -1,5 +1,5 @@ site_name: NetBox Documentation + site_name: NetBox Documentation +-site_dir: netbox/project-static/docs ++site_dir: project-static/docs + site_url: https://docs.netbox.dev/ + repo_name: netbox-community/netbox + repo_url: https://github.com/netbox-community/netbox +@@ -26,7 +26,6 @@ plugins: + setup_commands: + - import os + - import django +- - os.chdir('netbox/') + - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "netbox.settings") + - django.setup() + rendering: diff --git a/net-mgmt/netbox/files/pkg-message.in b/net-mgmt/netbox/files/pkg-message.in index 6d9bbced27ec..dd29a7a50431 100644 --- a/net-mgmt/netbox/files/pkg-message.in +++ b/net-mgmt/netbox/files/pkg-message.in @@ -17,12 +17,14 @@ 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 and delete any expired user sessions +1. Run database migrations, trace any missing cable paths, build the embedded + documentation, collect static files, remove stale content files and delete + any expired user sessions # cd %%DATADIR%% # python%%PYTHON_VER%% manage.py migrate # python%%PYTHON_VER%% manage.py trace_paths --no-input +# mkdocs build # python%%PYTHON_VER%% manage.py collectstatic --no-input # python%%PYTHON_VER%% manage.py remove_stale_contenttypes --no-input # python%%PYTHON_VER%% manage.py clearsessions @@ -30,114 +32,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.7.7 - message: <