From nobody Wed May 15 22:07:27 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 4VfnQW4XCvz4tBfg; Wed, 15 May 2024 22:07:31 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VfnQW2LFHz4CQQ; Wed, 15 May 2024 22:07:31 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id 7Gx7sCYiZ2Ui57MmYsYAxf; Wed, 15 May 2024 22:07:30 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id 7MmWs8y7K9Cr47MmXs50cC; Wed, 15 May 2024 22:07:30 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=etl8zZpX c=1 sm=1 tr=0 ts=66453222 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=TpHVaj0NuXgA:10 a=6I5d2MoRAAAA:8 a=NEAV23lmAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=XIICpWNh7B8TMISMf-cA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 02159507; Wed, 15 May 2024 15:07:28 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id E253514B; Wed, 15 May 2024 15:07:27 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 698ed6d9b681 - main - sysutils/ansible: Chase 58df5a82adc40a6959e9b22c, net/py-netaddr update In-reply-to: <202405152205.44FM5Kxb084017@gitrepo.freebsd.org> References: <202405152205.44FM5Kxb084017@gitrepo.freebsd.org> Comments: In-reply-to Cy Schubert message dated "Wed, 15 May 2024 22:05:20 +0000." List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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=us-ascii Date: Wed, 15 May 2024 15:07:27 -0700 Message-Id: <20240515220727.E253514B@slippy.cwsent.com> X-CMAE-Envelope: MS4xfPdKaDocakM+F56LtoJskLLx7aePOheUqce67HdqoKJqFGXBUirJHv3z1AvD74HjrtHj0OfNxPjVV1b9QIEbL2Av21GkqzjmH+CNGpP/2M0Hr18k2mEO WrsJcuXD6fZ4vf9E8e3xzrFlSv4U11Dew+oMN+W1GVTYAmjb7klTgITk9nQnICaMGkaKyU4pXrtg8FfIJ8V0PPpuCoLZDsgFoQvzrGimrYrnHkHhun57UqXx TEE9auata2/Pto0LM8Gc+Q7/CBOQesQs2FxM+F843TCxXjHDFdakFeItx9NU7nQQuF2KBfgTk9ow54bo8VglFBwZWYHh6RPRV1trdG29JUU= X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4VfnQW2LFHz4CQQ In message <202405152205.44FM5Kxb084017@gitrepo.freebsd.org>, Cy Schubert write s: > The branch main has been updated by cy: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=698ed6d9b68169e3a5549fe2abf1a1 > 3bad5a653b > > commit 698ed6d9b68169e3a5549fe2abf1a13bad5a653b > Author: Cy Schubert > AuthorDate: 2024-05-15 18:00:36 +0000 > Commit: Cy Schubert > CommitDate: 2024-05-15 22:05:14 +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 > Obtained from: https://github.com/ansible-collections/ansible.utils/pull > /338 PR: 279016 MFH: 2024Q2 > --- > 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-ans > ible__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(), -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0