Index: head/net-mgmt/netbox/Makefile =================================================================== --- head/net-mgmt/netbox/Makefile (revision 555751) +++ head/net-mgmt/netbox/Makefile (revision 555752) @@ -1,90 +1,94 @@ # $FreeBSD$ PORTNAME= netbox DISTVERSIONPREFIX= v -DISTVERSION= 2.9.8 +DISTVERSION= 2.9.9 CATEGORIES= net-mgmt MAINTAINER= kai@FreeBSD.org COMMENT= IP address management tool LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt # NetBox has fixed Python package dependencies listed in "requirements.txt" # which are not checked during build/runtime because they're usually installed # via devel/py-pip. # # As a rule, slight deviations are usally not a problem, but there are a few # Django packages that are known for regressions in conjunction with NetBox and # should therefore only be updated with caution. # # - devel/py-dj31-django-rq # - www/py-dj31-django-filter # - www/py-dj31-django-tables2 # - www/py-dj31-djangorestframework (in conjunction with www/py-dj31-drf-yasg) # RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=3.1<3.2:www/py-django31@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj31-django-cacheops>=5.1.0<5.2:www/py-dj31-django-cacheops@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj31-django-cors-headers>=3.4.0<3.5:www/py-dj31-django-cors-headers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj31-django-debug-toolbar>=2.2<4:www/py-dj31-django-debug-toolbar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj31-django-filter>=2.3.0<2.4:www/py-dj31-django-filter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj31-django-mptt>=0.11.0<0.12:www/py-dj31-django-mptt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj31-django-prometheus>=2.0.0<2.1:www/py-dj31-django-prometheus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj31-django-rq>=2.3.2<2.4:devel/py-dj31-django-rq@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj31-django-tables2>=2.3.1<2.4:www/py-dj31-django-tables2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj31-django-taggit>=1.3.0<2:www/py-dj31-django-taggit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj31-django-timezone-field>=4.0<5:www/py-dj31-django-timezone-field@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj31-djangorestframework>=3.11.0<3.12.0,1:www/py-dj31-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj31-drf-yasg>=1.17.1<1.21:www/py-dj31-drf-yasg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-pglocks>=1.0.4<1.1:www/py-django-pglocks@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gfm>=0.1.4<0.2:textproc/py-gfm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.11.2<3:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11<3.5:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.19<1:net/py-netaddr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.9.8<4:security/py-pycryptodome@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5<3:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}svgwrite>=1.3.1<2:graphics/py-svgwrite@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1<6:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gunicorn>=19.9.0<21:www/py-gunicorn@${PY_FLAVOR} USES= pgsql:9.6+ python:3.6+ USE_GITHUB= yes GH_ACCOUNT= netbox-community -SUB_FILES= netboxrc.sample pkg-message +SUB_FILES= 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-install: cd ${WRKSRC}/netbox ; \ for src in $$( ${FIND} . ! -name '*.bak' ) ; do \ dst=${STAGEDIR}${DATADIR}$${src#.} ; \ if ${TEST} -d "$$src" ; then \ ${MKDIR} "$$dst" ; \ else \ ${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 post-install-EXAMPLES-on: @${MKDIR} ${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} + ${INSTALL_DATA} ${WRKSRC}/contrib/gunicorn.py ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/contrib/nginx.conf ${STAGEDIR}${EXAMPLESDIR} .include Index: head/net-mgmt/netbox/distinfo =================================================================== --- head/net-mgmt/netbox/distinfo (revision 555751) +++ head/net-mgmt/netbox/distinfo (revision 555752) @@ -1,3 +1,3 @@ -TIMESTAMP = 1604135336 -SHA256 (netbox-community-netbox-v2.9.8_GH0.tar.gz) = 182a773b604ef0e6f01cc42752799356431debd9b852f5b86ef19b2bd928271e -SIZE (netbox-community-netbox-v2.9.8_GH0.tar.gz) = 5799405 +TIMESTAMP = 1605642137 +SHA256 (netbox-community-netbox-v2.9.9_GH0.tar.gz) = 9d6252753754d7fa4a15920b810e4f615b63138b2572128fdbdb39ab054c7142 +SIZE (netbox-community-netbox-v2.9.9_GH0.tar.gz) = 5801532 Index: head/net-mgmt/netbox/files/netbox_rq.sample.in =================================================================== --- head/net-mgmt/netbox/files/netbox_rq.sample.in (nonexistent) +++ head/net-mgmt/netbox/files/netbox_rq.sample.in (revision 555752) @@ -0,0 +1,43 @@ +#!/bin/sh + +# This sample rc script starts the RQ worker background service which is +# required for Webhooks and various automation tasks. + +# +# PROVIDE: netbox_rq +# REQUIRE: DAEMON +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf.local or /etc/rc.conf +# to enable netbox-rq: +# +# netbox_rq_enable (bool): Set to NO by default. +# Set it to YES to enable netbox_rq. + +. /etc/rc.subr + +name=netbox_rq +rcvar=netbox_rq_enable + +load_rc_config $name + +start_cmd="netbox_rq_start" +start_precmd="netbox_rq_precmd" +command="%%PYTHON_CMD%%" +command_args="%%DATADIR%%/manage.py rqworker" +pidfile=${netbox_rq_pidfile:-/var/run/${name}/${name}.pid} +netbox_rq_user=${netbox_rq_user:-www} + + +netbox_rq_precmd() +{ + install -d -o ${netbox_rq_user} `dirname ${pidfile}` +} + +netbox_rq_start() +{ + echo "Starting netbox_rq." + /usr/sbin/daemon -cf -p ${pidfile} -u ${netbox_rq_user} ${command} ${command_args} +} + +run_rc_command "$1" Property changes on: head/net-mgmt/netbox/files/netbox_rq.sample.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/netbox/files/pkg-message.in =================================================================== --- head/net-mgmt/netbox/files/pkg-message.in (revision 555751) +++ head/net-mgmt/netbox/files/pkg-message.in (revision 555752) @@ -1,252 +1,262 @@ [ { type: install message: <) for more info. >>> Region.objects.rebuild() >>> RackGroup.objects.rebuild() >>> TenantGroup.objects.rebuild() EOD } +{ type: upgrade + maximum_version: 2.9.9 + message: <