Index: branches/2020Q1/net-mgmt/netbox/Makefile =================================================================== --- branches/2020Q1/net-mgmt/netbox/Makefile (revision 521888) +++ branches/2020Q1/net-mgmt/netbox/Makefile (revision 521889) @@ -1,79 +1,78 @@ # $FreeBSD$ PORTNAME= netbox DISTVERSIONPREFIX= v -DISTVERSION= 2.6.8 -PORTREVISION= 1 +DISTVERSION= 2.6.9 CATEGORIES= net-mgmt MAINTAINER= kai@FreeBSD.org COMMENT= IP address management tool LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.2<2.3:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-cacheops>=4.1:www/py-dj22-django-cacheops@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-cors-headers>=3.0.2:www/py-dj22-django-cors-headers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-debug-toolbar>=2.0:www/py-dj22-django-debug-toolbar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-filter>=2.1.0:www/py-dj22-django-filter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-mptt>=0.9.1:www/py-dj22-django-mptt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-prometheus>=1.0.15:www/py-dj22-django-prometheus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-rq>=2.1.0:devel/py-dj22-django-rq@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-tables2>=2.0.6:www/py-dj22-django-tables2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit>=0:www/py-dj22-django-taggit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-taggit-serializer>=0.1.7:www/py-dj22-django-taggit-serializer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-django-timezone-field>=3.0:www/py-dj22-django-timezone-field@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-djangorestframework>=3.9.4:www/py-dj22-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dj22-drf-yasg>=1.16.0:www/py-dj22-drf-yasg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gfm>=0.1.4:textproc/py-gfm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}graphviz>=0.10.1:graphics/py-graphviz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.19:net/py-netaddr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.8.2:security/py-pycryptodome@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=6.2.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.3:databases/py-psycopg2@${PY_FLAVOR} USES= pgsql:9.4+ python:3.5+ USE_GITHUB= yes GH_ACCOUNT= netbox-community SUB_FILES= 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 post-patch: @${REINPLACE_CMD} -e 's|==|>=|' ${WRKSRC}/requirements.txt 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}/netboxrc.sample ${STAGEDIR}${EXAMPLESDIR} .include Index: branches/2020Q1/net-mgmt/netbox/distinfo =================================================================== --- branches/2020Q1/net-mgmt/netbox/distinfo (revision 521888) +++ branches/2020Q1/net-mgmt/netbox/distinfo (revision 521889) @@ -1,3 +1,3 @@ -TIMESTAMP = 1575996489 -SHA256 (netbox-community-netbox-v2.6.8_GH0.tar.gz) = fb146bdb0369e59034f24b1523ec5025575b3fb9ad473896fd43fc9faffdc9b0 -SIZE (netbox-community-netbox-v2.6.8_GH0.tar.gz) = 2416523 +TIMESTAMP = 1576569679 +SHA256 (netbox-community-netbox-v2.6.9_GH0.tar.gz) = 82b993a4002ad68f0d572591f81958aa88a37244c9d76646c01c210fdd57bdb9 +SIZE (netbox-community-netbox-v2.6.9_GH0.tar.gz) = 2417598 Index: branches/2020Q1/net-mgmt/netbox/files/patch-netbox_users_views.py =================================================================== --- branches/2020Q1/net-mgmt/netbox/files/patch-netbox_users_views.py (revision 521888) +++ branches/2020Q1/net-mgmt/netbox/files/patch-netbox_users_views.py (nonexistent) @@ -1,16 +0,0 @@ -Fix exception on password change page for local users - -Obtained from: -https://github.com/netbox-community/netbox/commit/3b03d68ac70be1b5b9912d0a4d2a5fecd25cede4 - ---- netbox/users/views.py.orig 2019-12-10 15:47:48 UTC -+++ netbox/users/views.py -@@ -96,7 +96,7 @@ class ChangePasswordView(LoginRequiredMixin, View): - - def get(self, request): - # LDAP users cannot change their password here -- if getattr(request.user, 'ldap_username'): -+ if getattr(request.user, 'ldap_username', None): - messages.warning(request, "LDAP-authenticated user credentials cannot be changed within NetBox.") - return redirect('user:profile') - Property changes on: branches/2020Q1/net-mgmt/netbox/files/patch-netbox_users_views.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2020Q1/net-mgmt/netbox/files/patch-netbox_ipam_tables.py =================================================================== --- branches/2020Q1/net-mgmt/netbox/files/patch-netbox_ipam_tables.py (revision 521888) +++ branches/2020Q1/net-mgmt/netbox/files/patch-netbox_ipam_tables.py (nonexistent) @@ -1,20 +0,0 @@ -Fix unable to assign existing IP addresses to interfaces - -Obtained from: -https://github.com/netbox-community/netbox/commit/1acdf58a4bb35d83a280464ac69aa961ff614df7 - ---- netbox/ipam/tables.py.orig 2019-12-15 11:43:12 UTC -+++ netbox/ipam/tables.py -@@ -85,7 +85,11 @@ IPADDRESS_LINK = """ - """ - - IPADDRESS_ASSIGN_LINK = """ --{{ record }} -+{% if request.GET %} -+ {{ record }} -+{% else %} -+ {{ record }} -+{% endif %} - """ - - IPADDRESS_PARENT = """ Property changes on: branches/2020Q1/net-mgmt/netbox/files/patch-netbox_ipam_tables.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2020Q1/net-mgmt/netbox/files/patch-netbox_extras_api_customfields.py =================================================================== --- branches/2020Q1/net-mgmt/netbox/files/patch-netbox_extras_api_customfields.py (nonexistent) +++ branches/2020Q1/net-mgmt/netbox/files/patch-netbox_extras_api_customfields.py (revision 521889) @@ -0,0 +1,18 @@ +Fix AttributeError exception in API docs when accessing api/docs + +Obtained from: + +https://github.com/netbox-community/netbox/commit/55b503da5bdf2a95e903fb657ade195ff89cae91 + +--- netbox/extras/api/customfields.py.orig 2019-12-16 21:32:00 UTC ++++ netbox/extras/api/customfields.py +@@ -124,6 +124,9 @@ class CustomFieldModelSerializer(ValidatedModelSeriali + + else: + ++ if not hasattr(self, 'initial_data'): ++ self.initial_data = {} ++ + # Populate default values + if fields and 'custom_fields' not in self.initial_data: + self.initial_data['custom_fields'] = {} Property changes on: branches/2020Q1/net-mgmt/netbox/files/patch-netbox_extras_api_customfields.py ___________________________________________________________________ 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: branches/2020Q1/net-mgmt/netbox/pkg-descr =================================================================== --- branches/2020Q1/net-mgmt/netbox/pkg-descr (revision 521888) +++ branches/2020Q1/net-mgmt/netbox/pkg-descr (revision 521889) @@ -1,15 +1,15 @@ NetBox is an open source web application designed to help manage and document computer networks. Initially conceived by the network engineering team at DigitalOcean, NetBox was developed specifically to address the needs of network and infrastructure engineers. It encompasses the following aspects of network management: - IP address management (IPAM) - IP networks and addresses, VRFs, and VLANs - Equipment racks - Organized by group and site - Devices - Types of devices and where they are installed - Connections - Network, console, and power connections among devices - Virtualization - Virtual machines and clusters - Data circuits - Long-haul communications circuits and providers - Secrets - Encrypted storage of sensitive credentials -WWW: https://github.com/digitalocean/netbox +WWW: https://github.com/netbox-community/netbox Property changes on: branches/2020Q1/net-mgmt/netbox/pkg-descr ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: branches/2020Q1 =================================================================== --- branches/2020Q1 (revision 521888) +++ branches/2020Q1 (revision 521889) Property changes on: branches/2020Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r521755