From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v4 6/8] ipaddr: Removal of this python2 module. Date: Thu, 05 Aug 2021 23:01:50 +0200 Message-ID: <20210805210152.3467498-6-adolf.belka@ipfire.org> In-Reply-To: <20210805210152.3467498-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2794473764461091129==" List-Id: --===============2794473764461091129== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - python3 has this functionality built in with ipaddress.py Signed-off-by: Adolf Belka --- config/rootfiles/common/ipaddr | 2 - lfs/ipaddr | 76 ---------------------------------- 2 files changed, 78 deletions(-) delete mode 100644 config/rootfiles/common/ipaddr delete mode 100644 lfs/ipaddr diff --git a/config/rootfiles/common/ipaddr b/config/rootfiles/common/ipaddr deleted file mode 100644 index 17998ccc2..000000000 --- a/config/rootfiles/common/ipaddr +++ /dev/null @@ -1,2 +0,0 @@ -#usr/lib/python2.7/ipaddr.py -usr/lib/python2.7/ipaddr.pyc diff --git a/lfs/ipaddr b/lfs/ipaddr deleted file mode 100644 index d5d28229b..000000000 --- a/lfs/ipaddr +++ /dev/null @@ -1,76 +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 1.2 - -THISAPP =3D ipaddr-$(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 239a3725a3dd6a1d1e369b75144e617e - -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) && install -m 0644 ipaddr.py /usr/lib/python2* - /usr/bin/python -c "import ipaddr" - @rm -rf $(DIR_APP) - @$(POSTBUILD) --=20 2.32.0 --===============2794473764461091129==--