diff options
| -rw-r--r-- | net-mgmt/netbox/Makefile | 14 | ||||
| -rw-r--r-- | net-mgmt/netbox/distinfo | 6 | ||||
| -rw-r--r-- | net-mgmt/netbox/files/netboxrc.sample.in | 4 | ||||
| -rw-r--r-- | net-mgmt/netbox/files/pkg-message.in | 19 |
4 files changed, 31 insertions, 12 deletions
diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile index 25b3d633f1eb..bbf3763d3b81 100644 --- a/net-mgmt/netbox/Makefile +++ b/net-mgmt/netbox/Makefile @@ -1,6 +1,6 @@ PORTNAME= netbox DISTVERSIONPREFIX= v -DISTVERSION= 3.5.3 +DISTVERSION= 3.5.4 CATEGORIES= net-mgmt python MAINTAINER= kai@FreeBSD.org @@ -24,18 +24,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt # - www/py-dj41-djangorestframework # RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django41>=4.1.9<4.2:www/py-django41@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj41-django-cors-headers>=4.0.0<5:www/py-dj41-django-cors-headers@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj41-django-cors-headers>=4.1.0<5:www/py-dj41-django-cors-headers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj41-django-debug-toolbar>=4.1.0<5:www/py-dj41-django-debug-toolbar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj41-django-filter>=23.2<24:www/py-dj41-django-filter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj41-django-graphiql-debug-toolbar>=0.2.0<1:www/py-dj41-django-graphiql-debug-toolbar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj41-django-mptt>=0.14.0<0.15:www/py-dj41-django-mptt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj41-django-prometheus>=2.3.1<2.4:www/py-dj41-django-prometheus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj41-django-redis>=5.2.0<6:www/py-dj41-django-redis@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj41-django-rich>=1.5.0<2:www/py-dj41-django-rich@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj41-django-rich>=1.6.0<2:www/py-dj41-django-rich@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj41-django-rq>=2.8.1<2.9:devel/py-dj41-django-rq@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj41-django-tables2>=2.5.3<2.6:www/py-dj41-django-tables2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj41-django-taggit>=3.1.0<5:www/py-dj41-django-taggit@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dj41-django-timezone-field>=5.0<6:www/py-dj41-django-timezone-field@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj41-django-taggit>=4.0.0<5:www/py-dj41-django-taggit@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dj41-django-timezone-field>=5.1<6:www/py-dj41-django-timezone-field@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj41-djangorestframework>=3.14.0<3.15.0:www/py-dj41-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj41-drf-spectacular>=0.26.2<1:www/py-dj41-drf-spectacular@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj41-drf-spectacular-sidecar>=2023.6.1:www/py-dj41-drf-spectacular-sidecar@${PY_FLAVOR} \ @@ -48,7 +48,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django41>=4.1.9<4.2:www/py-django41@${PY_FLA ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2<4:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>=3.3.7<3.4:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown-include>=0.7.0<1:textproc/py-markdown-include@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mkdocs-material>=9.1.15<10:textproc/py-mkdocs-material@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mkdocs-material>=9.1.16<10: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.5.0:graphics/py-pillow@${PY_FLAVOR} \ @@ -57,7 +57,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django41>=4.1.9<4.2:www/py-django41@${PY_FLA ${PYTHON_PKGNAMEPREFIX}social-auth-app-django>=5.2.0<6:www/py-social-auth-app-django@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}social-auth-core>=4.4.2<5:security/py-social-auth-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}svgwrite>=1.4.3<2:graphics/py-svgwrite@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tablib>=3.3.0<4:textproc/py-tablib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tablib>=3.5.0<4:textproc/py-tablib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tzdata>=2023.3:devel/py-tzdata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=6.0<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 357ced0ec910..a0448672300d 100644 --- a/net-mgmt/netbox/distinfo +++ b/net-mgmt/netbox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685991618 -SHA256 (netbox-community-netbox-v3.5.3_GH0.tar.gz) = 3032aa64954cc2ef8d41703f07a26b30628c4b734460d7eca0a4188ac4d1fa87 -SIZE (netbox-community-netbox-v3.5.3_GH0.tar.gz) = 5768154 +TIMESTAMP = 1687761839 +SHA256 (netbox-community-netbox-v3.5.4_GH0.tar.gz) = 32cd3c3f8612b79404f6ae83c51759eb2dfd60aeeae3915f236f00e1efbb2fdd +SIZE (netbox-community-netbox-v3.5.4_GH0.tar.gz) = 5767557 diff --git a/net-mgmt/netbox/files/netboxrc.sample.in b/net-mgmt/netbox/files/netboxrc.sample.in index f74676e1a4d4..79ad884f632a 100644 --- a/net-mgmt/netbox/files/netboxrc.sample.in +++ b/net-mgmt/netbox/files/netboxrc.sample.in @@ -19,7 +19,7 @@ # netbox_use_config (bool): Set to NO by default. # If set, read the configuration parameter from file defined in # "netbox_config" instead using rc variables. -# netbox_config (str): Default to "/usr/local/etc/${name}.conf}" +# netbox_config (str): Default to "%%LOCALBASE%%/etc/${name}.conf.py}" # Config file for gunicorn's netbox config file # netbox_command (str): Default to "%%LOCALBASE%%/bin/gunicorn" # Path to gunicorn to run netbox @@ -56,7 +56,7 @@ netbox_chdir=${netbox_path} pidfile=${netbox_pidfile:-/var/run/${name}/${name}.pid} netbox_user=${netbox_user:-%%WWWOWN%%} netbox_use_config=${netbox_use_config:-no} -netbox_config=${netbox_config:-/${name}.conf} +netbox_config=${netbox_config:-%%LOCALBASE%%/etc/${name}.conf.py} netbox_bind=${netbox_bind:-localhost:8001} netbox_workers=${netbox_workers:-5} netbox_threads=${netbox_threads:-3} diff --git a/net-mgmt/netbox/files/pkg-message.in b/net-mgmt/netbox/files/pkg-message.in index e47b46f16529..2ae5d8a55343 100644 --- a/net-mgmt/netbox/files/pkg-message.in +++ b/net-mgmt/netbox/files/pkg-message.in @@ -373,4 +373,23 @@ EOD - "/api/redoc/" is now "/api/schema/redoc/" EOD } +{ type: upgrade + maximum_version: 3.5.4 + message: <<EOD +If a separate configuration file is used that does not have an ".py" extension, +the following message may appear when the netbox rc script is started: + +!!! +!!! WARNING: configuration file should have a valid Python extension. +!!! + +In this case, the existing configuration file should be provided with a ".py" +extension and if set, the rc variable "netbox_config" should also point to the +configuration file with the new file extension. + +The netbox sample rc script, which is provided via the EXAMPLES option, has +been adjusted accordingly. This also includes a fix for the default path of +the configuration if the rc variable "netbox_config" is not set. +EOD +} ] |