From nobody Wed May 15 22:08:59 2024
X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VfnSC5FyLz4tBY2;
	Wed, 15 May 2024 22:08:59 +0000 (UTC)
	(envelope-from git@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)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4VfnSC4h5dz4CMt;
	Wed, 15 May 2024 22:08:59 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1715810939;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=OlVNN49q397eV0ihZu1nWxxEWOL1kflKQGy0+kK/JRk=;
	b=Q5o5nCQH5YEh4Xj092/QiPB0f5meAYsZz8RpKYBCFQSsjN7WiQS9taCIGPUpmxI8bWXaii
	y2/jKXYaL+0+vrN8izShi/dmFrfXqhjcCpBnb3AU4XpiK2Ecq1lvqsFOfzeKrg98lmwz06
	myOPVnk58sm8CEU3zUONHOYbeLCzAGBf6GC8k+Z04j9slf5xdyXYMT0aOeKixrnm63/X0r
	d4rvZfwP3ULP3VI1l0cN0HJlflmKO+CL9VwzrCnJKB0tIYXJJ4kTuV+rbLdAShJU8yQ5yS
	1TEKO6jdyr4MPqAHRgJ0uG477L4Wp7BHMatwsnWhXfwos+d1LpsedSdZEcc0tQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715810939; a=rsa-sha256; cv=none;
	b=ZWvguOLpHJHRZfOcxRWLhK7d8ZCsnnpv3n2e2wEpDCw/ruxblvxmGScdRjSF5LnHfxoiYi
	p01rhUn+Z5/i+n3Naq2sdJ2lPk/OVTFxwiN+Dnqf1nbakC0qyXISMZZNipw3Roytt3QYat
	6KBZDvRqWCze/2cqxuhkrlL2CCtiH7yy07VKbBytzdZpob/CT2q/XlGlVnm1x13e2TjvVO
	XeNX8i6eRfJjK9IMLOtwben/mMNngSC5LeQHKUGpaOraqWKFmjIkGtja6d43VVprhc/CcR
	HnyMLSObydCc4RPMFLhshprXIOPGzmUtObefNiruneN6hYhwU+ZG4z8iZS9x3Q==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1715810939;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=OlVNN49q397eV0ihZu1nWxxEWOL1kflKQGy0+kK/JRk=;
	b=ph+vOukjZqdDNB1g/VLgh1Y8EJOsb53BozJ35u32rSQd38QERb7YvddGoHsIW9qmFqL9kY
	kWPL4zCLTVOw8U0ODwY37kSjMjTmttnMl4dUBKKnAiVdPhgtkFwR4gFQLlCNMrmMwya2RH
	CWX9rxys6D2Czm5AqXE7e9+Gg/cEYfisdfJy3yw9Wrx3LhEeCICXmsUIra6PCh+otYqemG
	bAIe7QQgQeP3lUh79JBzmR2o45tt1ZLo6ZYB1CDiG+9KtjuF6AMqNU/a2FfzHm7nzK2LkB
	FeYCpQtlIe7dhj13fSGhDcmNerBCEv3TFSS411t33stYhOzAXWzakUHyi1ivvA==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VfnSC42BdzYLJ;
	Wed, 15 May 2024 22:08:59 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44FM8x87084697;
	Wed, 15 May 2024 22:08:59 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44FM8xXe084694;
	Wed, 15 May 2024 22:08:59 GMT
	(envelope-from git)
Date: Wed, 15 May 2024 22:08:59 GMT
Message-Id: <202405152208.44FM8xXe084694@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
        dev-commits-ports-branches@FreeBSD.org
From: Cy Schubert <cy@FreeBSD.org>
Subject: git: 5be809dfd0b2 - 2024Q2 - sysutils/ansible: Chase
  58df5a82adc40a6959e9b22c, net/py-netaddr update
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-ports-all@freebsd.org
Sender: owner-dev-commits-ports-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: cy
X-Git-Repository: ports
X-Git-Refname: refs/heads/2024Q2
X-Git-Reftype: branch
X-Git-Commit: 5be809dfd0b2469a26aa43e91e43ae4590d988f9
Auto-Submitted: auto-generated

The branch 2024Q2 has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5be809dfd0b2469a26aa43e91e43ae4590d988f9

commit 5be809dfd0b2469a26aa43e91e43ae4590d988f9
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-05-15 18:00:36 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-05-15 22:08:48 +0000

    sysutils/ansible: Chase 58df5a82adc40a6959e9b22c, net/py-netaddr update
    
    net/py-netaddr 1.2.1 deprecated and removed the is_private method.
    This breaks ansible-collections which is bundled this port's tarball.
    The upstream patch uses the is_global methhod instead.
    
    Reported by:    Einar Bjarni Halldorsson <einar@isnic.is>
    Obtained from:  https://github.com/ansible-collections/ansible.utils/pull/338
    
    (cherry picked from commit 698ed6d9b68169e3a5549fe2abf1a13bad5a653b)
---
 sysutils/ansible/Makefile                            |  1 +
 ..._utils_plugins_plugin__utils_base_ipaddr_utils.py | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index d8c4c8e2bcac..e0d5c757c25c 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ansible
 DISTVERSION=	8.5.0
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/ansible/files/patch-ansible__collections_ansible_utils_plugins_plugin__utils_base_ipaddr_utils.py b/sysutils/ansible/files/patch-ansible__collections_ansible_utils_plugins_plugin__utils_base_ipaddr_utils.py
new file mode 100644
index 000000000000..e89669b4830c
--- /dev/null
+++ b/sysutils/ansible/files/patch-ansible__collections_ansible_utils_plugins_plugin__utils_base_ipaddr_utils.py
@@ -0,0 +1,20 @@
+--- ansible_collections/ansible/utils/plugins/plugin_utils/base/ipaddr_utils.py.orig	2023-09-07 02:17:47.000000000 -0700
++++ ansible_collections/ansible/utils/plugins/plugin_utils/base/ipaddr_utils.py	2024-05-15 08:23:34.190190000 -0700
+@@ -289,7 +289,7 @@
+ 
+ 
+ def _private_query(v, value):
+-    if v.is_private():
++    if not v.ip.is_global():
+         return value
+ 
+ 
+@@ -298,7 +298,7 @@
+     if all(
+         [
+             v_ip.is_unicast(),
+-            not v_ip.is_private(),
++            v_ip.is_global(),
+             not v_ip.is_loopback(),
+             not v_ip.is_netmask(),
+             not v_ip.is_hostmask(),