From patchwork Fri May 14 10:30:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4271 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FhPtW5kkLz44RW for ; Fri, 14 May 2021 10:30:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FhPtV49XZz11s; Fri, 14 May 2021 10:30:26 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FhPtV1ftgz2yHN; Fri, 14 May 2021 10:30:26 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FhPtT1QJ1z2xgV for ; Fri, 14 May 2021 10:30:25 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FhPtS4yxKzYJ; Fri, 14 May 2021 10:30:24 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1620988224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=R6jTqDh6LTjJqoj7U9D/E0OotEZv1g866p3/ajxx6cU=; b=wPI+9yhtlg493PFDhJYjF61MwRBJecyJfKUz+oF+vMUwYi4L1XxkURekjY3QlFQkbbJVod Bndx63EoCHVYoVCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1620988224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=R6jTqDh6LTjJqoj7U9D/E0OotEZv1g866p3/ajxx6cU=; b=JaiJnDzJyCO6YqGIx5YchnlzYlRb4VKVmtbyIwJS3FAcXADA5f7VNI10Xiw/0EbxnWPovf k9YgDa7cVMQP/xpRmvB6Gu3jfQRb0USaxR10NKASRnLHRWeoJFGGcUPSkRcF10dvzgqZF/ gsnQbcWs6+mfLO8NVBSsUnzno2ZDcr6uaEE+sjQSSWaQBL0ZjnFYQTzUDYY1Y7scXqoY+y Dr9DjiiGUkMq5bH2BpFGa+0YKRQZoVFKChVIBMvoW51mWHk+H5gkZwqD1RR828pG+YJiv6 oKCG1zO8Qb4NQ4mT6AccAeCGcQMwM08EBANnpsz4X+ojxLyTHslxCkAJ3iPaGw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] python-ipaddress: Remove this python2 module Date: Fri, 14 May 2021 12:30:17 +0200 Message-Id: <20210514103017.3514663-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - 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 --- 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 # -# # -# 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 = 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