From owner-svn-ports-all@freebsd.org  Sun Dec 15 12:33:07 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2DC6E1EC26B;
 Sun, 15 Dec 2019 12:33:07 +0000 (UTC) (envelope-from kai@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47bP2C0PPlz4VXr;
 Sun, 15 Dec 2019 12:33:07 +0000 (UTC) (envelope-from kai@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E3538D2A3;
 Sun, 15 Dec 2019 12:33:06 +0000 (UTC) (envelope-from kai@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBFCX6kW023441;
 Sun, 15 Dec 2019 12:33:06 GMT (envelope-from kai@FreeBSD.org)
Received: (from kai@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBFCX6oU023440;
 Sun, 15 Dec 2019 12:33:06 GMT (envelope-from kai@FreeBSD.org)
Message-Id: <201912151233.xBFCX6oU023440@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org
 using -f
From: Kai Knoblich <kai@FreeBSD.org>
Date: Sun, 15 Dec 2019 12:33:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r520174 - in branches/2019Q4/net-mgmt/netbox: . files
X-SVN-Group: ports-branches
X-SVN-Commit-Author: kai
X-SVN-Commit-Paths: in branches/2019Q4/net-mgmt/netbox: . files
X-SVN-Commit-Revision: 520174
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Dec 2019 12:33:07 -0000

Author: kai
Date: Sun Dec 15 12:33:06 2019
New Revision: 520174
URL: https://svnweb.freebsd.org/changeset/ports/520174

Log:
  MFH: r520173
  
  net-mgmt/netbox: Fix assignment of IP addresses to interfaces
  
  * Backport a patch from upstream's repository which fixes the assignment of
    existing IP addresses to interfaces.
  
    Without that patch the assignment of an IP address gives no error but the
    interface doesn't contain the assigned IP address at the end.
  
  * Bump PORTREVISION for package change.
  
  Approved by:	ports-secteam bugfix blanket

Added:
  branches/2019Q4/net-mgmt/netbox/files/patch-netbox_ipam_tables.py
     - copied unchanged from r520173, head/net-mgmt/netbox/files/patch-netbox_ipam_tables.py
Modified:
  branches/2019Q4/net-mgmt/netbox/Makefile
Directory Properties:
  branches/2019Q4/   (props changed)

Modified: branches/2019Q4/net-mgmt/netbox/Makefile
==============================================================================
--- branches/2019Q4/net-mgmt/netbox/Makefile	Sun Dec 15 12:32:20 2019	(r520173)
+++ branches/2019Q4/net-mgmt/netbox/Makefile	Sun Dec 15 12:33:06 2019	(r520174)
@@ -3,6 +3,7 @@
 PORTNAME=	netbox
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.6.8
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	kai@FreeBSD.org

Copied: branches/2019Q4/net-mgmt/netbox/files/patch-netbox_ipam_tables.py (from r520173, head/net-mgmt/netbox/files/patch-netbox_ipam_tables.py)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2019Q4/net-mgmt/netbox/files/patch-netbox_ipam_tables.py	Sun Dec 15 12:33:06 2019	(r520174, copy of r520173, head/net-mgmt/netbox/files/patch-netbox_ipam_tables.py)
@@ -0,0 +1,20 @@
+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 = """
+-<a href="{% url 'ipam:ipaddress_edit' pk=record.pk %}?interface={{ record.interface.pk }}&return_url={{ request.path }}">{{ record }}</a>
++{% if request.GET %}
++    <a href="{% url 'ipam:ipaddress_edit' pk=record.pk %}?interface={{ request.GET.interface }}&return_url={{ request.GET.return_url }}">{{ record }}</a>
++{% else %}
++    <a href="{% url 'ipam:ipaddress_edit' pk=record.pk %}?interface={{ record.interface.pk }}&return_url={{ request.path }}">{{ record }}</a>
++{% endif %}
+ """
+ 
+ IPADDRESS_PARENT = """