From 347c9abe8ca5b36ca85a5d669dc3e5a578a59c2c Mon Sep 17 00:00:00 2001 From: Kai Knoblich Date: Sat, 14 Dec 2019 15:00:27 +0000 Subject: MFH: r519834 net-mgmt/netbox: Update to 2.6.8 * Backport a patch from upstream that fixes an exception on password change page for local users. Changelog: Enhancements: * Disable password change form for LDAP-authenticated users * Display cable colors on device view * Remove obsolete P3P policy header * Add query filters for created and last_updated fields * Allow the underscore character in IPAddress DNS names Bug Fixes: * Fix validation error when editing power cables in bulk * Fix exception when connecting a cable to a RearPort with no corresponding FrontPort * Include weight field in prefix/VLAN role form * Include comments on PowerFeed view * Fix link for assigned ipaddress in interface page * Prevent exception when importing an invalid cable definition * Correctly indicate power feed terminations on cable list * Fix API filtering of interfaces by more than one device name * Enforce client validation for minimum service port number https://github.com/netbox-community/netbox/releases/tag/v2.6.8 Approved by: ports-secteam (joneum) --- net-mgmt/netbox/Makefile | 2 +- net-mgmt/netbox/distinfo | 6 +++--- net-mgmt/netbox/files/patch-netbox_users_views.py | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 net-mgmt/netbox/files/patch-netbox_users_views.py diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile index ccf44e3d6053..da62903a1768 100644 --- a/net-mgmt/netbox/Makefile +++ b/net-mgmt/netbox/Makefile @@ -2,7 +2,7 @@ PORTNAME= netbox DISTVERSIONPREFIX= v -DISTVERSION= 2.6.7 +DISTVERSION= 2.6.8 CATEGORIES= net-mgmt MAINTAINER= kai@FreeBSD.org diff --git a/net-mgmt/netbox/distinfo b/net-mgmt/netbox/distinfo index 12921440019d..f53556c7552e 100644 --- a/net-mgmt/netbox/distinfo +++ b/net-mgmt/netbox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1572671276 -SHA256 (netbox-community-netbox-v2.6.7_GH0.tar.gz) = 530d5f49df79ca9f0deab469d9a48349a6386751895188036f99aea16639fcda -SIZE (netbox-community-netbox-v2.6.7_GH0.tar.gz) = 2416096 +TIMESTAMP = 1575996489 +SHA256 (netbox-community-netbox-v2.6.8_GH0.tar.gz) = fb146bdb0369e59034f24b1523ec5025575b3fb9ad473896fd43fc9faffdc9b0 +SIZE (netbox-community-netbox-v2.6.8_GH0.tar.gz) = 2416523 diff --git a/net-mgmt/netbox/files/patch-netbox_users_views.py b/net-mgmt/netbox/files/patch-netbox_users_views.py new file mode 100644 index 000000000000..77685215ebb7 --- /dev/null +++ b/net-mgmt/netbox/files/patch-netbox_users_views.py @@ -0,0 +1,16 @@ +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') + -- cgit v1.2.3