Re: [PATCH] python-ipaddress: Remove this python2 module

[Adolf Belka <adolf.belka@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 6006 bytes --]

Hi Michael,

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 python-ipaddress or is there some tool or method to find this type of information out.

Regards,
Adolf
> 
> I will update that script and then merge this patch.
> 
> -Michael
> 
>> On 14 May 2021, at 11:30, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>
>> - 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
>>
>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>> ---
>> 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
>>
>> 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/SOURCES.txt
>> -#usr/lib/python2.7/site-packages/py2_ipaddress-3.4.1-py2.7.egg-info/dependency_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  <info(a)ipfire.org>                     #
>> -#                                                                             #
>> -# 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 <http://www.gnu.org/licenses/>.       #
>> -#                                                                             #
>> -###############################################################################
>> -
>> -###############################################################################
>> -# Definitions
>> -###############################################################################
>> -
>> -include Config
>> -
>> -VER        = 3.4.1
>> -
>> -THISAPP    = py2-ipaddress-$(VER)
>> -DL_FILE    = $(THISAPP).tar.gz
>> -DL_FROM    = $(URL_IPFIRE)
>> -DIR_APP    = $(DIR_SRC)/$(THISAPP)
>> -TARGET     = $(DIR_INFO)/$(THISAPP)
>> -
>> -###############################################################################
>> -# Top-level Rules
>> -###############################################################################
>> -
>> -objects = $(DL_FILE)
>> -
>> -$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>> -
>> -$(DL_FILE)_MD5 = 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=/
>> -	@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
>> -- 
>> 2.31.1
>>
>