From patchwork Thu May 13 11:43:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4266 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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FgqYQ179Bz44RW for ; Thu, 13 May 2021 11:43:38 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FgqYN4SxwzWs; Thu, 13 May 2021 11:43:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FgqYN0qhhz2yXb; Thu, 13 May 2021 11:43:36 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FgqYM30SMz2xVT for ; Thu, 13 May 2021 11:43:35 +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 4FgqYL62kfzWs; Thu, 13 May 2021 11:43:34 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1620906215; 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=KHJ/mvFTcGRowQFLQOIfvpk/kY9JocHuhzvC6dsoATE=; b=I77bOLfpbPxsXmdpoERBdY6DA8woZn2ICnJJPJyLBkgCW9GUWBpeIpLTPXvfeEH7IUC0zR d2J1eJI+LiqSdqCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1620906215; 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=KHJ/mvFTcGRowQFLQOIfvpk/kY9JocHuhzvC6dsoATE=; b=PzXcQkMGMLW0gIFlFuPUSv+uDcU4akL4o5LHe46Kg9J0ZUsyTlyzra/PEeZ7K422duDgXK /Np4gUZXxXfouNrMgoXwmFJOrRz0kfHT+9n5B1OfsD7bBaDbC075SWFceYTepsho6IR34t ZE0rVWgo3/jV+6S/1J1FVjPVxKaC/YbzOSHbh6kfAwgrsbK8/Nkpkr/yxxxdN5zCGVJqJm tcAMEdgIIUr2VLzHtuZ0kPAUOxD5zhlwcnE/ioy47XZGJLKQa1rEYwV7cbHz7YTHU9twz3 LaCS4w64vdU4rUQ4G3K5DGdoZZGfX+zAlF48Gs08Fq/MxNPITAnF7FfnTpwFDg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] make.sh: Removal of four python2 modules Date: Thu, 13 May 2021 13:43:31 +0200 Message-Id: <20210513114331.3523287-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" - Removal of python-clientform, python-feedparser, python-mechanize and python-rssdler addons - lfs and rootfiles - python-clientform was made obsolete in 2008 and its functions taken over by python-mechanize - python-rssdler is an RSS feed downloader to facilitate downloading of podcasts, videocasts and torrents. Current IPFire version is 0.4.0a from 2008. The most recent version available is 0.4.2 from 2009. No further development is being done with this module. An RSS feed downloader is not appropriate for use in a firewall system, even less so when it is 12 years old. - python-feedparser and python-mechanize are both dependencies for python-rssdler. They are not dependencies for any other addon. - Full clean build with these four modules fully removed gave no problems. Signed-off-by: Adolf Belka Reviewed-by: Peter Müller --- config/rootfiles/packages/python-clientform | 1 - config/rootfiles/packages/python-feedparser | 3 - config/rootfiles/packages/python-mechanize | 1 - config/rootfiles/packages/python-rssdler | 5 -- lfs/python-clientform | 82 --------------------- lfs/python-feedparser | 82 --------------------- lfs/python-mechanize | 82 --------------------- lfs/python-rssdler | 82 --------------------- make.sh | 4 - 9 files changed, 342 deletions(-) delete mode 100644 config/rootfiles/packages/python-clientform delete mode 100644 config/rootfiles/packages/python-feedparser delete mode 100644 config/rootfiles/packages/python-mechanize delete mode 100644 config/rootfiles/packages/python-rssdler delete mode 100644 lfs/python-clientform delete mode 100644 lfs/python-feedparser delete mode 100644 lfs/python-mechanize delete mode 100644 lfs/python-rssdler diff --git a/config/rootfiles/packages/python-clientform b/config/rootfiles/packages/python-clientform deleted file mode 100644 index 85a0d03ea..000000000 --- a/config/rootfiles/packages/python-clientform +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.7/site-packages/ClientForm-0.2.9-py2.7.egg diff --git a/config/rootfiles/packages/python-feedparser b/config/rootfiles/packages/python-feedparser deleted file mode 100644 index 88dbf1fc3..000000000 --- a/config/rootfiles/packages/python-feedparser +++ /dev/null @@ -1,3 +0,0 @@ -#usr/lib/python2.7/site-packages/feedparser-4.1-py2.7.egg-info -#usr/lib/python2.7/site-packages/feedparser.py -usr/lib/python2.7/site-packages/feedparser.pyc diff --git a/config/rootfiles/packages/python-mechanize b/config/rootfiles/packages/python-mechanize deleted file mode 100644 index 5b5bf6a47..000000000 --- a/config/rootfiles/packages/python-mechanize +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.7/site-packages/mechanize-0.1.8-py2.7.egg diff --git a/config/rootfiles/packages/python-rssdler b/config/rootfiles/packages/python-rssdler deleted file mode 100644 index e5e3e3bdc..000000000 --- a/config/rootfiles/packages/python-rssdler +++ /dev/null @@ -1,5 +0,0 @@ -usr/bin/rssdler -#usr/lib/python2.7/site-packages/drv_libxml2.pyc -#usr/lib/python2.7/site-packages/rssdler-0.4.0-py2.7.egg-info -usr/lib/python2.7/site-packages/rssdler.py -#usr/lib/python2.7/site-packages/rssdler.pyc diff --git a/lfs/python-clientform b/lfs/python-clientform deleted file mode 100644 index 29804a969..000000000 --- a/lfs/python-clientform +++ /dev/null @@ -1,82 +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 = 0.2.9 - -THISAPP = ClientForm-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-clientform -PAK_VER = 2 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 21e68d52cc5939ab3345b97e09f0a25a - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/python-feedparser b/lfs/python-feedparser deleted file mode 100644 index e89018d0a..000000000 --- a/lfs/python-feedparser +++ /dev/null @@ -1,82 +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 = 4.1 - -THISAPP = feedparser-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-feedparser -PAK_VER = 2 - -DEPS = python-mechanize - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = a8fcb5fd0868e34271fc182d6ae03801 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/python-mechanize b/lfs/python-mechanize deleted file mode 100644 index 8a879bc1c..000000000 --- a/lfs/python-mechanize +++ /dev/null @@ -1,82 +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 = 0.1.8 - -THISAPP = mechanize-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-mechanize -PAK_VER = 2 - -DEPS = python-clientform - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 0a9edfcbb3b631fc75451909af78cf7a - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/python-rssdler b/lfs/python-rssdler deleted file mode 100644 index 2b73a2774..000000000 --- a/lfs/python-rssdler +++ /dev/null @@ -1,82 +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 = 0.4.0a - -THISAPP = rssdler-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/rssdler040 -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python-rssdler -PAK_VER = 2 - -DEPS = python-feedparser python-mechanize - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 367fa2770a689b0d64003f8c94213a80 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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 - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 25616cc4e..37c201c4e 100755 --- a/make.sh +++ b/make.sh @@ -1345,10 +1345,6 @@ buildipfire() { lfsmake2 Crypt-PasswdMD5 lfsmake2 Net-Telnet lfsmake2 python-setuptools - lfsmake2 python-clientform - lfsmake2 python-mechanize - lfsmake2 python-feedparser - lfsmake2 python-rssdler lfsmake2 python-inotify lfsmake2 python-docutils lfsmake2 python-daemon