Development February 2021

development@lists.ipfire.org

15 participants
89 discussions

[PATCH] elfutils: Update to 0.182
by Adolf Belka 03 Feb '21

03 Feb '21

- Update elfutils from 0.176 to 0.182 - Updated rootfile - From version 0.178 debuginfod client/server capability was added. Additional .configure options required to disable debuginfod and libdebuginfod - Changelog 2020-10-28 Mark Wielaard <mark(a)klomp.org> * configure.ac: Set version to 0.182. * NEWS: Add 0.182 section. 2020-10-28 Tom Tromey <tom(a)tromey.com> * .gitignore: Add /tests/leb128. 2020-10-01 Frank Ch. Eigler <fche(a)redhat.com> PR25461 * configure.ac: Add --enable-debuginfod-urls[=URLS] option. 2020-09-18 Mark Wielaard <mark(a)klomp.org> * configure.ac: Check availability of libzstd and zstd. 2020-09-08 Mark Wielaard <mark(a)klomp.org> * configure.ac: Set version to 0.181. * NEWS: Add 0.181 section. 2020-08-20 Dmitry V. Levin <ldv(a)altlinux.org> * configure.ac (--enable-libdebuginfod): AC_DEFINE ENABLE_LIBDEBUGINFOD. 2020-07-17 Mark Wielaard <mark(a)klomp.org> * configure.ac: Set -DBAD_FTS=1 also for CXXFLAGS. 2020-06-19 Mark Wielaard <mark(a)klomp.org> * Makefile.am (SUBDIRS): Always add debuginfod. * configure.ac (debuginfod): Split off... (libdebuginfod): ... this. Also add DUMME_DEBUGINFOD. 2020-06-15 Sergei Trofimovich <slyfox(a)gentoo.org> * configure.ac: Use READELF in build-id check. 2020-06-11 Mark Wielaard <mark(a)klomp.org> * configure.ac: Set version to 0.180. * NEWS: Add 0.180 section. * .gitignore: Update with new generated file. 2020-06-10 Mark Wielaard <mark(a)klomp.org> * configure.ac (MODVERSION): Remove. 2020-03-30 Mark Wielaard <mark(a)klomp.org> * configure.ac: Set version to 0.179. * NEWS: Add 0.179 section. 2020-03-25 Mark Wielaard <mark(a)klomp.org> * README: Update mailinglist subscription info. * CONTRIBUTING: Likewise. 2020-02-03 Frank Ch. Eigler <fche(a)redhat.com> * configure.ac: Tolerate CXX= for debuginfod configuration. 2019-12-11 Omar Sandoval <osandov(a)fb.com> * configure.ac: Apply -Werror after user-defined CFLAGS in -D_FORTIFY_SOURCE=2 check. 2019-12-06 Mark Wielaard <mark(a)klomp.org> * configure.ac: Add ac_cv_buildid check. 2019-11-26 Mark Wielaard <mark(a)klomp.org> * configure.ac: Set version to 0.178. NEWS: Add 0.178 section. 2019-11-26 Mark Wielaard <mark(a)klomp.org> * configure.ac: Add CXXFLAGS for gcov. 2019-10-28 Aaron Merey <amerey(a)redhat.com> * debuginfod/: New directory for debuginfod code. * Makefile.am (SUBDIRS): Recurse there. * configure.ac (--enable-debuginfod): New flag & checks. 2019-08-25 Jonathon Anderson <jma14(a)rice.edu> * configure.ac: Add new --enable-valgrind-annotations * configure.ac: Add new --with-valgrind (headers only) 2019-07-05 Omar Sandoval <osandov(a)fb.com> * configure.ac: Get rid of --enable-libebl-subdir. * Makefile.am (SUBDIRS): Reorder backends and libcpu before libebl to satisfy build dependencies. 2019-08-13 Mark Wielaard <mark(a)klomp.org> * configure.ac: Set version to 0.177. * NEWS: Mention elfclassify, readelf DW_AT_data_member_location and DW_AT_discr_list attribute changes, dwarf.h DW_AT_GNU additions, dwelf_elf_e_machine_string function, dwelf_elf_begin change and C-SKY backend support. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/elfutils | 46 +++++++----------------------- lfs/elfutils | 11 ++++--- 2 files changed, 17 insertions(+), 40 deletions(-) diff --git a/config/rootfiles/packages/elfutils b/config/rootfiles/packages/elfutils index e5b1124a5..05cb542ac 100644 --- a/config/rootfiles/packages/elfutils +++ b/config/rootfiles/packages/elfutils @@ -1,5 +1,6 @@ usr/bin/eu-addr2line usr/bin/eu-ar +usr/bin/eu-elfclassify usr/bin/eu-elfcmp usr/bin/eu-elfcompress usr/bin/eu-elflint @@ -22,52 +23,19 @@ usr/bin/eu-unstrip #usr/include/elfutils/libdw.h #usr/include/elfutils/libdwelf.h #usr/include/elfutils/libdwfl.h -#usr/include/elfutils/libebl.h #usr/include/elfutils/version.h #usr/include/gelf.h #usr/include/libelf.h #usr/include/nlist.h -usr/lib/elfutils -usr/lib/elfutils/libebl_aarch64-0.176.so -#usr/lib/elfutils/libebl_aarch64.so -usr/lib/elfutils/libebl_alpha-0.176.so -#usr/lib/elfutils/libebl_alpha.so -usr/lib/elfutils/libebl_arm-0.176.so -#usr/lib/elfutils/libebl_arm.so -usr/lib/elfutils/libebl_bpf-0.176.so -#usr/lib/elfutils/libebl_bpf.so -usr/lib/elfutils/libebl_i386-0.176.so -#usr/lib/elfutils/libebl_i386.so -usr/lib/elfutils/libebl_ia64-0.176.so -#usr/lib/elfutils/libebl_ia64.so -usr/lib/elfutils/libebl_m68k-0.176.so -#usr/lib/elfutils/libebl_m68k.so -usr/lib/elfutils/libebl_ppc-0.176.so -#usr/lib/elfutils/libebl_ppc.so -usr/lib/elfutils/libebl_ppc64-0.176.so -#usr/lib/elfutils/libebl_ppc64.so -usr/lib/elfutils/libebl_riscv-0.176.so -#usr/lib/elfutils/libebl_riscv.so -usr/lib/elfutils/libebl_s390-0.176.so -#usr/lib/elfutils/libebl_s390.so -usr/lib/elfutils/libebl_sh-0.176.so -#usr/lib/elfutils/libebl_sh.so -usr/lib/elfutils/libebl_sparc-0.176.so -#usr/lib/elfutils/libebl_sparc.so -usr/lib/elfutils/libebl_tilegx-0.176.so -#usr/lib/elfutils/libebl_tilegx.so -usr/lib/elfutils/libebl_x86_64-0.176.so -#usr/lib/elfutils/libebl_x86_64.so -usr/lib/libasm-0.176.so +usr/lib/libasm-0.182.so #usr/lib/libasm.a usr/lib/libasm.so usr/lib/libasm.so.1 -usr/lib/libdw-0.176.so +usr/lib/libdw-0.182.so #usr/lib/libdw.a usr/lib/libdw.so usr/lib/libdw.so.1 -#usr/lib/libebl.a -usr/lib/libelf-0.176.so +usr/lib/libelf-0.182.so #usr/lib/libelf.a usr/lib/libelf.so usr/lib/libelf.so.1 @@ -80,3 +48,9 @@ usr/lib/libelf.so.1 #usr/share/locale/ja/LC_MESSAGES/elfutils.mo #usr/share/locale/pl/LC_MESSAGES/elfutils.mo #usr/share/locale/uk/LC_MESSAGES/elfutils.mo +#usr/share/man/man1/eu-elfclassify.1 +#usr/share/man/man1/eu-readelf.1 +#usr/share/man/man3/elf_begin.3 +#usr/share/man/man3/elf_clone.3 +#usr/share/man/man3/elf_getdata.3 +#usr/share/man/man3/elf_update.3 \ No newline at end of file diff --git a/lfs/elfutils b/lfs/elfutils index 3170d9b1e..19311d7aa 100644 --- a/lfs/elfutils +++ b/lfs/elfutils @@ -24,7 +24,7 @@ include Config -VER = 0.176 +VER = 0.182 THISAPP = elfutils-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = elfutils -PAK_VER = 2 +PAK_VER = 3 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 077e4f49320cad82bf17a997068b1db9 +$(DL_FILE)_MD5 = ebd95e1858280095fd60d0f765d50fef install : $(TARGET) @@ -77,7 +77,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-debuginfod \ + --disable-libdebuginfod cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) -- 2.30.0

1 0

[PATCH] p7zip: Update to 17.03
by Adolf Belka 02 Feb '21

02 Feb '21

- Update p7zip from 16.02 (Jul 2016) to 17.03 (Dec 2020) - Version 16.02 was the last version by the previous dev team. A fork was created in May 2020 with version 17.01 - Rootfile updated - Changelog Version 17.03 ============= - add zstd to zip - add hash algorithm - XXHASH32 - XXHASH64 - MD2 - MD4 - MD5 - sha384 - sha512 - add Lzfse to dmg - add lz5 to 7z - add lizard to 7z - update lz4 to v1.9.3 - add brotli to 7z - update cmake build - fix xz crc64 error - use system local to select OEM code - add rpm install - fix lzma2 and flzma22 call the same algorithm - add 7zr build - fix tar format link file compress and decompress Version 17.02 ============= - p7zip 17.02 is more like 7zip 17.01(only 7za and 7z),The difference from 7zip 17.01 and older version p7zip is the following description - Supports Fast lzma2 1.0.1 compression method - Update Zstd method to 1.4.5 - Add zstd method parameters in 7z format ZSTD parameters NEW name: strategy -> strat fast -> fast long -> long WindowLog -> wlog HashLog -> hlog ChainLog -> clog SearchLog -> slog MinMatch -> slen TargetLen -> tlen OverlapLog -> ovlog LdmHashLog -> ldmhlog LdmSearchLength -> ldmslen LdmBucketSizeLog -> ldmblog LdmHashRateLog -> ldmhevery - Fix symlink files contained inside tar and squashfs as regular file - Add lz4 and Zstd decompress method to squashfs Version 17.01 ============= - Fix BUG CVE-2018-10115 - Fix BUG CVE-2018-5996 - Fix BUG CVE-2017-17969 - Fix BUG CVE-2016-9296 - The bug fixes in version 17.01 address the same CVE bugs as the p7zip-16.02-consolidated_fixes-1.patch Therefore this patch is no longer needed - The patches for CVE-2016-2334 & 2335 were for versions before 16.00 so are no longer needed Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/7zip | 201 ++++---- lfs/7zip | 15 +- .../p7zip-16.02-consolidated_fixes-1.patch | 466 ------------------ src/patches/p7zip/CVE-2016-2334.patch | 24 - src/patches/p7zip/CVE-2016-2335.patch | 17 - 5 files changed, 109 insertions(+), 614 deletions(-) delete mode 100644 src/patches/p7zip-16.02-consolidated_fixes-1.patch delete mode 100644 src/patches/p7zip/CVE-2016-2334.patch delete mode 100644 src/patches/p7zip/CVE-2016-2335.patch diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip index f56e95c8c..a5d5ed607 100644 --- a/config/rootfiles/packages/7zip +++ b/config/rootfiles/packages/7zip @@ -9,102 +9,105 @@ usr/lib/p7zip/7za usr/lib/p7zip/7zr usr/lib/p7zip/Codecs usr/lib/p7zip/Codecs/Rar.so -#usr/share/doc/p7zip-16.02 -#usr/share/doc/p7zip-16.02/ChangeLog -#usr/share/doc/p7zip-16.02/DOC -#usr/share/doc/p7zip-16.02/DOC/7zC.txt -#usr/share/doc/p7zip-16.02/DOC/7zFormat.txt -#usr/share/doc/p7zip-16.02/DOC/License.txt -#usr/share/doc/p7zip-16.02/DOC/MANUAL -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/add.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/bench.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/delete.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/extract.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/extract_full.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/hash.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/index.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/list.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/rename.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/style.css -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/test.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/update.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/exit_codes.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/index.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/style.css -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/ar_exclude.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/ar_include.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/ar_no.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/bb.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/bs.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/charset.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/exclude.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/include.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/index.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/large_pages.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/list_tech.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/method.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/output_dir.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/overwrite.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/password.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/recurse.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sa.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/scc.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/scrc.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sdel.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sfx.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/shared.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sni.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sns.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/spf.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/ssc.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stdin.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stdout.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stl.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stop_switch.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stx.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/style.css -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/type.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/update.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/volume.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/working_dir.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/yes.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/syntax.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/about.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/benchmark.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/index.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/menu.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/options.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip/add.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip/extract.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip/index.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip/style.css -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/index.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/style.css -#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/style.css -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/7z.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/faq.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/formats.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/index.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/license.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/performance.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/style.css -#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/thanks.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/start.htm -#usr/share/doc/p7zip-16.02/DOC/MANUAL/style.css -#usr/share/doc/p7zip-16.02/DOC/Methods.txt -#usr/share/doc/p7zip-16.02/DOC/copying.txt -#usr/share/doc/p7zip-16.02/DOC/lzma.txt -#usr/share/doc/p7zip-16.02/DOC/readme.txt -#usr/share/doc/p7zip-16.02/DOC/src-history.txt -#usr/share/doc/p7zip-16.02/DOC/unRarLicense.txt -#usr/share/doc/p7zip-16.02/README -#usr/share/man/man1/7z.1 -#usr/share/man/man1/7za.1 -#usr/share/man/man1/7zr.1 +#usr/share/doc/p7zip-17.03 +#usr/share/doc/p7zip-17.03/ChangeLog +#usr/share/doc/p7zip-17.03/DOC +#usr/share/doc/p7zip-17.03/DOC/7zC.txt +#usr/share/doc/p7zip-17.03/DOC/7zFormat.txt +#usr/share/doc/p7zip-17.03/DOC/License.txt +#usr/share/doc/p7zip-17.03/DOC/MANUAL +#usr/share/doc/p7zip-17.03/DOC/MANUAL/7-zip.chm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/add.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/bench.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/delete.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/extract.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/extract_full.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/hash.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/index.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/list.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/rename.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/style.css +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/test.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/commands/update.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/exit_codes.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/index.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/style.css +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/ar_exclude.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/ar_include.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/ar_no.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/bb.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/bs.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/charset.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/exclude.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/include.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/index.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/large_pages.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/list_tech.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/method.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/output_dir.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/overwrite.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/password.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/recurse.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sa.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/scc.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/scrc.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sdel.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sfx.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/shared.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sni.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/sns.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/spf.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/ssc.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stdin.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stdout.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stl.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stop_switch.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/stx.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/style.css +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/type.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/update.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/volume.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/working_dir.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/switches/yes.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/cmdline/syntax.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/about.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/benchmark.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/index.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/menu.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/options.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip/add.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip/extract.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip/index.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/7-zip/style.css +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/index.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/plugins/style.css +#usr/share/doc/p7zip-17.03/DOC/MANUAL/fm/style.css +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/7z.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/faq.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/formats.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/index.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/license.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/performance.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/style.css +#usr/share/doc/p7zip-17.03/DOC/MANUAL/general/thanks.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/start.htm +#usr/share/doc/p7zip-17.03/DOC/MANUAL/style.css +#usr/share/doc/p7zip-17.03/DOC/Methods.txt +#usr/share/doc/p7zip-17.03/DOC/Struct.EAP +#usr/share/doc/p7zip-17.03/DOC/Struct.ldb +#usr/share/doc/p7zip-17.03/DOC/copying.txt +#usr/share/doc/p7zip-17.03/DOC/lzma.txt +#usr/share/doc/p7zip-17.03/DOC/readme.txt +#usr/share/doc/p7zip-17.03/DOC/src-history.txt +#usr/share/doc/p7zip-17.03/DOC/unRarLicense.txt +#usr/share/doc/p7zip-17.03/README +#usr/share/man/man1/7z.1.gz +#usr/share/man/man1/7za.1.gz +#usr/share/man/man1/7zr.1.gz \ No newline at end of file diff --git a/lfs/7zip b/lfs/7zip index 7f8ca29f4..b70ce491c 100644 --- a/lfs/7zip +++ b/lfs/7zip @@ -24,15 +24,15 @@ include Config -VER = 16.02 +VER = 17.03 -THISAPP = p7zip_$(VER) -DL_FILE = $(THISAPP)_src_all.tar.bz2 -DL_FROM = $(URL_IPFIRE) +THISAPP = p7zip-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = https://github.com/jinfeihan57/p7zip/archive/v$(VER)/ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = 7zip -PAK_VER = 7 +PAK_VER = 8 DEPS = @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a0128d661cfe7cc8c121e73519c54fbf +$(DL_FILE)_MD5 = fd7e6b082db89edfc047c1ce2d810850 install : $(TARGET) @@ -78,8 +78,7 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/p7zip-16.02-consolidated_fixes-1.patch + @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 diff --git a/src/patches/p7zip-16.02-consolidated_fixes-1.patch b/src/patches/p7zip-16.02-consolidated_fixes-1.patch deleted file mode 100644 index 3f6da9cde..000000000 --- a/src/patches/p7zip-16.02-consolidated_fixes-1.patch +++ /dev/null @@ -1,466 +0,0 @@ -Submitted By: Bruce Dubbs <bdubbs(a)linuxfromscratch.org> -Date: 2020-05-12 -Initial Package Version: 16.02 -Upstream Status: Unknown. -Origin: Arch and Fedora -Description: Updates for CVE-2016-9296, CVE-2017-17969, CVE-2018-5996, - CVE-2018-10115 and GCC10. - -diff -Naur p7zip_16.02.orig/CPP/7zip/Archive/7z/7zIn.cpp p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp ---- p7zip_16.02.orig/CPP/7zip/Archive/7z/7zIn.cpp 2016-05-20 03:20:03.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp 2020-05-12 15:34:34.513287566 -0500 -@@ -1097,7 +1097,8 @@ - if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i]) - ThrowIncorrect(); - } -- HeadersSize += folders.PackPositions[folders.NumPackStreams]; -+ if (folders.PackPositions) -+ HeadersSize += folders.PackPositions[folders.NumPackStreams]; - return S_OK; - } - -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.cpp ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.cpp 2015-09-01 13:04:52.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.cpp 2020-05-12 15:35:00.897548643 -0500 -@@ -29,7 +29,7 @@ - }; - */ - --CDecoder::CDecoder(): m_IsSolid(false) { } -+CDecoder::CDecoder(): _isSolid(false), _solidAllowed(false), _errorMode(false) { } - - void CDecoder::InitStructures() - { -@@ -345,7 +345,7 @@ - - void CDecoder::InitData() - { -- if (!m_IsSolid) -+ if (!_isSolid) - { - AvrPlcB = AvrLn1 = AvrLn2 = AvrLn3 = NumHuf = Buf60 = 0; - AvrPlc = 0x3500; -@@ -391,6 +391,11 @@ - if (inSize == NULL || outSize == NULL) - return E_INVALIDARG; - -+ if (_isSolid && !_solidAllowed) -+ return S_FALSE; -+ -+ _solidAllowed = false; -+ - if (!m_OutWindowStream.Create(kHistorySize)) - return E_OUTOFMEMORY; - if (!m_InBitStream.Create(1 << 20)) -@@ -398,17 +403,22 @@ - - m_UnpackSize = (Int64)*outSize; - m_OutWindowStream.SetStream(outStream); -- m_OutWindowStream.Init(m_IsSolid); -+ m_OutWindowStream.Init(_isSolid); - m_InBitStream.SetStream(inStream); - m_InBitStream.Init(); - - // CCoderReleaser coderReleaser(this); - InitData(); -- if (!m_IsSolid) -+ if (!_isSolid) - { -+ _errorMode = false; - InitStructures(); - InitHuff(); - } -+ -+ if (_errorMode) -+ return S_FALSE; -+ - if (m_UnpackSize > 0) - { - GetFlagsBuf(); -@@ -470,6 +480,7 @@ - } - if (m_UnpackSize < 0) - return S_FALSE; -+ _solidAllowed = true; - return m_OutWindowStream.Flush(); - } - -@@ -477,16 +488,16 @@ - const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress) - { - try { return CodeReal(inStream, outStream, inSize, outSize, progress); } -- catch(const CInBufferException &e) { return e.ErrorCode; } -- catch(const CLzOutWindowException &e) { return e.ErrorCode; } -- catch(...) { return S_FALSE; } -+ catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; } -+ catch(const CLzOutWindowException &e) { _errorMode = true; return e.ErrorCode; } -+ catch(...) { _errorMode = true; return S_FALSE; } - } - - STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size) - { - if (size < 1) - return E_INVALIDARG; -- m_IsSolid = ((data[0] & 1) != 0); -+ _isSolid = ((data[0] & 1) != 0); - return S_OK; - } - -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.h p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.h ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar1Decoder.h 2014-12-21 06:44:00.000000000 -0600 -+++ p7zip_16.02/CPP/7zip/Compress/Rar1Decoder.h 2020-05-12 15:35:00.897548643 -0500 -@@ -38,7 +38,9 @@ - UInt32 LastLength; - - Int64 m_UnpackSize; -- bool m_IsSolid; -+ bool _isSolid; -+ bool _solidAllowed; -+ bool _errorMode; - - UInt32 ReadBits(int numBits); - HRESULT CopyBlock(UInt32 distance, UInt32 len); -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.cpp ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.cpp 2015-10-03 03:49:14.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.cpp 2020-05-12 15:35:00.897548643 -0500 -@@ -80,7 +80,9 @@ - static const UInt32 kWindowReservSize = (1 << 22) + 256; - - CDecoder::CDecoder(): -- m_IsSolid(false) -+ _isSolid(false), -+ _solidAllowed(false), -+ m_TablesOK(false) - { - } - -@@ -100,6 +102,8 @@ - - bool CDecoder::ReadTables(void) - { -+ m_TablesOK = false; -+ - Byte levelLevels[kLevelTableSize]; - Byte newLevels[kMaxTableSize]; - m_AudioMode = (ReadBits(1) == 1); -@@ -170,6 +174,8 @@ - } - - memcpy(m_LastLevels, newLevels, kMaxTableSize); -+ m_TablesOK = true; -+ - return true; - } - -@@ -315,6 +321,10 @@ - if (inSize == NULL || outSize == NULL) - return E_INVALIDARG; - -+ if (_isSolid && !_solidAllowed) -+ return S_FALSE; -+ _solidAllowed = false; -+ - if (!m_OutWindowStream.Create(kHistorySize)) - return E_OUTOFMEMORY; - if (!m_InBitStream.Create(1 << 20)) -@@ -325,12 +335,12 @@ - UInt64 pos = 0, unPackSize = *outSize; - - m_OutWindowStream.SetStream(outStream); -- m_OutWindowStream.Init(m_IsSolid); -+ m_OutWindowStream.Init(_isSolid); - m_InBitStream.SetStream(inStream); - m_InBitStream.Init(); - - // CCoderReleaser coderReleaser(this); -- if (!m_IsSolid) -+ if (!_isSolid) - { - InitStructures(); - if (unPackSize == 0) -@@ -338,12 +348,16 @@ - if (m_InBitStream.GetProcessedSize() + 2 <= m_PackSize) // test it: probably incorrect; - if (!ReadTables()) - return S_FALSE; -+ _solidAllowed = true; - return S_OK; - } - if (!ReadTables()) - return S_FALSE; - } - -+ if (!m_TablesOK) -+ return S_FALSE; -+ - UInt64 startPos = m_OutWindowStream.GetProcessedSize(); - while (pos < unPackSize) - { -@@ -378,6 +392,9 @@ - - if (!ReadLastTables()) - return S_FALSE; -+ -+ _solidAllowed = true; -+ - return m_OutWindowStream.Flush(); - } - -@@ -394,7 +411,7 @@ - { - if (size < 1) - return E_INVALIDARG; -- m_IsSolid = ((data[0] & 1) != 0); -+ _isSolid = ((data[0] & 1) != 0); - return S_OK; - } - -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.h p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.h ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar2Decoder.h 2015-06-19 05:52:06.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/Rar2Decoder.h 2020-05-12 15:35:00.898548653 -0500 -@@ -138,7 +138,9 @@ - Byte m_LastLevels[kMaxTableSize]; - - UInt64 m_PackSize; -- bool m_IsSolid; -+ bool _isSolid; -+ bool _solidAllowed; -+ bool m_TablesOK; - - void InitStructures(); - UInt32 ReadBits(unsigned numBits); -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.cpp ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.cpp 2016-05-20 03:20:03.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.cpp 2020-05-12 15:35:00.898548653 -0500 -@@ -92,7 +92,9 @@ - _writtenFileSize(0), - _vmData(0), - _vmCode(0), -- m_IsSolid(false) -+ _isSolid(false), -+ _solidAllowed(false), -+ _errorMode(false) - { - Ppmd7_Construct(&_ppmd); - } -@@ -545,6 +547,9 @@ - return InitPPM(); - } - -+ TablesRead = false; -+ TablesOK = false; -+ - _lzMode = true; - PrevAlignBits = 0; - PrevAlignCount = 0; -@@ -606,6 +611,9 @@ - } - } - } -+ if (InputEofError()) -+ return S_FALSE; -+ - TablesRead = true; - - // original code has check here: -@@ -623,6 +631,9 @@ - RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize])); - - memcpy(m_LastLevels, newLevels, kTablesSizesSum); -+ -+ TablesOK = true; -+ - return S_OK; - } - -@@ -811,7 +822,7 @@ - { - _writtenFileSize = 0; - _unsupportedFilter = false; -- if (!m_IsSolid) -+ if (!_isSolid) - { - _lzSize = 0; - _winPos = 0; -@@ -824,13 +835,21 @@ - PpmEscChar = 2; - PpmError = true; - InitFilters(); -+ _errorMode = false; - } -- if (!m_IsSolid || !TablesRead) -+ -+ if (_errorMode) -+ return S_FALSE; -+ -+ if (!_isSolid || !TablesRead) - { - bool keepDecompressing; - RINOK(ReadTables(keepDecompressing)); - if (!keepDecompressing) -+ { -+ _solidAllowed = true; - return S_OK; -+ } - } - - for (;;) -@@ -838,6 +857,8 @@ - bool keepDecompressing; - if (_lzMode) - { -+ if (!TablesOK) -+ return S_FALSE; - RINOK(DecodeLZ(keepDecompressing)) - } - else -@@ -853,6 +874,9 @@ - if (!keepDecompressing) - break; - } -+ -+ _solidAllowed = true; -+ - RINOK(WriteBuf()); - UInt64 packSize = m_InBitStream.BitDecoder.GetProcessedSize(); - RINOK(progress->SetRatioInfo(&packSize, &_writtenFileSize)); -@@ -873,6 +897,10 @@ - if (!inSize) - return E_INVALIDARG; - -+ if (_isSolid && !_solidAllowed) -+ return S_FALSE; -+ _solidAllowed = false; -+ - if (!_vmData) - { - _vmData = (Byte *)::MidAlloc(kVmDataSizeMax + kVmCodeSizeMax); -@@ -901,8 +929,8 @@ - _unpackSize = outSize ? *outSize : (UInt64)(Int64)-1; - return CodeReal(progress); - } -- catch(const CInBufferException &e) { return e.ErrorCode; } -- catch(...) { return S_FALSE; } -+ catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; } -+ catch(...) { _errorMode = true; return S_FALSE; } - // CNewException is possible here. But probably CNewException is caused - // by error in data stream. - } -@@ -911,7 +939,7 @@ - { - if (size < 1) - return E_INVALIDARG; -- m_IsSolid = ((data[0] & 1) != 0); -+ _isSolid = ((data[0] & 1) != 0); - return S_OK; - } - -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.h p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.h ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar3Decoder.h 2015-10-03 03:49:12.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/Rar3Decoder.h 2020-05-12 15:35:00.898548653 -0500 -@@ -191,7 +191,9 @@ - CRecordVector<CTempFilter *> _tempFilters; - UInt32 _lastFilter; - -- bool m_IsSolid; -+ bool _isSolid; -+ bool _solidAllowed; -+ bool _errorMode; - - bool _lzMode; - bool _unsupportedFilter; -@@ -200,6 +202,7 @@ - UInt32 PrevAlignCount; - - bool TablesRead; -+ bool TablesOK; - - CPpmd7 _ppmd; - int PpmEscChar; -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.cpp p7zip_16.02/CPP/7zip/Compress/Rar5Decoder.cpp ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.cpp 2016-05-20 03:20:04.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/Rar5Decoder.cpp 2020-05-12 15:35:00.899548663 -0500 -@@ -72,6 +72,7 @@ - _writtenFileSize(0), - _dictSizeLog(0), - _isSolid(false), -+ _solidAllowed(false), - _wasInit(false), - _inputBuf(NULL) - { -@@ -801,7 +802,10 @@ - */ - - if (res == S_OK) -+ { -+ _solidAllowed = true; - res = res2; -+ } - - if (res == S_OK && _unpackSize_Defined && _writtenFileSize != _unpackSize) - return S_FALSE; -@@ -821,6 +825,10 @@ - { - try - { -+ if (_isSolid && !_solidAllowed) -+ return S_FALSE; -+ _solidAllowed = false; -+ - if (_dictSizeLog >= sizeof(size_t) * 8) - return E_NOTIMPL; - -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.h p7zip_16.02/CPP/7zip/Compress/Rar5Decoder.h ---- p7zip_16.02.orig/CPP/7zip/Compress/Rar5Decoder.h 2015-09-01 13:04:50.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/Rar5Decoder.h 2020-05-12 15:35:00.899548663 -0500 -@@ -271,6 +271,7 @@ - Byte _dictSizeLog; - bool _tableWasFilled; - bool _isSolid; -+ bool _solidAllowed; - bool _wasInit; - - UInt32 _reps[kNumReps]; -diff -Naur p7zip_16.02.orig/CPP/7zip/Compress/ShrinkDecoder.cpp p7zip_16.02/CPP/7zip/Compress/ShrinkDecoder.cpp ---- p7zip_16.02.orig/CPP/7zip/Compress/ShrinkDecoder.cpp 2016-05-18 12:31:02.000000000 -0500 -+++ p7zip_16.02/CPP/7zip/Compress/ShrinkDecoder.cpp 2020-05-12 15:34:45.120392530 -0500 -@@ -121,7 +121,12 @@ - { - _stack[i++] = _suffixes[cur]; - cur = _parents[cur]; -+ if (cur >= kNumItems || i >= kNumItems) -+ break; - } -+ -+ if (cur >= kNumItems || i >= kNumItems) -+ break; - - _stack[i++] = (Byte)cur; - lastChar2 = (Byte)cur; -diff -Naur p7zip_16.02.orig/CPP/Windows/ErrorMsg.cpp p7zip_16.02/CPP/Windows/ErrorMsg.cpp ---- p7zip_16.02.orig/CPP/Windows/ErrorMsg.cpp 2015-01-18 12:20:28.000000000 -0600 -+++ p7zip_16.02/CPP/Windows/ErrorMsg.cpp 2020-05-12 15:37:52.688247586 -0500 -@@ -14,15 +14,15 @@ - AString msg; - - switch(errorCode) { -- case ERROR_NO_MORE_FILES : txt = "No more files"; break ; -- case E_NOTIMPL : txt = "E_NOTIMPL"; break ; -- case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; -- case E_ABORT : txt = "E_ABORT"; break ; -- case E_FAIL : txt = "E_FAIL"; break ; -- case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ; -- case E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ; -- case E_INVALIDARG : txt = "E_INVALIDARG"; break ; -- case ERROR_DIRECTORY : txt = "Error Directory"; break ; -+ case unsigned (ERROR_NO_MORE_FILES) : txt = "No more files"; break ; -+ case unsigned (E_NOTIMPL) : txt = "E_NOTIMPL"; break ; -+ case unsigned (E_NOINTERFACE) : txt = "E_NOINTERFACE"; break ; -+ case unsigned (E_ABORT) : txt = "E_ABORT"; break ; -+ case unsigned (E_FAIL) : txt = "E_FAIL"; break ; -+ case unsigned (STG_E_INVALIDFUNCTION) : txt = "STG_E_INVALIDFUNCTION"; break ; -+ case unsigned (E_OUTOFMEMORY) : txt = "E_OUTOFMEMORY"; break ; -+ case unsigned (E_INVALIDARG) : txt = "E_INVALIDARG"; break ; -+ case ERROR_DIRECTORY : txt = "Error Directory"; break ; - default: - txt = strerror(errorCode); - } diff --git a/src/patches/p7zip/CVE-2016-2334.patch b/src/patches/p7zip/CVE-2016-2334.patch deleted file mode 100644 index 1eb5163cb..000000000 --- a/src/patches/p7zip/CVE-2016-2334.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: p7zip_15.14.1/CPP/7zip/Archive/HfsHandler.cpp -=================================================================== ---- p7zip_15.14.1.orig/CPP/7zip/Archive/HfsHandler.cpp -+++ p7zip_15.14.1/CPP/7zip/Archive/HfsHandler.cpp -@@ -987,7 +987,9 @@ HRESULT CDatabase::LoadCatalog(const CFo - item.GroupID = Get32(r + 0x24); - item.AdminFlags = r[0x28]; - item.OwnerFlags = r[0x29]; -+ */ - item.FileMode = Get16(r + 0x2A); -+ /* - item.special.iNodeNum = Get16(r + 0x2C); // or .linkCount - item.FileType = Get32(r + 0x30); - item.FileCreator = Get32(r + 0x34); -@@ -1572,6 +1574,9 @@ HRESULT CHandler::ExtractZlibFile( - - UInt32 size = GetUi32(tableBuf + i * 8 + 4); - -+ if (size > buf.Size() || size > kCompressionBlockSize + 1) -+ return S_FALSE; -+ - RINOK(ReadStream_FALSE(inStream, buf, size)); - - if ((buf[0] & 0xF) == 0xF) diff --git a/src/patches/p7zip/CVE-2016-2335.patch b/src/patches/p7zip/CVE-2016-2335.patch deleted file mode 100644 index a00d6a386..000000000 --- a/src/patches/p7zip/CVE-2016-2335.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: p7zip_15.14.1/CPP/7zip/Archive/Udf/UdfIn.cpp -=================================================================== ---- p7zip_15.14.1.orig/CPP/7zip/Archive/Udf/UdfIn.cpp -+++ p7zip_15.14.1/CPP/7zip/Archive/Udf/UdfIn.cpp -@@ -389,7 +389,11 @@ HRESULT CInArchive::ReadFileItem(int vol - return S_FALSE; - CFile &file = Files.Back(); - const CLogVol &vol = LogVols[volIndex]; -- CPartition &partition = Partitions[vol.PartitionMaps[lad.Location.PartitionRef].PartitionIndex]; -+ unsigned partitionRef = lad.Location.PartitionRef; -+ -+ if (partitionRef >= vol.PartitionMaps.Size()) -+ return S_FALSE; -+ CPartition &partition = Partitions[vol.PartitionMaps[partitionRef].PartitionIndex]; - - UInt32 key = lad.Location.Pos; - UInt32 value; -- 2.30.0

1 0

[PATCH] acl: Update to 2.2.53
by Adolf Belka 02 Feb '21

02 Feb '21

- Update acl from 2.2.52 (May 2013) to 2.2.53 (Jun 2018 - latest version) - Rootfile updated - No make rules for install-lib or install-dev in new version. Only for install - Changelog in tarball has 2.2.49 (Nov 2009) as the latest change - Could not find changelog info anywhere else. - Following changelog created by extracting from git commits (thanks for idea Peter Mueller) - include: fix uninstall for `make distcheck` Mike Frysinger - acl.5 man page: Update link to POSIX.1e draft Andreas Gruenbacher - test: add regression test Dmitry V. Levin - Enable large-file support on systems that do not enable it by default Dmitry V. Levin - libacl: Fix acl_from_text() returning NULL on all input Dmitry V. Levin - setfacl --restore: Silence valgrind Andreas Gruenbacher - setfacl: Preserve special mode bits on filesystems without POSIX ACL support Andreas Gruenbacher - setfacl.1: document the meaning of '-' in perms Kamil Dudka - setfacl: Allow more than four characters in the perms field Andreas Gruenbacher - permissions.test: Fix umask Andreas Gruenbacher - Add additional group names for root-specific tests Andreas Gruenbacher - libtestlookup: Add missing EXPORT and static declarations Andreas Gruenbacher - Minor man-page clarifications Andreas Gruenbacher - Remove ACL_ADD and ACL_DELETE Andreas Gruenbacher - test: fixups on SELinux machines for root testcases He Zhe - libacl: Ignore warning in parse_acl_entry() Andreas Gruenbacher - Cleanup visibility of API functions Yury Usishchev - Cleanup internal headers usage Yury Usishchev - Rework config.h usage Yury Usishchev - walk_tree_rec: Add parentheses to clarify code Andreas Gruenbacher - __acl_from_xattr: Set errno for invalid tag types Andreas Gruenbacher - Fix checks for valid permissions in input Corinna Vinschen - use portable AC_C_BIGENDIAN Mike Frysinger - quote: escape literal backslashes Jeff Mahoney - test: Add helper library to fake passwd/group files Jeff Mahoney - ignore configure.lineno Mike Frysinger - walk_tree: mark internal variables as static Dmitry V. Levin - Do not export symbols that are not supposed to be exported Dmitry V. Levin - getfacl: Fix minor resource leak Andreas Gruenbacher - setfacl man page: Minor wording improvements Andreas Gruenbacher - Fix the display block nesting in acl.5 Andreas Gruenbacher - getfacl: Fix memory leak Andreas Gruenbacher - fix compilation with latest xattr git Brice De Bruyne - libacl: acl_set_file: Remove unnecesary racy check Andreas Gruenbacher - cp.test: Check permissions of the right file Andreas Gruenbacher - add __acl_ prefixes to internal symbols Mike Frysinger - mark libmisc funcs as hidden so they are not exported Mike Frysinger - telldir return value and seekdir second parameters are of type long Cristian Rodríguez - read_acl_{comments,seq}: switch to next_line Mike Frysinger - read_acl_{comments,seq}: rename "line" to "lineno" Mike Frysinger - build: ship a pkgconfig file for libacl Mike Frysinger - build: make use of an aux-dir to stow away helper scripts Mike Frysinger - build: drop aclincludedir, use pkgincludedir Mike Frysinger - po: regenerate files after move Mike Frysinger - modernize build system Mike Frysinger - test: make running parallel/out-of-tree safe Mike Frysinger - move gettext logic into misc.h Mike Frysinger - punt debian/rpm packaging logic Mike Frysinger - libacl: fix SIGSEGV of getfacl -e on overly long group name Kamil Dudka - libacl: Make sure that acl_from_text() always sets errno when it fails Andreas Gruenbacher - Use autoreconf rather than autoconf to regenerate the files. Fabrice Bauzac - .gitignore: ignore *~ and config.h.in. Fabrice Bauzac - Bad markup in acl.5 page Eric S. Raymond - Makefile: rename configure.in to configure.ac Mike Frysinger - test: fix insufficient quoting of '\' Kamil Dudka - setfacl.1: fix typo 'inclu de' -> 'include' John Bradshaw - Install the libraries to the appropriate directory Brandon Philips Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/acl | 14 +++++++++++--- lfs/acl | 12 +++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/config/rootfiles/common/acl b/config/rootfiles/common/acl index a217714aa..19ce21ca0 100644 --- a/config/rootfiles/common/acl +++ b/config/rootfiles/common/acl @@ -7,14 +7,22 @@ usr/bin/setfacl #usr/lib/libacl.la usr/lib/libacl.so usr/lib/libacl.so.1 -usr/lib/libacl.so.1.1.0 +usr/lib/libacl.so.1.1.2253 +#usr/lib/pkgconfig/libacl.pc #usr/share/doc/acl -#usr/share/doc/acl/CHANGES.gz +#usr/share/doc/acl/CHANGES #usr/share/doc/acl/COPYING #usr/share/doc/acl/COPYING.LGPL #usr/share/doc/acl/PORTING -#usr/share/doc/acl/README +#usr/share/doc/acl/extensions.txt +#usr/share/doc/acl/libacl.txt #usr/share/locale/de/LC_MESSAGES/acl.mo +#usr/share/locale/en@boldquot +#usr/share/locale/en@boldquot/LC_MESSAGES +#usr/share/locale/en(a)boldquot/LC_MESSAGES/acl.mo +#usr/share/locale/en@quot +#usr/share/locale/en@quot/LC_MESSAGES +#usr/share/locale/en(a)quot/LC_MESSAGES/acl.mo #usr/share/locale/es/LC_MESSAGES/acl.mo #usr/share/locale/fr/LC_MESSAGES/acl.mo #usr/share/locale/gl/LC_MESSAGES/acl.mo diff --git a/lfs/acl b/lfs/acl index 2bfa818d2..5cf262ef9 100644 --- a/lfs/acl +++ b/lfs/acl @@ -24,13 +24,13 @@ include Config -VER = 2.2.52 +VER = 2.2.53 THISAPP = acl-$(VER) -DL_FILE = $(THISAPP).src.tar.gz +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/acl-2.2.52 -TARGET = $(DIR_INFO)/acl-2.2.52 +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### # Top-level Rules @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a61415312426e9c2212bd7dc7929abda +$(DL_FILE)_MD5 = 007aabf1dbb550bcddde52a244cd1070 install : $(TARGET) @@ -73,8 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib --disable-static cd $(DIR_APP) && make cd $(DIR_APP) && make install - cd $(DIR_APP) && make install-lib - cd $(DIR_APP) && make install-dev chmod -v 755 /usr/lib/libacl.so @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.30.0

1 0

Problem with updating ddrescue addon
by Adolf Belka 02 Feb '21

02 Feb '21

Hallo all, I saw that ddrescue addon was a version from 2010 so I thought it was about time to be updated. However since 2013 gnu has only been using lzip for the tarballs and stopped providing gzip versions. IPFire does not have lzip available at the moment. The options seem to me to be:- - remove ddrescue from the addon list - leave ddrescue at the 2010 version - v1.12 - update ddrescue to the last .gz tarball version in 2012 - v1.16 - build lzip into the IPFire build system and update to latest ddrescue version from March 2020 - v1.25 should it go into the toolchain where the other compression packages seem to be (how to do that?) should it go into the build part of IPFire Looking through the changelog from v1.13 to 1.25 there are a lot of new options added but also some changes to the code itself that look to be fixing problems. I can't easily see how important these are. No changes have been marked as critical bug fixes or even marked as a bug fix. My view would be to update to the latest version or remove ddrescue from the addons, as 11 years old seems a long time in computing terms. I am open to taking any guidance on the best approach for this. Regards, Adolf.

2 3

Access to IPFire pages
by Bernhard Bitsch 02 Feb '21

02 Feb '21

Hi, at the moment I can't access people.ipfire.org, blog.ipfire.ord, wiki.ipfire.org. Is there a problem? -Bernhard

3 2

[PATCH] lynis: update to 3.0.3
by Peter Müller 01 Feb '21

01 Feb '21

The changelog of lynis 3.0.3 is available at https://github.com/CISOfy/lynis/releases/tag/3.0.3; all changes since lynis 3.0.1 can be inspected at https://github.com/CISOfy/lynis/releases. lynis 3.0.2 adds detection for IPFire, so we can hope to have those "unknown operating system" messages omitted in future. :-) Minor adjustments to LFS and rootfile were necessary to purge unused CI/CD stuff as well as some markdown files (licence, code of conduct, etc. pp.) from the extracted archive. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/rootfiles/packages/lynis | 11 +++-------- lfs/lynis | 14 +++++++------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/config/rootfiles/packages/lynis b/config/rootfiles/packages/lynis index a7ca0e3dd..4a9918b27 100644 --- a/config/rootfiles/packages/lynis +++ b/config/rootfiles/packages/lynis @@ -1,10 +1,4 @@ var/ipfire/lynis -#var/ipfire/lynis/CHANGELOG.md -#var/ipfire/lynis/CODE_OF_CONDUCT.md -#var/ipfire/lynis/CONTRIBUTING.md -#var/ipfire/lynis/CONTRIBUTORS.md -#var/ipfire/lynis/HAPPY_USERS.md -#var/ipfire/lynis/SECURITY.md #var/ipfire/lynis/db var/ipfire/lynis/db/fileperms.db var/ipfire/lynis/db/hints.db @@ -119,7 +113,8 @@ var/ipfire/lynis/include/tests_virtualization var/ipfire/lynis/include/tests_webservers var/ipfire/lynis/include/tool_tips var/ipfire/lynis/lynis -var/ipfire/lynis/lynis.8 #var/ipfire/lynis/plugins -var/ipfire/lynis/plugins/README +#var/ipfire/lynis/plugins/README var/ipfire/lynis/plugins/custom_plugin.template +var/ipfire/lynis/plugins/plugin_pam_phase1 +var/ipfire/lynis/plugins/plugin_systemd_phase1 diff --git a/lfs/lynis b/lfs/lynis index 7dc807781..1ae501603 100644 --- a/lfs/lynis +++ b/lfs/lynis @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -24,16 +24,16 @@ include Config -VER = 3.0.1 +VER = 3.0.3 THISAPP = lynis-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/lynis +DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = lynis -PAK_VER = 8 +PAK_VER = 9 DEPS = ############################################################################### @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ac984258e89b88c86e8c1c5395de8a15 +$(DL_FILE)_MD5 = d5c7cdbab15029449fe5ef4b59ee941d install : $(TARGET) @@ -77,7 +77,7 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && rm -rf {dev,CHANGELOG,README,INSTALL,TODO,FAQ,LICENSE} - cp -vrf $(DIR_APP) /var/ipfire/ + cd $(DIR_APP) && rm -rf .git* .travis.yml *.md FAQ INSTALL LICENCE lynis.8 README + cp -vrf $(DIR_APP) /var/ipfire/lynis @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.26.2

1 0

[PATCH] unbound.conf: do not set defaults again
by Peter Müller 01 Feb '21

01 Feb '21

These are meanwhile set by Unbound upstream as well, so there is no need to do things twice here. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/unbound/unbound.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config/unbound/unbound.conf b/config/unbound/unbound.conf index f78aaae8c..9d5e840dd 100644 --- a/config/unbound/unbound.conf +++ b/config/unbound/unbound.conf @@ -27,9 +27,6 @@ server: prefetch: yes prefetch-key: yes - # Randomise any cached responses - rrset-roundrobin: yes - # Privacy Options hide-identity: yes hide-version: yes @@ -47,9 +44,6 @@ server: # TLS tls-cert-bundle: /etc/ssl/certs/ca-bundle.crt - # EDNS Buffer Size (#12240) - edns-buffer-size: 1232 - # Harden against DNS cache poisoning unwanted-reply-threshold: 1000000 -- 2.26.2

1 0

For information - changed rootfiles found for linux and samba
by Adolf Belka 01 Feb '21

01 Feb '21

Hi all, I have been updating some packages and while doing that I am continuously seeing two messages about rootfile changes for packages I have not worked on. In all cases I have run a git pull before doing the builds. The messages are:- Checking Logfiles for new Files Changes in linux-4.14.212-ipfire check rootfile! Changes in samba-4.13.1 check rootfile! For Linux there is the following additional line in the logfile +lib/modules/4.14.212-ipfire/modules.builtin.alias.bin For Samba here is the following additional line in the logfile +var/ipfire/samba/samba-change-password Are these missing in the builds for these packages or do I have something wrong in my build setup Regards, Adolf.

3 3

Oh, my
by Paul Simmons 01 Feb '21

01 Feb '21

My goodness, my gracious, me oh my! The recent flurry of contributions on this list is inspiring! There was a HUGE sprint over the weekend. I'm challenged to find proper superlatives to express my admiration. Thank you, all of you, and please know that each of your contributions are appreciated. Sorry for my "noise" on the list, but the activity is phenomenal, noteworthy, and gratifying. Paul -- Hardware, n.: The parts of a computer system that can be kicked.

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development February 2021