Date: Wed, 15 May 2024 15:07:27 -0700 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Cy Schubert <cy@FreeBSD.org> 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 Message-ID: <20240515220727.E253514B@slippy.cwsent.com> In-Reply-To: <202405152205.44FM5Kxb084017@gitrepo.freebsd.org> References: <202405152205.44FM5Kxb084017@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <cy@FreeBSD.org> > AuthorDate: 2024-05-15 18:00:36 +0000 > Commit: Cy Schubert <cy@FreeBSD.org> > 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 <einar@isnic.is> > 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 <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org NTP: <cy@nwtime.org> Web: https://nwtime.org e^(i*pi)+1=0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20240515220727.E253514B>