- This package is p7zip, based on ther original 7zip that originally did not support Linux. The original p7zip was no longer being updated after around 2018. A forked version was found and used but then that stopped being updated after 2023. - The original 7zip has had fixes done to it to address CVE's that were found to be in very old code, that was likely present when the p7zip fork was carried out. - As discussed in the Feb IPFire dev conf call this patch is to remove 7zip as an addon from IPFire.
Signed-off-by: Adolf Belka <[email protected]> --- config/rootfiles/packages/7zip | 113 --------------------------------- lfs/7zip | 90 -------------------------- make.sh | 1 - 3 files changed, 204 deletions(-) delete mode 100644 config/rootfiles/packages/7zip delete mode 100644 lfs/7zip diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip deleted file mode 100644 index 25ed4254b..000000000 --- a/config/rootfiles/packages/7zip +++ /dev/null @@ -1,113 +0,0 @@ -usr/bin/7z -usr/bin/7za -usr/bin/7zr -usr/lib/p7zip -usr/lib/p7zip/7z -usr/lib/p7zip/7z.so -usr/lib/p7zip/7zCon.sfx -usr/lib/p7zip/7za -usr/lib/p7zip/7zr -usr/lib/p7zip/Codecs -usr/lib/p7zip/Codecs/Rar.so -#usr/share/doc/p7zip-17.05 -#usr/share/doc/p7zip-17.05/ChangeLog -#usr/share/doc/p7zip-17.05/DOC -#usr/share/doc/p7zip-17.05/DOC/7zC.txt -#usr/share/doc/p7zip-17.05/DOC/7zFormat.txt -#usr/share/doc/p7zip-17.05/DOC/License.txt -#usr/share/doc/p7zip-17.05/DOC/MANUAL -#usr/share/doc/p7zip-17.05/DOC/MANUAL/7-zip.chm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/add.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/bench.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/delete.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/extract.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/extract_full.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/hash.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/index.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/list.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/rename.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/style.css -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/test.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/commands/update.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/exit_codes.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/index.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/style.css -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/ar_exclude.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/ar_include.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/ar_no.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/bb.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/bs.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/charset.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/exclude.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/include.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/index.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/large_pages.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/list_tech.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/method.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/output_dir.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/overwrite.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/password.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/recurse.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/sa.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/scc.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/scrc.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/sdel.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/sfx.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/shared.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/sni.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/sns.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/spf.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/ssc.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/stdin.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/stdout.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/stl.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/stop_switch.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/stx.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/style.css -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/type.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/update.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/volume.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/working_dir.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/switches/yes.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/cmdline/syntax.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/about.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/benchmark.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/index.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/menu.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/options.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins/7-zip -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins/7-zip/add.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins/7-zip/extract.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins/7-zip/index.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins/7-zip/style.css -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins/index.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/plugins/style.css -#usr/share/doc/p7zip-17.05/DOC/MANUAL/fm/style.css -#usr/share/doc/p7zip-17.05/DOC/MANUAL/general -#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/7z.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/faq.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/formats.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/index.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/license.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/performance.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/style.css -#usr/share/doc/p7zip-17.05/DOC/MANUAL/general/thanks.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/start.htm -#usr/share/doc/p7zip-17.05/DOC/MANUAL/style.css -#usr/share/doc/p7zip-17.05/DOC/Methods.txt -#usr/share/doc/p7zip-17.05/DOC/Struct.EAP -#usr/share/doc/p7zip-17.05/DOC/Struct.ldb -#usr/share/doc/p7zip-17.05/DOC/copying.txt -#usr/share/doc/p7zip-17.05/DOC/lzma.txt -#usr/share/doc/p7zip-17.05/DOC/readme.txt -#usr/share/doc/p7zip-17.05/DOC/src-history.txt -#usr/share/doc/p7zip-17.05/DOC/unRarLicense.txt -#usr/share/doc/p7zip-17.05/README -#usr/share/man/man1/7z.1.gz -#usr/share/man/man1/7za.1.gz -#usr/share/man/man1/7zr.1.gz diff --git a/lfs/7zip b/lfs/7zip deleted file mode 100644 index 5f0fe335d..000000000 --- a/lfs/7zip +++ /dev/null @@ -1,90 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <[email protected]> # -# # -# 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 - -SUMMARY = 7-zip file compression program - -VER = 17.05 - -THISAPP = p7zip-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = 7zip -PAK_VER = 10 - -DEPS = - -SERVICES = - -CFLAGS += -fcommon - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 0bcba638d3acaf2aa270e02693ad4295dfcc6b388037bdb446e25f3f4e1cb34f1b05bbc9a845364ca770625c32b2d7f55f63f504ad8e0863fff4bf940ae1fddd - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -dist: - @$(PAK) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make all3 $(MAKETUNING) - cd $(DIR_APP) && make DEST_HOME=/usr DEST_MAN=/usr/share/man \ - DEST_SHARE_DOC=/usr/share/doc/p7zip-$(VER) install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 06f205fd9..4c24a38c3 100755 --- a/make.sh +++ b/make.sh @@ -1977,7 +1977,6 @@ build_system() { lfsmake2 fireperf lfsmake2 iperf lfsmake2 iperf3 - lfsmake2 7zip lfsmake2 lynis lfsmake2 sshfs lfsmake2 utfcpp -- 2.52.0
