From 0fb2ce6efd78c98ff9cf84deab10f5e5585cad63 Mon Sep 17 00:00:00 2001 From: Kai Knoblich Date: Fri, 23 Feb 2024 14:16:34 +0100 Subject: [PATCH] net-mgmt/netbox: Update to 3.7.3 * Remove no longer required workaround for older releases of py-markdown after 3bf88f001d59. Changelog: Enhancements: * Display a human-friendly name for the OpenID Connect remote auth backend * Remove associate_by_email() from default social auth pipeline * Add PostgreSQL index for object type & ID on CachedValue table to improve performance * Add "last login" time to user display & REST API serializer Bug Fixes: * Limit platform options by manufacturer when editing a device or device type * Resolving parent location should consider assigned site when bulk importing locations * Ensure changes are logged on related objects when deleting an object referenced via a many-to-many relationship (e.g. tags) * Clean up formatting of link peers in bulk CSV export of cable termination objects * Preserve "empty" default values for JSON custom fields * Update existing AutoSyncRecord when changing the data file of an auto-synced object * Correct IP address count link in VM interfaces table * Fix uncaught exception when attempting invalid device bay import * Fix inclusion of config_template field on REST API serializer for virtual machines * Fix "add export template" link under "export" button on object list views * Ensure protection rules are evaluated prior to enqueueing events when deleting an object * Fix designation of the active tab for assigned object when modifying an L2VPN termination * Correct OpenAPI schema for rack elevation REST API endpoint * Fix unhandled exception with invalid permission constraints * "group" field should be optional when creating VPN tunnel via REST API * Add missing group column to VPN tunnels table * Fix FHRP group representation on assignments REST API endpoint using brief mode * Warn that permission constraints are not supported for reports or scripts * Correct REST API schema definition for front_image & rear_image on DeviceType * Ensure error messages pertaining to related objects are displayed on the bulk import form * Fix exception when viewing current config when no history is present https://github.com/netbox-community/netbox/releases/tag/v3.7.3 --- net-mgmt/netbox/Makefile | 16 +++++----- net-mgmt/netbox/distinfo | 6 ++-- ...utilities_templatetags_builtins_filters.py | 29 ------------------- net-mgmt/netbox/pkg-plist | 1 + 4 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 net-mgmt/netbox/files/patch-netbox_utilities_templatetags_builtins_filters.py diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile index 1a6e0628a018d..8a7ad5a9c63a8 100644 --- a/net-mgmt/netbox/Makefile +++ b/net-mgmt/netbox/Makefile @@ -1,6 +1,6 @@ PORTNAME= netbox DISTVERSIONPREFIX= v -DISTVERSION= 3.7.2 +DISTVERSION= 3.7.3 CATEGORIES= net-mgmt python MAINTAINER= kai@FreeBSD.org @@ -23,7 +23,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt # - www/py-dj42-django-tables2 # - www/py-dj42-djangorestframework # -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django42>=4.2.9<4.3:www/py-django42@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django42>=4.2.10<4.3:www/py-django42@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj42-django-cors-headers>=4.3.1<5:www/py-dj42-django-cors-headers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj42-django-debug-toolbar>=4.3.0<5:www/py-dj42-django-debug-toolbar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj42-django-filter>=23.5<24:www/py-dj42-django-filter@${PY_FLAVOR} \ @@ -44,19 +44,19 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django42>=4.2.9<4.3:www/py-django42@${PY_FLA ${PYTHON_PKGNAMEPREFIX}bleach>=6.1.0<7:www/py-bleach@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.10<7:textproc/py-feedparser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.3<4:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}markdown>=3.3.7<3.6:textproc/py-markdown@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mkdocs-material>=9.5.7<10:textproc/py-mkdocs-material@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=3.4.4<3.6:textproc/py-markdown@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mkdocs-material>=9.5.10<10:textproc/py-mkdocs-material@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mkdocstrings>=0.24.0<1:textproc/py-mkdocstrings@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mkdocstrings-python-legacy>0:textproc/py-mkdocstrings-python-legacy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0.10.1<1:net/py-netaddr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=10.1.0:graphics/py-pillow@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psycopg>=3.1.16<4:databases/py-psycopg@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0.10.1<2:net/py-netaddr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=10.2.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg>=3.1.18<4:databases/py-psycopg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.31.0<3:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}social-auth-app-django>=5.4.0<6:www/py-social-auth-app-django@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}social-auth-core>=4.5.1<5:security/py-social-auth-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}svgwrite>=1.4.3<2:graphics/py-svgwrite@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tablib>=3.5.0<4:textproc/py-tablib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tzdata>=2023.4:devel/py-tzdata@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tzdata>=2024.1:devel/py-tzdata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=6.0.1<7:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gunicorn>=21.2.0<22:www/py-gunicorn@${PY_FLAVOR} diff --git a/net-mgmt/netbox/distinfo b/net-mgmt/netbox/distinfo index c9e17cc6c2c05..56cb955c56e35 100644 --- a/net-mgmt/netbox/distinfo +++ b/net-mgmt/netbox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707337293 -SHA256 (netbox-community-netbox-v3.7.2_GH0.tar.gz) = eb3df922e5f9971d6ccf3816b7ea94882ecde04585abad1e484233649643039b -SIZE (netbox-community-netbox-v3.7.2_GH0.tar.gz) = 9237184 +TIMESTAMP = 1708582174 +SHA256 (netbox-community-netbox-v3.7.3_GH0.tar.gz) = 8159c7c9916241da25cde5a75899ac24f3209938a6ac5d8f2676d90c379aa318 +SIZE (netbox-community-netbox-v3.7.3_GH0.tar.gz) = 9318252 diff --git a/net-mgmt/netbox/files/patch-netbox_utilities_templatetags_builtins_filters.py b/net-mgmt/netbox/files/patch-netbox_utilities_templatetags_builtins_filters.py deleted file mode 100644 index 6913656e19e5a..0000000000000 --- a/net-mgmt/netbox/files/patch-netbox_utilities_templatetags_builtins_filters.py +++ /dev/null @@ -1,29 +0,0 @@ -Add backwards compatibility for textproc/py-markdown < 3.4. - -Previous releases of py-markdown cannot access the "use_align_attribute" -configuration option, which was introduced with py-markdown 3.4. - ---- netbox/utilities/templatetags/builtins/filters.py.orig 2023-12-29 15:02:38 UTC -+++ netbox/utilities/templatetags/builtins/filters.py -@@ -163,12 +163,20 @@ def render_markdown(value): - if not value: - return '' - -+ TE_Shim = None -+ -+ try: -+ TE_Shim = TableExtension(use_align_attribute=True) -+ except KeyError: -+ TE_Shim = TableExtension() -+ pass -+ - # Render Markdown - html = markdown(value, extensions=[ - 'def_list', - 'fenced_code', - StrikethroughExtension(), -- TableExtension(use_align_attribute=True), -+ TE_Shim, - ]) - - # If the string is not empty wrap it in rendered-markdown to style tables diff --git a/net-mgmt/netbox/pkg-plist b/net-mgmt/netbox/pkg-plist index 33e1e0d4a0b40..25a63f5dbafe8 100644 --- a/net-mgmt/netbox/pkg-plist +++ b/net-mgmt/netbox/pkg-plist @@ -604,6 +604,7 @@ %%DATADIR%%/extras/migrations/0104_stagedchange_remove_change_logging.py %%DATADIR%%/extras/migrations/0105_customfield_min_max_values.py %%DATADIR%%/extras/migrations/0106_bookmark_user_cascade_deletion.py +%%DATADIR%%/extras/migrations/0107_cachedvalue_extras_cachedvalue_object.py %%DATADIR%%/extras/migrations/__init__.py %%DATADIR%%/extras/models/__init__.py %%DATADIR%%/extras/models/change_logging.py