From: Adolf Belka Date: Thu, 13 May 2021 11:43:31 +0000 (+0200) Subject: make.sh: Removal of four python2 modules X-Git-Tag: v2.25-core157~12^2~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a15db22f3b3bc3e9baca34ef7ba9244f5729b4c9;p=ipfire-2.x.git make.sh: Removal of four python2 modules - 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 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/packages/python-clientform b/config/rootfiles/packages/python-clientform deleted file mode 100644 index 85a0d03ea1..0000000000 --- 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 88dbf1fc35..0000000000 --- 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 5b5bf6a474..0000000000 --- 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 e5e3e3bdc6..0000000000 --- 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 29804a969d..0000000000 --- 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 e89018d0a9..0000000000 --- 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 8a879bc1c2..0000000000 --- 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 2b73a27749..0000000000 --- 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 25616cc4e4..37c201c4e0 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