From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] python-ipaddress: Remove this python2 module Date: Fri, 14 May 2021 13:00:03 +0100 Message-ID: <1A010EFC-10B7-4F6E-A993-BFDD7739381A@ipfire.org> In-Reply-To: <57208284-75c1-27b0-1868-58bd7d2efae9@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6562750140448717304==" List-Id: --===============6562750140448717304== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, I never remember these, but I ran: grep -r "import ipaddress" build/ Apart from that script, libloc stuff came up, but that is already using Pytho= n 3. Since there are many ways to import a module in Python it might also be requi= red to search for this to be absolutely sure: "from ipadress import=E2=80=9D -Michael > On 14 May 2021, at 12:56, Adolf Belka wrote: >=20 > Hi Michael, >=20 > On 14/05/2021 13:39, Michael Tremer wrote: >> Hello, >> We cannot drop this just yet, because the unbound-dhcp-leases-bridge uses = this package. > Do you just know from your knowledge and experience that this script uses p= ython-ipaddress or is there some tool or method to find this type of informat= ion out. >=20 > Regards, > Adolf >> I will update that script and then merge this patch. >> -Michael >>> On 14 May 2021, at 11:30, Adolf Belka wrote: >>>=20 >>> - python-ipaddress is the python2 backport of the python3 built in >>> ipaddress module. Therefore python-ipaddress is not needed with the >>> move to try and remove python2 >>> - Remove the lfs and rootfiles and adjust make.sh >>>=20 >>> Signed-off-by: Adolf Belka >>> --- >>> config/rootfiles/common/python-ipaddress | 8 --- >>> lfs/python-ipaddress | 75 ------------------------ >>> make.sh | 1 - >>> 3 files changed, 84 deletions(-) >>> delete mode 100644 config/rootfiles/common/python-ipaddress >>> delete mode 100644 lfs/python-ipaddress >>>=20 >>> diff --git a/config/rootfiles/common/python-ipaddress b/config/rootfiles/= common/python-ipaddress >>> deleted file mode 100644 >>> index a81a5e679..000000000 >>> --- a/config/rootfiles/common/python-ipaddress >>> +++ /dev/null >>> @@ -1,8 +0,0 @@ >>> -usr/lib/python2.7/site-packages/ipaddress.py >>> -usr/lib/python2.7/site-packages/ipaddress.pyc >>> -#usr/lib/python2.7/site-packages/py2_ipaddress-3.4.1-py2.7.egg-info >>> -#usr/lib/python2.7/site-packages/py2_ipaddress-3.4.1-py2.7.egg-info/PKG-= INFO >>> -#usr/lib/python2.7/site-packages/py2_ipaddress-3.4.1-py2.7.egg-info/SOUR= CES.txt >>> -#usr/lib/python2.7/site-packages/py2_ipaddress-3.4.1-py2.7.egg-info/depe= ndency_links.txt >>> -#usr/lib/python2.7/site-packages/py2_ipaddress-3.4.1-py2.7.egg-info/top_= level.txt >>> -#usr/lib/python2.7/site-packages/py2_ipaddress-3.4.1-py2.7.egg-info/zip-= safe >>> diff --git a/lfs/python-ipaddress b/lfs/python-ipaddress >>> deleted file mode 100644 >>> index 27e42b431..000000000 >>> --- a/lfs/python-ipaddress >>> +++ /dev/null >>> @@ -1,75 +0,0 @@ >>> -########################################################################= ####### >>> -# = # >>> -# IPFire.org - A linux based firewall = # >>> -# Copyright (C) 2007-2018 IPFire Team = # >>> -# = # >>> -# This program is free software: you can redistribute it and/or modify = # >>> -# it under the terms of the GNU General Public License as published by = # >>> -# the Free Software Foundation, either version 3 of the License, or = # >>> -# (at your option) any later version. = # >>> -# = # >>> -# This program is distributed in the hope that it will be useful, = # >>> -# but WITHOUT ANY WARRANTY; without even the implied warranty of = # >>> -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # >>> -# GNU General Public License for more details. = # >>> -# = # >>> -# You should have received a copy of the GNU General Public License = # >>> -# along with this program. If not, see . = # >>> -# = # >>> -########################################################################= ####### >>> - >>> -########################################################################= ####### >>> -# Definitions >>> -########################################################################= ####### >>> - >>> -include Config >>> - >>> -VER =3D 3.4.1 >>> - >>> -THISAPP =3D py2-ipaddress-$(VER) >>> -DL_FILE =3D $(THISAPP).tar.gz >>> -DL_FROM =3D $(URL_IPFIRE) >>> -DIR_APP =3D $(DIR_SRC)/$(THISAPP) >>> -TARGET =3D $(DIR_INFO)/$(THISAPP) >>> - >>> -########################################################################= ####### >>> -# Top-level Rules >>> -########################################################################= ####### >>> - >>> -objects =3D $(DL_FILE) >>> - >>> -$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >>> - >>> -$(DL_FILE)_MD5 =3D 47734313c841068e3d5386d048d01c3d >>> - >>> -install : $(TARGET) >>> - >>> -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) >>> - >>> -download :$(patsubst %,$(DIR_DL)/%,$(objects)) >>> - >>> -md5 : $(subst %,%_MD5,$(objects)) >>> - >>> -########################################################################= ####### >>> -# Downloading, checking, md5sum >>> -########################################################################= ####### >>> - >>> -$(patsubst %,$(DIR_CHK)/%,$(objects)) : >>> - @$(CHECK) >>> - >>> -$(patsubst %,$(DIR_DL)/%,$(objects)) : >>> - @$(LOAD) >>> - >>> -$(subst %,%_MD5,$(objects)) : >>> - @$(MD5) >>> - >>> -########################################################################= ####### >>> -# Installation Details >>> -########################################################################= ####### >>> - >>> -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >>> - @$(PREBUILD) >>> - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) >>> - cd $(DIR_APP) && python setup.py install --root=3D/ >>> - @rm -rf $(DIR_APP) >>> - @$(POSTBUILD) >>> diff --git a/make.sh b/make.sh >>> index 25616cc4e..a9fb2b1bc 100755 >>> --- a/make.sh >>> +++ b/make.sh >>> @@ -1352,7 +1352,6 @@ buildipfire() { >>> lfsmake2 python-inotify >>> lfsmake2 python-docutils >>> lfsmake2 python-daemon >>> - lfsmake2 python-ipaddress >>> lfsmake2 glib >>> lfsmake2 ntp >>> lfsmake2 openssh >>> --=20 >>> 2.31.1 >>>=20 --===============6562750140448717304==--