summaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/fgallery-also-look-for-7z.patch37
-rw-r--r--gnu/packages/patches/fritzing-0.9.6-fix-types.patch80
-rw-r--r--gnu/packages/patches/glibc-2.29-supported-locales.patch33
-rw-r--r--gnu/packages/patches/glibc-2.31-hurd-clock_gettime_monotonic.patch84
-rw-r--r--gnu/packages/patches/glibc-CVE-2019-19126.patch22
-rw-r--r--gnu/packages/patches/glibc-CVE-2019-7309.patch76
-rw-r--r--gnu/packages/patches/glibc-CVE-2019-9169.patch22
-rw-r--r--gnu/packages/patches/glibc-locales-2.28.patch31
-rw-r--r--gnu/packages/patches/glibc-skip-c++.patch31
-rw-r--r--gnu/packages/patches/htslib-for-stringtie.patch26
-rw-r--r--gnu/packages/patches/p7zip-CVE-2016-9296.patch24
-rw-r--r--gnu/packages/patches/p7zip-CVE-2017-17969.patch35
-rw-r--r--gnu/packages/patches/p7zip-fix-build-with-gcc-11.patch49
-rw-r--r--gnu/packages/patches/p7zip-remove-unused-code.patch959
-rw-r--r--gnu/packages/patches/xlispstat-fix-compilation-with-modern-gcc.patch213
15 files changed, 330 insertions, 1392 deletions
diff --git a/gnu/packages/patches/fgallery-also-look-for-7z.patch b/gnu/packages/patches/fgallery-also-look-for-7z.patch
new file mode 100644
index 0000000000..207f77ab76
--- /dev/null
+++ b/gnu/packages/patches/fgallery-also-look-for-7z.patch
@@ -0,0 +1,37 @@
+Note: The 7zip package only provides the bin/7z, not bin/7zz or bin/7za.
+
+From 71148e6f8d98936064733eeeac7d42b4cddddd23 Mon Sep 17 00:00:00 2001
+From: "kestrelwx" <kestrel.w@proton.me>
+Date: Sat, 18 Oct 2025 14:56:04 +0300
+Subject: [PATCH] Also check for 7z in $PATH.
+To: wave++ "Yuri D'Elia" <wavexx@thregr.org>
+
+From: kestrel <kestrel.w@proton.me>
+
+---
+ fgallery | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/fgallery b/fgallery
+index 1bf90e5..1da2c82 100755
+--- a/fgallery
++++ b/fgallery
+@@ -444,12 +444,14 @@ if($facedet && system("facedetect -h >/dev/null 2>&1")) {
+ my $p7zipcmd;
+ if(!system("7zz -h >/dev/null 2>&1")) {
+ $p7zipcmd = "7zz";
++} elsif(!system("7z -h >/dev/null 2>&1")) {
++ $p7zipcmd = "7z";
+ } elsif(!system("7za -h >/dev/null 2>&1")) {
+ $p7zipcmd = "7za";
+ } else {
+ $p7zip = 0;
+ if(system("zip -h >/dev/null 2>&1")) {
+- fatal("cannot run \"zip\" (check if 7zz, 7za or zip is installed)");
++ fatal("cannot run \"zip\" (check if 7zz, 7za, 7z or zip is installed)");
+ }
+ }
+
+--
+2.51.0
+
diff --git a/gnu/packages/patches/fritzing-0.9.6-fix-types.patch b/gnu/packages/patches/fritzing-0.9.6-fix-types.patch
new file mode 100644
index 0000000000..4984f7e94b
--- /dev/null
+++ b/gnu/packages/patches/fritzing-0.9.6-fix-types.patch
@@ -0,0 +1,80 @@
+From d2f68e7d2f1c5b02e7236e1e4c35b1f37981500e Mon Sep 17 00:00:00 2001
+From: Jonathan Lin <jonathanylin1111@gmail.com>
+Date: Wed, 22 Oct 2025 11:48:46 -0700
+Subject: [PATCH] Fix quazip using wrong types
+
+---
+ src/lib/quazip/crypt.h | 8 ++++----
+ src/lib/quazip/unzip.c | 2 +-
+ src/lib/quazip/zip.c | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/lib/quazip/crypt.h b/src/lib/quazip/crypt.h
+index 2ae6fd5..d47260c 100644
+--- a/src/lib/quazip/crypt.h
++++ b/src/lib/quazip/crypt.h
+@@ -32,7 +32,7 @@
+ /***********************************************************************
+ * Return the next byte in the pseudo-random sequence
+ */
+-static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
++static int decrypt_byte(unsigned long* pkeys, const z_crc_t FAR * pcrc_32_tab)
+ {
+ #ifndef _WINDOWS
+ (void) pcrc_32_tab; /* avoid "unused parameter" warning */
+@@ -49,7 +49,7 @@ static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
+ /***********************************************************************
+ * Update the encryption keys with the next byte of plain text
+ */
+-static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
++static int update_keys(unsigned long* pkeys,const z_crc_t FAR * pcrc_32_tab,int c)
+ {
+ (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
+ (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
+@@ -66,7 +66,7 @@ static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int
+ * Initialize the encryption keys and the random header according to
+ * the given password.
+ */
+-static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)
++static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t FAR * pcrc_32_tab)
+ {
+ *(pkeys+0) = 305419896L;
+ *(pkeys+1) = 591751049L;
+@@ -96,7 +96,7 @@ const char *passwd; /* password string */
+ unsigned char *buf; /* where to write header */
+ int bufSize;
+ unsigned long* pkeys;
+-const unsigned long* pcrc_32_tab;
++const z_crc_t FAR * pcrc_32_tab;
+ unsigned long crcForCrypting;
+ {
+ int n; /* index in random header */
+diff --git a/src/lib/quazip/unzip.c b/src/lib/quazip/unzip.c
+index dde4c34..9526964 100644
+--- a/src/lib/quazip/unzip.c
++++ b/src/lib/quazip/unzip.c
+@@ -150,7 +150,7 @@ typedef struct
+ int encrypted;
+ # ifndef NOUNCRYPT
+ unsigned long keys[3]; /* keys defining the pseudo-random sequence */
+- const unsigned long* pcrc_32_tab;
++ const z_crc_t FAR * pcrc_32_tab;
+ # endif
+ } unz_s;
+
+diff --git a/src/lib/quazip/zip.c b/src/lib/quazip/zip.c
+index 99f29ce..eb640fe 100644
+--- a/src/lib/quazip/zip.c
++++ b/src/lib/quazip/zip.c
+@@ -134,7 +134,7 @@ typedef struct
+ int encrypt;
+ #ifndef NOCRYPT
+ unsigned long keys[3]; /* keys defining the pseudo-random sequence */
+- const unsigned long* pcrc_32_tab;
++ const z_crc_t FAR * pcrc_32_tab;
+ int crypt_header_size;
+ #endif
+ } curfile_info;
+--
+2.51.0
+
diff --git a/gnu/packages/patches/glibc-2.29-supported-locales.patch b/gnu/packages/patches/glibc-2.29-supported-locales.patch
deleted file mode 100644
index 05865dc7be..0000000000
--- a/gnu/packages/patches/glibc-2.29-supported-locales.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-This patch is taken from debian's glibc package (generate-supported.mk).
-It install the localedata/SUPPORTED file of the glibc. This file lists
-all the supported locales of the glibc.
-
-diff --git a/localedata/Makefile b/localedata/Makefile
-index 65079f9eb8..14818f84e0 100644
---- a/localedata/Makefile
-+++ b/localedata/Makefile
-@@ -169,7 +169,8 @@ endif
- # Files to install.
- install-others := $(addprefix $(inst_i18ndir)/, \
- $(addsuffix .gz, $(charmaps)) \
-- $(locales))
-+ $(locales)) \
-+ $(inst_i18ndir)/SUPPORTED
-
- tests: $(objdir)/iconvdata/gconv-modules
-
-@@ -380,6 +381,14 @@ endif
-
- include SUPPORTED
-
-+$(inst_i18ndir)/SUPPORTED: SUPPORTED $(+force)
-+ for locale in $(SUPPORTED-LOCALES); do \
-+ [ $$locale = true ] && continue; \
-+ echo $$locale | sed 's,/, ,' >> LOCALES; \
-+ done
-+ $(make-target-directory)
-+ $(INSTALL_DATA) LOCALES $@
-+
- INSTALL-SUPPORTED-LOCALE-ARCHIVE=$(addprefix install-archive-, $(SUPPORTED-LOCALES))
- INSTALL-SUPPORTED-LOCALE-FILES=$(addprefix install-files-, $(SUPPORTED-LOCALES))
- \ No newline at end of file
diff --git a/gnu/packages/patches/glibc-2.31-hurd-clock_gettime_monotonic.patch b/gnu/packages/patches/glibc-2.31-hurd-clock_gettime_monotonic.patch
deleted file mode 100644
index 1c3fe427f9..0000000000
--- a/gnu/packages/patches/glibc-2.31-hurd-clock_gettime_monotonic.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-This is needed to run Python on the Hurd, especially during the build of
-python-boot0.
-
-Adapted from https://salsa.debian.org/glibc-team/glibc/-/blob/glibc-2.31/debian/patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff
-
-Use the realtime clock for the monotonic clock. This is of course not a proper
-implementation (which is being done in Mach), but will permit to fix at least
-the iceweasel stack.
-
-vlc however doesn't build when _POSIX_CLOCK_SELECTION is enabled but
-_POSIX_TIMERS is not, and they refuse to fix that (see #765578), so disable the
-former.
-
-From 0aa1dfd580cf9ad7b812c307b128decb782b825f Mon Sep 17 00:00:00 2001
-From: Jan Nieuwenhuizen <janneke@gnu.org>
-Date: Mon, 2 Mar 2020 18:59:04 +0100
-Subject: [PATCH 2/2] Use realtime clock for the monotonic clock.
-
----
- sysdeps/mach/clock_gettime.c | 2 +-
- sysdeps/mach/hurd/bits/posix_opt.h | 6 +++---
- sysdeps/posix/clock_getres.c | 1 +
- sysdeps/pthread/timer_create.c | 2 +-
- 4 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/sysdeps/mach/clock_gettime.c b/sysdeps/mach/clock_gettime.c
-index ac3547df3c..af8681ba4e 100644
---- a/sysdeps/mach/clock_gettime.c
-+++ b/sysdeps/mach/clock_gettime.c
-@@ -25,7 +25,7 @@
- int
- __clock_gettime (clockid_t clock_id, struct timespec *ts)
- {
-- if (clock_id != CLOCK_REALTIME)
-+ if (clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_REALTIME)
- {
- errno = EINVAL;
- return -1;
-diff --git a/sysdeps/mach/hurd/bits/posix_opt.h b/sysdeps/mach/hurd/bits/posix_opt.h
-index 0050151332..27b3a28ab7 100644
---- a/sysdeps/mach/hurd/bits/posix_opt.h
-+++ b/sysdeps/mach/hurd/bits/posix_opt.h
-@@ -163,10 +163,10 @@
- #define _POSIX_THREAD_PROCESS_SHARED -1
-
- /* The monotonic clock might be available. */
--#define _POSIX_MONOTONIC_CLOCK 0
-+#define _POSIX_MONOTONIC_CLOCK 200809L
-
--/* The clock selection interfaces are available. */
--#define _POSIX_CLOCK_SELECTION 200809L
-+/* The clock selection interfaces are not really available yet. */
-+#define _POSIX_CLOCK_SELECTION -1
-
- /* Advisory information interfaces could be available in future. */
- #define _POSIX_ADVISORY_INFO 0
-diff --git a/sysdeps/posix/clock_getres.c b/sysdeps/posix/clock_getres.c
-index fcd79fd554..1dd02aa449 100644
---- a/sysdeps/posix/clock_getres.c
-+++ b/sysdeps/posix/clock_getres.c
-@@ -52,6 +52,7 @@ __clock_getres (clockid_t clock_id, struct timespec *res)
- switch (clock_id)
- {
- case CLOCK_REALTIME:
-+ case CLOCK_MONOTONIC:
- retval = realtime_getres (res);
- break;
-
-diff --git a/sysdeps/pthread/timer_create.c b/sysdeps/pthread/timer_create.c
-index 9d8a9ea8ae..3430582c09 100644
---- a/sysdeps/pthread/timer_create.c
-+++ b/sysdeps/pthread/timer_create.c
-@@ -48,7 +48,7 @@ timer_create (clockid_t clock_id, struct sigevent *evp, timer_t *timerid)
- return -1;
- }
-
-- if (clock_id != CLOCK_REALTIME)
-+ if (clock_id != CLOCK_REALTIME && clock_id != CLOCK_MONOTONIC)
- {
- __set_errno (EINVAL);
- return -1;
---
-2.24.0
-
diff --git a/gnu/packages/patches/glibc-CVE-2019-19126.patch b/gnu/packages/patches/glibc-CVE-2019-19126.patch
deleted file mode 100644
index 5b9ac58ab7..0000000000
--- a/gnu/packages/patches/glibc-CVE-2019-19126.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix CVE-2019-19126:
-
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19126
-https://sourceware.org/bugzilla/show_bug.cgi?id=25204
-
-Taken from upstream:
-https://sourceware.org/git/?p=glibc.git;a=commit;h=37c90e117310728a4ad1eb998c0bbe7d79c4a398
-
-diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
-index 975cbe2..df2cdfd 100644
---- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
-+++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
-@@ -31,7 +31,8 @@
- environment variable, LD_PREFER_MAP_32BIT_EXEC. */
- #define EXTRA_LD_ENVVARS \
- case 21: \
-- if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
-+ if (!__libc_enable_secure \
-+ && memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
- GLRO(dl_x86_cpu_features).feature[index_arch_Prefer_MAP_32BIT_EXEC] \
- |= bit_arch_Prefer_MAP_32BIT_EXEC; \
- break;
diff --git a/gnu/packages/patches/glibc-CVE-2019-7309.patch b/gnu/packages/patches/glibc-CVE-2019-7309.patch
deleted file mode 100644
index f9f623830a..0000000000
--- a/gnu/packages/patches/glibc-CVE-2019-7309.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Fix <https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-7309>.
-
-Taken from this upstream commit, sans ChangeLog updates and tests:
-<https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3f635fb43389b54f682fc9ed2acc0b2aaf4a923d>.
-
-diff --git a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S
-index 1fc487caa5..1322bb3b92 100644
---- a/sysdeps/x86_64/memcmp.S
-+++ b/sysdeps/x86_64/memcmp.S
-@@ -21,14 +21,18 @@
-
- .text
- ENTRY (memcmp)
-- test %rdx, %rdx
-+#ifdef __ILP32__
-+ /* Clear the upper 32 bits. */
-+ movl %edx, %edx
-+#endif
-+ test %RDX_LP, %RDX_LP
- jz L(finz)
- cmpq $1, %rdx
-- jle L(finr1b)
-+ jbe L(finr1b)
- subq %rdi, %rsi
- movq %rdx, %r10
- cmpq $32, %r10
-- jge L(gt32)
-+ jae L(gt32)
- /* Handle small chunks and last block of less than 32 bytes. */
- L(small):
- testq $1, %r10
-@@ -156,7 +160,7 @@ L(A32):
- movq %r11, %r10
- andq $-32, %r10
- cmpq %r10, %rdi
-- jge L(mt16)
-+ jae L(mt16)
- /* Pre-unroll to be ready for unrolled 64B loop. */
- testq $32, %rdi
- jz L(A64)
-@@ -178,7 +182,7 @@ L(A64):
- movq %r11, %r10
- andq $-64, %r10
- cmpq %r10, %rdi
-- jge L(mt32)
-+ jae L(mt32)
-
- L(A64main):
- movdqu (%rdi,%rsi), %xmm0
-@@ -216,7 +220,7 @@ L(mt32):
- movq %r11, %r10
- andq $-32, %r10
- cmpq %r10, %rdi
-- jge L(mt16)
-+ jae L(mt16)
-
- L(A32main):
- movdqu (%rdi,%rsi), %xmm0
-@@ -254,7 +258,7 @@ L(ATR):
- movq %r11, %r10
- andq $-32, %r10
- cmpq %r10, %rdi
-- jge L(mt16)
-+ jae L(mt16)
- testq $16, %rdi
- jz L(ATR32)
-
-@@ -325,7 +329,7 @@ L(ATR64main):
- movq %r11, %r10
- andq $-32, %r10
- cmpq %r10, %rdi
-- jge L(mt16)
-+ jae L(mt16)
-
- L(ATR32res):
- movdqa (%rdi,%rsi), %xmm0
diff --git a/gnu/packages/patches/glibc-CVE-2019-9169.patch b/gnu/packages/patches/glibc-CVE-2019-9169.patch
deleted file mode 100644
index 029b4ddbd7..0000000000
--- a/gnu/packages/patches/glibc-CVE-2019-9169.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix <https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-9169>.
-
-Taken from this upstream commit, sans ChangeLog updates:
-https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=583dd860d5b833037175247230a328f0050dbfe9
-
-diff --git a/posix/regexec.c b/posix/regexec.c
-index 91d5a797b8..084b1222d9 100644
---- a/posix/regexec.c
-+++ b/posix/regexec.c
-@@ -1293,8 +1293,10 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
- else if (naccepted)
- {
- char *buf = (char *) re_string_get_buffer (&mctx->input);
-- if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
-- naccepted) != 0)
-+ if (mctx->input.valid_len - *pidx < naccepted
-+ || (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
-+ naccepted)
-+ != 0))
- return -1;
- }
- }
diff --git a/gnu/packages/patches/glibc-locales-2.28.patch b/gnu/packages/patches/glibc-locales-2.28.patch
deleted file mode 100644
index 31ee6c1ff3..0000000000
--- a/gnu/packages/patches/glibc-locales-2.28.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-This patch allows us to use glibc's build system to build locales
-in a package separate from glibc.
-
- 1. Use 'localedef' from $PATH since we are not rebuilding it.
- 2. Use '--no-archive' to avoid building the big locale archive, and
- because the already-built 'localedef' would want to write it
- to '/run/current-system/locale', which is not possible.
- 3. Pass $(inst_complocaledir)/$$locale to install files in the right
- place, and because otherwise, 'localedef' fails with:
- "cannot write output files to `(null)'".
-
---- glibc-2.27/localedata/Makefile
-+++ glibc-2.27/localedata/Makefile
-@@ -199,7 +199,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES))
-
- # Sometimes the whole collection of locale files should be installed.
- LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
--$(rtld-prefix) $(common-objpfx)locale/localedef
-+ localedef --no-archive
- install-locales: $(INSTALL-SUPPORTED-LOCALES)
-
- install-locales-dir:
-@@ -224,7 +224,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
- input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
- $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \
- -i locales/$$input -f charmaps/$$charset \
-- $(addprefix --prefix=,$(install_root)) $$locale \
-+ $(addprefix --prefix=,$(install_root)) $(inst_complocaledir)/$$locale \
- && echo ' done'; \
-
- tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP
diff --git a/gnu/packages/patches/glibc-skip-c++.patch b/gnu/packages/patches/glibc-skip-c++.patch
deleted file mode 100644
index b2cbe76d3b..0000000000
--- a/gnu/packages/patches/glibc-skip-c++.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-When building, say, glibc 2.31 using a compiler that's itself linked
-against 2.33, linking fails with:
-
- gcc -Wl,-rpath-link=/tmp/guix-build-glibc-2.31.drv-0/build:/tmp/guix-build-glibc-2.31.drv-0/build/math:/tmp/guix-build-glibc-2.31.drv-0/build/elf:/tmp/guix-build-glibc-2.31.drv-0/build/dlfcn:/tmp/guix-build-glibc-2.31.drv-0/build/nss:/tmp/guix-build-glibc-2.31.drv-0/build/nis:/tmp/guix-build-glibc-2.31.drv-0/build/rt:/tmp/guix-build-glibc-2.31.drv-0/build/resolv:/tmp/guix-build-glibc-2.31.drv-0/build/mathvec:/tmp/guix-build-glibc-2.31.drv-0/build/support:/tmp/guix-build-glibc-2.31.drv-0/build/crypt:/tmp/guix-build-glibc-2.31.drv-0/build/nptl -nostdlib -nostartfiles -o /tmp/guix-build-glibc-2.31.drv-0/build/support/links-dso-program -Wl,-z,combreloc -Wl,-z,relro -Wl,--hash-style=both /tmp/guix-build-glibc-2.31.drv-0/build/csu/crt1.o /tmp/guix-build-glibc-2.31.drv-0/build/csu/crti.o `gcc --print-file-name=crtbegin.o` /tmp/guix-build-glibc-2.31.drv-0/build/support/links-dso-program.o -lstdc++ -lgcc -lgcc_s -Wl,-dynamic-linker=/gnu/store/...-glibc-2.31/lib/ld-linux-x86-64.so.2 /tmp/guix-build-glibc-2.31.drv-0/build/libc.so.6 /tmp/guix-build-glibc-2.31.drv-0/build/libc_nonshared.a -Wl,--as-needed /tmp/guix-build-glibc-2.31.drv-0/build/elf/ld.so -Wl,--no-as-needed -lgcc `gcc --print-file-name=crtend.o` /tmp/guix-build-glibc-2.31.drv-0/build/csu/crtn.o
- ld: /gnu/store/...-gcc-10.3.0-lib/lib/gcc/x86_64-unknown-linux-gnu/10.3.0/../../../libstdc++.so: undefined reference to `fstat64@GLIBC_2.33'
- ld: /gnu/store/...-gcc-10.3.0-lib/lib/gcc/x86_64-unknown-linux-gnu/10.3.0/../../../libstdc++.so: undefined reference to `lstat@GLIBC_2.33'
- ld: /gnu/store/...-gcc-10.3.0-lib/lib/gcc/x86_64-unknown-linux-gnu/10.3.0/../../../libstdc++.so: undefined reference to `stat@GLIBC_2.33'
- collect2: error: ld returned 1 exit status
-
-This is unsurprising given that libstdc++.so here is linked against 2.33,
-whereas libc.so.6 here is 2.31.
-
-This patch works around it by not building the offending program.
-
-diff --git a/support/Makefile b/support/Makefile
-index bb9889ef..6614943b 100644
---- a/support/Makefile
-+++ b/support/Makefile
-@@ -210,12 +210,7 @@ CFLAGS-support_paths.c = \
- # -fexcess-precision=standard.
- CFLAGS-timespec.c += -fexcess-precision=standard
-
--ifeq (,$(CXX))
- LINKS_DSO_PROGRAM = links-dso-program-c
--else
--LINKS_DSO_PROGRAM = links-dso-program
--LDLIBS-links-dso-program = -lstdc++ -lgcc -lgcc_s $(libunwind)
--endif
-
- ifeq (yes,$(have-selinux))
- LDLIBS-$(LINKS_DSO_PROGRAM) += -lselinux
diff --git a/gnu/packages/patches/htslib-for-stringtie.patch b/gnu/packages/patches/htslib-for-stringtie.patch
deleted file mode 100644
index 3e6cd5bb63..0000000000
--- a/gnu/packages/patches/htslib-for-stringtie.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-These changes are commits d7e357946ead219b81cc1becbe0de8a99d96ca84 and
-8ed0daa39bc662defa99507f926815431056543a in
-https://github.com/samtools/htscodecs. The stringtie package expects these
-changes to have been applied.
-
-diff -ru htslib-1.12/htscodecs/htscodecs/tokenise_name3.c stringtie-2.2.0/htslib/htscodecs/htscodecs/tokenise_name3.c
---- a/htscodecs/htscodecs/tokenise_name3.c 2021-02-22 13:07:06.000000000 +0100
-+++ b/htscodecs/htscodecs/tokenise_name3.c 2021-12-04 19:27:39.000000000 +0100
-@@ -211,7 +211,7 @@
- if (!ctx) return NULL;
- ctx->max_names = max_names;
- pthread_setspecific(tok_key, ctx);
-- } else if (ctx->max_names < max_names) {
-+ } else if (ctx->max_names < max_names+1) {
- ctx = realloc(ctx, sizeof(*ctx) + ++max_names*sizeof(*ctx->lc));
- if (!ctx) return NULL;
- ctx->max_names = max_names;
-@@ -1058,6 +1058,8 @@
- tok = decode_token_type(ctx, ntok);
- //fprintf(stderr, "Tok %d = %d\n", ntok, tok);
-
-+ ctx->lc[cnum].last_ntok = 0;
-+
- switch (tok) {
- case N_CHAR:
- if (len+1 >= name_len) return -1; \ No newline at end of file
diff --git a/gnu/packages/patches/p7zip-CVE-2016-9296.patch b/gnu/packages/patches/p7zip-CVE-2016-9296.patch
deleted file mode 100644
index 3fa80377ad..0000000000
--- a/gnu/packages/patches/p7zip-CVE-2016-9296.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Robert Luberda <robert@debian.org>
-Date: Sat, 19 Nov 2016 08:48:08 +0100
-Subject: Fix nullptr dereference (CVE-2016-9296)
-
-Patch taken from https://sourceforge.net/p/p7zip/bugs/185/
-This patch file taken from Debian's patch set for p7zip
----
- CPP/7zip/Archive/7z/7zIn.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CPP/7zip/Archive/7z/7zIn.cpp b/CPP/7zip/Archive/7z/7zIn.cpp
-index b0c6b98..7c6dde2 100644
---- a/CPP/7zip/Archive/7z/7zIn.cpp
-+++ b/CPP/7zip/Archive/7z/7zIn.cpp
-@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedStreams(
- 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 --git a/gnu/packages/patches/p7zip-CVE-2017-17969.patch b/gnu/packages/patches/p7zip-CVE-2017-17969.patch
deleted file mode 100644
index 51c24000e5..0000000000
--- a/gnu/packages/patches/p7zip-CVE-2017-17969.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix CVE-2017-17969:
-
-https://sourceforge.net/p/p7zip/bugs/204/
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-17969
-
-Patch copied from Debian.
-
-Subject: Heap-based buffer overflow in 7zip/Compress/ShrinkDecoder.cpp
-Origin: vendor, https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/27d7/attachment/CVE-2017-17969.patch
-Forwarded: https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/#27d7
-Bug: https://sourceforge.net/p/p7zip/bugs/204/
-Bug-Debian: https://bugs.debian.org/888297
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-17969
-Author: Antoine Beaupré <anarcat@debian.org>
-Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
-Last-Update: 2018-02-01
-Applied-Upstream: 18.00-beta
-
---- a/CPP/7zip/Compress/ShrinkDecoder.cpp
-+++ b/CPP/7zip/Compress/ShrinkDecoder.cpp
-@@ -121,8 +121,13 @@ HRESULT CDecoder::CodeReal(ISequentialIn
- {
- _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 --git a/gnu/packages/patches/p7zip-fix-build-with-gcc-11.patch b/gnu/packages/patches/p7zip-fix-build-with-gcc-11.patch
deleted file mode 100644
index 20a40488d8..0000000000
--- a/gnu/packages/patches/p7zip-fix-build-with-gcc-11.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Building p7zip with GCC 11 or newer normally fails with error messages like
-
- ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp:308:11: error: use of an
- operand of type ‘bool’ in ‘operator++’ is forbidden in C++17
- 308 | numMethods++;
- | ^~~~~~~~~~
-
-This patch causes GCC to interpret the code using the GNU dialect of the C++14
-standard, as GCC 10 did by default, and reduces these errors to warnings.
-
-diff --git a/makefile.linux_amd64_asm b/makefile.linux_amd64_asm
-index 075c6a8..b7d73ee 100644
---- a/makefile.linux_amd64_asm
-+++ b/makefile.linux_amd64_asm
-@@ -11,6 +11,8 @@ ALLFLAGS=-m64 ${OPTFLAGS} -pipe \
- -D_7ZIP_ASM \
- $(LOCAL_FLAGS)
-
-+ALLFLAGS_CPP=-std=gnu++14
-+
- CXX=g++
- CC=gcc
- CC_SHARED=-fPIC
-diff --git a/makefile.linux_any_cpu_gcc_4.X b/makefile.linux_any_cpu_gcc_4.X
-index be093b5..c0f3120 100644
---- a/makefile.linux_any_cpu_gcc_4.X
-+++ b/makefile.linux_any_cpu_gcc_4.X
-@@ -10,7 +10,7 @@ ALLFLAGS=${OPTFLAGS} -pipe \
- -D_7ZIP_LARGE_PAGES \
- $(LOCAL_FLAGS)
-
--ALLFLAGS_CPP=-DENV_HAVE_GCCVISIBILITYPATCH -fvisibility=hidden -fvisibility-inlines-hidden
-+ALLFLAGS_CPP=-DENV_HAVE_GCCVISIBILITYPATCH -std=gnu++14 -fvisibility=hidden -fvisibility-inlines-hidden
-
- CXX=g++
- CC=gcc
-diff --git a/makefile.linux_x86_asm_gcc_4.X b/makefile.linux_x86_asm_gcc_4.X
-index 1ac339b..6e736d9 100644
---- a/makefile.linux_x86_asm_gcc_4.X
-+++ b/makefile.linux_x86_asm_gcc_4.X
-@@ -12,7 +12,7 @@ ALLFLAGS=${OPTFLAGS} -pipe -m32 \
- -D_7ZIP_ASM \
- $(LOCAL_FLAGS)
-
--ALLFLAGS_CPP=-DENV_HAVE_GCCVISIBILITYPATCH -fvisibility=hidden -fvisibility-inlines-hidden
-+ALLFLAGS_CPP=-DENV_HAVE_GCCVISIBILITYPATCH -std=gnu++14 -fvisibility=hidden -fvisibility-inlines-hidden
-
- CXX=g++
- CC=gcc
diff --git a/gnu/packages/patches/p7zip-remove-unused-code.patch b/gnu/packages/patches/p7zip-remove-unused-code.patch
deleted file mode 100644
index f9c782b93e..0000000000
--- a/gnu/packages/patches/p7zip-remove-unused-code.patch
+++ /dev/null
@@ -1,959 +0,0 @@
-diff --git a/C/Sha1.c b/C/Sha1.c
-index 55c1c63..48b4c5d 100644
---- a/C/Sha1.c
-+++ b/C/Sha1.c
-@@ -104,39 +104,6 @@ void Sha1_GetBlockDigest(CSha1 *p, const UInt32 *data, UInt32 *destDigest)
- destDigest[4] = p->state[4] + e;
- }
-
--void Sha1_UpdateBlock_Rar(CSha1 *p, UInt32 *data, int returnRes)
--{
-- UInt32 a, b, c, d, e;
-- UInt32 W[kNumW];
--
-- a = p->state[0];
-- b = p->state[1];
-- c = p->state[2];
-- d = p->state[3];
-- e = p->state[4];
--
-- RX_15
--
-- RX_1_4(R0, R1, 15);
--
-- RX_20(R2, 20);
-- RX_20(R3, 40);
-- RX_20(R4, 60);
--
-- p->state[0] += a;
-- p->state[1] += b;
-- p->state[2] += c;
-- p->state[3] += d;
-- p->state[4] += e;
--
-- if (returnRes)
-- {
-- unsigned i;
-- for (i = 0 ; i < SHA1_NUM_BLOCK_WORDS; i++)
-- data[i] = W[kNumW - SHA1_NUM_BLOCK_WORDS + i];
-- }
--}
--
- #define Sha1_UpdateBlock(p) Sha1_GetBlockDigest(p, p->buffer, p->state)
-
- void Sha1_Update(CSha1 *p, const Byte *data, size_t size)
-@@ -212,46 +179,6 @@ void Sha1_Update(CSha1 *p, const Byte *data, size_t size)
- }
- }
-
--void Sha1_Update_Rar(CSha1 *p, Byte *data, size_t size /* , int rar350Mode */)
--{
-- int returnRes = False;
--
-- unsigned pos = (unsigned)p->count & 0x3F;
-- p->count += size;
--
-- while (size--)
-- {
-- unsigned pos2 = (pos & 3);
-- UInt32 v = ((UInt32)*data++) << (8 * (3 - pos2));
-- UInt32 *ref = &(p->buffer[pos >> 2]);
-- pos++;
-- if (pos2 == 0)
-- {
-- *ref = v;
-- continue;
-- }
-- *ref |= v;
--
-- if (pos == SHA1_BLOCK_SIZE)
-- {
-- pos = 0;
-- Sha1_UpdateBlock_Rar(p, p->buffer, returnRes);
-- if (returnRes)
-- {
-- unsigned i;
-- for (i = 0; i < SHA1_NUM_BLOCK_WORDS; i++)
-- {
-- UInt32 d = p->buffer[i];
-- Byte *prev = data + i * 4 - SHA1_BLOCK_SIZE;
-- SetUi32(prev, d);
-- }
-- }
-- // returnRes = rar350Mode;
-- returnRes = True;
-- }
-- }
--}
--
- void Sha1_Final(CSha1 *p, Byte *digest)
- {
- unsigned pos = (unsigned)p->count & 0x3F;
-diff --git a/C/Sha1.h b/C/Sha1.h
-index aa22ec3..9c45653 100644
---- a/C/Sha1.h
-+++ b/C/Sha1.h
-@@ -27,8 +27,6 @@ void Sha1_GetBlockDigest(CSha1 *p, const UInt32 *data, UInt32 *destDigest);
- void Sha1_Update(CSha1 *p, const Byte *data, size_t size);
- void Sha1_Final(CSha1 *p, Byte *digest);
-
--void Sha1_Update_Rar(CSha1 *p, Byte *data, size_t size /* , int rar350Mode */);
--
- void Sha1_32_PrepareBlock(const CSha1 *p, UInt32 *block, unsigned size);
- void Sha1_32_Update(CSha1 *p, const UInt32 *data, size_t size);
- void Sha1_32_Final(CSha1 *p, UInt32 *digest);
-diff --git a/CPP/7zip/Archive/7z/7zUpdate.cpp b/CPP/7zip/Archive/7z/7zUpdate.cpp
-index a0571e7..43ad3e9 100644
---- a/CPP/7zip/Archive/7z/7zUpdate.cpp
-+++ b/CPP/7zip/Archive/7z/7zUpdate.cpp
-@@ -562,7 +562,7 @@ static int CompareEmptyItems(const unsigned *p1, const unsigned *p2, void *param
- }
-
- static const char *g_Exts =
-- " 7z xz lzma ace arc arj bz tbz bz2 tbz2 cab deb gz tgz ha lha lzh lzo lzx pak rar rpm sit zoo"
-+ " 7z xz lzma ace arc arj bz tbz bz2 tbz2 cab deb gz tgz ha lha lzh lzo lzx pak rpm sit zoo"
- " zip jar ear war msi"
- " 3gp avi mov mpeg mpg mpe wmv"
- " aac ape fla flac la mp3 m4a mp4 ofr ogg pac ra rm rka shn swa tta wv wma wav"
-diff --git a/CPP/7zip/Bundles/Format7zFree/makefile.list b/CPP/7zip/Bundles/Format7zFree/makefile.list
-index da2056b..1dcf1a5 100644
---- a/CPP/7zip/Bundles/Format7zFree/makefile.list
-+++ b/CPP/7zip/Bundles/Format7zFree/makefile.list
-@@ -87,8 +87,6 @@ SRCS=\
- ../../../../CPP/7zip/Archive/PeHandler.cpp \
- ../../../../CPP/7zip/Archive/PpmdHandler.cpp \
- ../../../../CPP/7zip/Archive/QcowHandler.cpp \
-- ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \
-- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \
- ../../../../CPP/7zip/Archive/RpmHandler.cpp \
- ../../../../CPP/7zip/Archive/SplitHandler.cpp \
- ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \
-@@ -191,9 +189,6 @@ SRCS=\
- ../../../../CPP/7zip/Crypto/MyAesReg.cpp \
- ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \
- ../../../../CPP/7zip/Crypto/RandGen.cpp \
-- ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \
-- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \
-- ../../../../CPP/7zip/Crypto/RarAes.cpp \
- ../../../../CPP/7zip/Crypto/WzAes.cpp \
- ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \
- ../../../../CPP/7zip/Crypto/ZipStrong.cpp \
-@@ -485,10 +480,6 @@ PpmdHandler.o : ../../../../CPP/7zip/Archive/PpmdHandler.cpp
- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/PpmdHandler.cpp
- QcowHandler.o : ../../../../CPP/7zip/Archive/QcowHandler.cpp
- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/QcowHandler.cpp
--RarHandler.o : ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp
-- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp
--Rar5Handler.o : ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp
-- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp
- RpmHandler.o : ../../../../CPP/7zip/Archive/RpmHandler.cpp
- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/RpmHandler.cpp
- SplitHandler.o : ../../../../CPP/7zip/Archive/SplitHandler.cpp
-@@ -693,12 +684,6 @@ Pbkdf2HmacSha1.o : ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp
- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp
- RandGen.o : ../../../../CPP/7zip/Crypto/RandGen.cpp
- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RandGen.cpp
--Rar20Crypto.o : ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp
-- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp
--Rar5Aes.o : ../../../../CPP/7zip/Crypto/Rar5Aes.cpp
-- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar5Aes.cpp
--RarAes.o : ../../../../CPP/7zip/Crypto/RarAes.cpp
-- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RarAes.cpp
- WzAes.o : ../../../../CPP/7zip/Crypto/WzAes.cpp
- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/WzAes.cpp
- ZipCrypto.o : ../../../../CPP/7zip/Crypto/ZipCrypto.cpp
-@@ -869,8 +854,6 @@ OBJS=\
- PeHandler.o \
- PpmdHandler.o \
- QcowHandler.o \
-- RarHandler.o \
-- Rar5Handler.o \
- RpmHandler.o \
- SplitHandler.o \
- SquashfsHandler.o \
-@@ -973,9 +956,6 @@ OBJS=\
- MyAesReg.o \
- Pbkdf2HmacSha1.o \
- RandGen.o \
-- Rar20Crypto.o \
-- Rar5Aes.o \
-- RarAes.o \
- WzAes.o \
- ZipCrypto.o \
- ZipStrong.o \
-diff --git a/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt b/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt
-index 61f41f9..adc7117 100644
---- a/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt
-+++ b/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt
-@@ -126,8 +126,6 @@ add_library(7z MODULE
- "../../../../CPP/7zip/Archive/PeHandler.cpp"
- "../../../../CPP/7zip/Archive/PpmdHandler.cpp"
- "../../../../CPP/7zip/Archive/QcowHandler.cpp"
-- "../../../../CPP/7zip/Archive/Rar/RarHandler.cpp"
-- "../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp"
- "../../../../CPP/7zip/Archive/RpmHandler.cpp"
- "../../../../CPP/7zip/Archive/SplitHandler.cpp"
- "../../../../CPP/7zip/Archive/SquashfsHandler.cpp"
-@@ -230,9 +228,6 @@ add_library(7z MODULE
- "../../../../CPP/7zip/Crypto/MyAesReg.cpp"
- "../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp"
- "../../../../CPP/7zip/Crypto/RandGen.cpp"
-- "../../../../CPP/7zip/Crypto/Rar20Crypto.cpp"
-- "../../../../CPP/7zip/Crypto/Rar5Aes.cpp"
-- "../../../../CPP/7zip/Crypto/RarAes.cpp"
- "../../../../CPP/7zip/Crypto/WzAes.cpp"
- "../../../../CPP/7zip/Crypto/ZipCrypto.cpp"
- "../../../../CPP/7zip/Crypto/ZipStrong.cpp"
-diff --git a/CPP/7zip/Crypto/Sha1Cls.h b/CPP/7zip/Crypto/Sha1Cls.h
-index 71acbde..cde4a57 100644
---- a/CPP/7zip/Crypto/Sha1Cls.h
-+++ b/CPP/7zip/Crypto/Sha1Cls.h
-@@ -28,7 +28,6 @@ class CContext: public CContextBase
- {
- public:
- void Update(const Byte *data, size_t size) throw() { Sha1_Update(&_s, data, size); }
-- void UpdateRar(Byte *data, size_t size /* , bool rar350Mode */) throw() { Sha1_Update_Rar(&_s, data, size /* , rar350Mode ? 1 : 0 */); }
- void Final(Byte *digest) throw() { Sha1_Final(&_s, digest); }
- };
-
-diff --git a/CPP/7zip/Guid.txt b/CPP/7zip/Guid.txt
-index 7edab6e..cc22992 100644
---- a/CPP/7zip/Guid.txt
-+++ b/CPP/7zip/Guid.txt
-@@ -151,7 +151,6 @@ Handler GUIDs:
-
- 01 Zip
- 02 BZip2
-- 03 Rar
- 04 Arj
- 05 Z
- 06 Lzh
-@@ -168,7 +167,6 @@ Handler GUIDs:
- C9 VDI
- CA Qcow
- CB GPT
-- CC Rar5
- CD IHex
- CE Hxs
- CF TE
-diff --git a/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro b/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro
-index afa36d4..93c45c7 100644
---- a/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro
-+++ b/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro
-@@ -137,8 +137,6 @@ SOURCES += \
- ../../../../CPP/7zip/Archive/PeHandler.cpp \
- ../../../../CPP/7zip/Archive/PpmdHandler.cpp \
- ../../../../CPP/7zip/Archive/QcowHandler.cpp \
-- ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \
-- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \
- ../../../../CPP/7zip/Archive/RpmHandler.cpp \
- ../../../../CPP/7zip/Archive/SplitHandler.cpp \
- ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \
-@@ -241,9 +239,6 @@ SOURCES += \
- ../../../../CPP/7zip/Crypto/MyAesReg.cpp \
- ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \
- ../../../../CPP/7zip/Crypto/RandGen.cpp \
-- ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \
-- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \
-- ../../../../CPP/7zip/Crypto/RarAes.cpp \
- ../../../../CPP/7zip/Crypto/WzAes.cpp \
- ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \
- ../../../../CPP/7zip/Crypto/ZipStrong.cpp \
-diff --git a/CPP/7zip/QMAKE/all.pro b/CPP/7zip/QMAKE/all.pro
-index a565ba8..6668619 100644
---- a/CPP/7zip/QMAKE/all.pro
-+++ b/CPP/7zip/QMAKE/all.pro
-@@ -4,7 +4,6 @@ SUBDIRS = 7za \
- 7zr \
- 7z_ \
- Format7zFree \
-- Rar \
- Lzham \
- test_lib
-
-diff --git a/CPP/7zip/UI/Client7z/Client7z.cpp b/CPP/7zip/UI/Client7z/Client7z.cpp
-index d0eca6d..7f4e6e2 100644
---- a/CPP/7zip/UI/Client7z/Client7z.cpp
-+++ b/CPP/7zip/UI/Client7z/Client7z.cpp
-@@ -32,7 +32,7 @@ HINSTANCE g_hInstance = 0;
- #endif
-
- // Tou can find the list of all GUIDs in Guid.txt file.
--// use another CLSIDs, if you want to support other formats (zip, rar, ...).
-+// use another CLSIDs, if you want to support other formats (zip, ...).
- // {23170F69-40C1-278A-1000-000110070000}
-
- DEFINE_GUID(CLSID_CFormat7z,
-diff --git a/CPP/7zip/UI/Common/LoadCodecs.h b/CPP/7zip/UI/Common/LoadCodecs.h
-index ac9eeac..076bd1c 100644
---- a/CPP/7zip/UI/Common/LoadCodecs.h
-+++ b/CPP/7zip/UI/Common/LoadCodecs.h
-@@ -158,7 +158,6 @@ struct CArcInfoEx
- void AddExts(const UString &ext, const UString &addExt);
-
- bool IsSplit() const { return StringsAreEqualNoCase_Ascii(Name, "Split"); }
-- // bool IsRar() const { return StringsAreEqualNoCase_Ascii(Name, "Rar"); }
-
- CArcInfoEx():
- Flags(0),
-diff --git a/CPP/7zip/UI/Common/OpenArchive.cpp b/CPP/7zip/UI/Common/OpenArchive.cpp
-index 7d5b0c4..88ea5ab 100644
---- a/CPP/7zip/UI/Common/OpenArchive.cpp
-+++ b/CPP/7zip/UI/Common/OpenArchive.cpp
-@@ -1063,7 +1063,6 @@ static const char * const k_Formats_with_simple_signuature[] =
- {
- "7z"
- , "xz"
-- , "rar"
- , "bzip2"
- , "gzip"
- , "cab"
-@@ -1720,29 +1719,6 @@ HRESULT CArc::OpenStream2(const COpenOptions &op)
- {
- // signature search was here
- }
-- else if (extension.IsEqualTo("000") || extension.IsEqualTo("001"))
-- {
-- int i = FindFormatForArchiveType(op.codecs, orderIndices, "rar");
-- if (i >= 0)
-- {
-- const size_t kBufSize = (1 << 10);
-- byteBuffer.Alloc(kBufSize);
-- size_t processedSize = kBufSize;
-- RINOK(ReadStream(op.stream, byteBuffer, &processedSize));
-- if (processedSize >= 16)
-- {
-- const Byte *buf = byteBuffer;
-- const Byte kRarHeader[] = { 0x52 , 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00 };
-- if (TestSignature(buf, kRarHeader, 7) && buf[9] == 0x73 && (buf[10] & 1) != 0)
-- {
-- orderIndices2.Add(orderIndices[i]);
-- orderIndices[i] = -1;
-- if (i >= (int)numFinded)
-- numFinded++;
-- }
-- }
-- }
-- }
- else
- {
- const size_t kBufSize = (1 << 10);
-diff --git a/CPP/7zip/UI/FileManager/FM_rc.cpp b/CPP/7zip/UI/FileManager/FM_rc.cpp
-index 83578ed..034feed 100644
---- a/CPP/7zip/UI/FileManager/FM_rc.cpp
-+++ b/CPP/7zip/UI/FileManager/FM_rc.cpp
-@@ -821,8 +821,6 @@ REGISTER_STRINGTABLE(g_stringTable)
-
- /////////////////////////////////////////////////////
-
--#include "res/ParentFolder.h"
--
- SevenZipPanel::SevenZipPanel(MyFrame *frame, wxWindow *parent,int id,int panelIndex) :
- wxPanel(parent,id) , m_frame(frame), _wList(0)
- {
-@@ -840,7 +838,7 @@ REGISTER_STRINGTABLE(g_stringTable)
- int sizes[] = {150, 250, 350, -1};
- wxArrayString pathArray;
- wxBoxSizer *pPathSizer = new wxBoxSizer(wxHORIZONTAL);
-- m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxGetBitmapFromMemory(PARENT_FOLDER), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW);
-+ m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_TOOLBAR, wxDefaultSize), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW);
- m_pComboBoxPath = new wxComboBox(this, _comboBoxID, wxEmptyString, wxDefaultPosition, wxSize(300,-1), pathArray, wxCB_DROPDOWN | wxCB_SORT );
- pPathSizer->Add(m_pBmpButtonParentFolder, 0, wxALL|wxEXPAND, 0);
- pPathSizer->Add(m_pComboBoxPath, 1, wxALL|wxEXPAND, 5);
-diff --git a/CPP/ANDROID/Format7zFree/jni/Android.mk b/CPP/ANDROID/Format7zFree/jni/Android.mk
-index 7c74e73..48cb4fa 100644
---- a/CPP/ANDROID/Format7zFree/jni/Android.mk
-+++ b/CPP/ANDROID/Format7zFree/jni/Android.mk
-@@ -91,8 +91,6 @@ LOCAL_SRC_FILES := \
- ../../../../CPP/7zip/Archive/PeHandler.cpp \
- ../../../../CPP/7zip/Archive/PpmdHandler.cpp \
- ../../../../CPP/7zip/Archive/QcowHandler.cpp \
-- ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \
-- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \
- ../../../../CPP/7zip/Archive/RpmHandler.cpp \
- ../../../../CPP/7zip/Archive/SplitHandler.cpp \
- ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \
-@@ -195,9 +193,6 @@ LOCAL_SRC_FILES := \
- ../../../../CPP/7zip/Crypto/MyAesReg.cpp \
- ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \
- ../../../../CPP/7zip/Crypto/RandGen.cpp \
-- ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \
-- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \
-- ../../../../CPP/7zip/Crypto/RarAes.cpp \
- ../../../../CPP/7zip/Crypto/WzAes.cpp \
- ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \
- ../../../../CPP/7zip/Crypto/ZipStrong.cpp \
-diff --git a/ChangeLog b/ChangeLog
-index daabd8e..f2a01d6 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -28,7 +28,6 @@ Version 16.00 (never published)
- - 7z update bcj bugs were fixed.
- - split (aaa.001) fixed
- - iso loop fix
-- - rar4 multivol -stdin kpidSize
- - drag and drop 1<2.txt
- - memory access violation fix
-
-@@ -80,11 +79,6 @@ Version 15.12 (never published)
- - "There are no errors" string after "Test" operation inside archive.
- - The bugs in LZMA SDK were fixed (but these bugs are not related directly to 7-Zip's code).
-
--
-- - From Windows version of 7-Zip 15.11 :
-- - Some bugs were fixed.
-- - 7-Zip 15.10 showed incorrect error message about missing volume for multivolume RAR archives.
--
- - ..../LZHAM added
-
-
-@@ -104,9 +98,6 @@ Version 15.10 beta
- version (-m switch).
- - Some bugs were fixed.
- - extracting from solid wim archives worked incorrectly in some cases,
-- - Also there are some minor changes.
-- - 7-Zip can show the name of missing volume for multivolume RAR and VMDK archives.
-- - Some internal changes with 7-Zip Benchmark.
-
- Version 15.09 beta
- ==================
-@@ -128,8 +119,6 @@ Version 15.08 beta
- Version 15.07 beta
- ==================
-
-- - "bin/Codecs/Rar29.so" renamed to "bin/Codecs/Rar.so"
--
- - support for cygwin 64 bits
-
- - support for cygwin 64 bits with asm
-@@ -153,15 +142,12 @@ Version 15.07 beta
-
- - From Windows version of 7-zip 15.06 beta:
-
-- - 7-Zip now can extract RAR5 archives.
- - 7-Zip now doesn't sort files by type while adding to solid 7z archive.
- new -mqs switch to sort files by type while adding to solid 7z archive.
- - The BUG in 7-Zip File Manager was fixed:
- The "Move" operation to open 7z archive didn't delete empty files.
- - The BUG in 15.05 was fixed:
- console version added some text to the end of stdout stream, is -so switch was used.
-- - The BUG in 9.30 - 15.05 was fixed:
-- 7-Zip could not open multivolume sfx RAR archive.
- - Some bugs were fixed.
-
- - From Windows version of 7-zip 15.05 beta:
-@@ -214,9 +200,6 @@ Version 9.38
- - bug #139 "password from commanline is visible in processes list"
- Now the characters of the password are replaced with *.
-
-- - From Windows version of 7-zip
-- - bug#138 If you extract the password with # program crashes
-- 7z now supports long password in RAR 3 and 4.
-
-
-
-@@ -247,12 +230,6 @@ Version 9.22
- - #3283518 : Asm/x{32,64}/7zCrcT8U.asm introduces executable stack
-
-
--Version 9.20.1
--==============
--
-- - #3211479 "p7zip 9.20 - "unsupported method" with RAR files - " fixed
-- "install.sh" installs again "bin/Codecs/Rar29.so"
--
- Version 9.20
- ============
-
-@@ -325,8 +302,6 @@ Version 9.13
- - Some bugs were fixed.
-
-
-- - #2863580 "Crash in Rar decoder on a corrupted file" fixed
--
- - #2860898 "Dereferencing a zero pointer in cab handler" fixed
-
- - #2860679 "Division by zero in cab decoder" fixed
-@@ -455,7 +430,7 @@ Version 4.59 (never published)
- - It's allowed to use -t switch for "list" and "extract" commands.
- - Some bugs were fixed.
-
-- - Bug : wrong timestamp for files extracted from .zip or .rar archives
-+ - Bug : wrong timestamp for files extracted from .zip archives
-
-
- Version 4.58
-@@ -468,8 +443,6 @@ Version 4.58
- 2) -mcu switch: 7-Zip uses UTF-8, if there are non-ASCII symbols.
- 3) -mcl switch: 7-Zip uses local code page.
- - Now it's possible to store file creation time in 7z and ZIP archives (-mtc switch).
-- - 7-Zip now can unpack multivolume RAR archives created with
-- "old style volume names" scheme and names *.001, *.002, ...
- - Now it's possible to use -mSW- and -mSW+ switches instead of -mSW=off and -mSW=on
- - Some bugs were fixed.
-
-@@ -685,7 +658,7 @@ Version 4.44
-
- - From Windows version of 7-zip 4.44 :
- - 7za : Cab support
-- - Speed optimizations for LZMA, Deflate, BZip2 and unRAR.
-+ - Speed optimizations for LZMA, Deflate and BZip2.
- - fix : now, updating a crypted header archive keeps the crypted header
-
- - fixes in the help displayed by 7za/7z/7zr.
-@@ -805,8 +778,6 @@ Version 4.38
-
- - patch #1465026 - Patch for install.sh for packagers
-
-- - DosDateTimeToFileTime fixed (rar format)
--
- - contrib/VirtualFileSystemForMidnightCommander/u7z updated
- (thank sgh_punk)
-
-@@ -923,8 +894,6 @@ Version 4.25
- - Some bugs were fixed
- - DOCS/MANUAL/exit_codes.htm added
-
-- - new plugin for 7z : RAR format support (extracting only)
--
- - better dependencies in makefile
-
- Version 4.23
-@@ -1112,9 +1081,6 @@ Version 4.10
- - new port of 7za from the source of 7za 4.10Beta for Windows
- => p7zip now work on big endian CPU.
-
-- - 7z for Unix is not maintain anymore (because as the source of unrar plugin for 7z
-- is not available, 7z is unless on Unix).
--
- Version 0.91
- ============
- - add support for FreeBSD 5.2.1
-diff --git a/DOC/License.txt b/DOC/License.txt
-index 0bcbe26..5b0dfaa 100644
---- a/DOC/License.txt
-+++ b/DOC/License.txt
-@@ -5,15 +5,6 @@
-
- 7-Zip Copyright (C) 1999-2016 Igor Pavlov.
-
-- Licenses for files are:
--
-- 1) CPP/7zip/Compress/Rar* files: GNU LGPL + unRAR restriction
-- 2) All other files: GNU LGPL
--
-- The GNU LGPL + unRAR restriction means that you must follow both
-- GNU LGPL rules and unRAR restriction rules.
--
--
- GNU LGPL information
- --------------------
-
-@@ -33,21 +24,5 @@
- USA
-
-
-- unRAR restriction
-- -----------------
--
-- The decompression engine for RAR archives was developed using source
-- code of unRAR program.
-- All copyrights to original unRAR code are owned by Alexander Roshal.
--
-- The license for original unRAR code has the following restriction:
--
-- The unRAR sources cannot be used to re-create the RAR compression algorithm,
-- which is proprietary. Distribution of modified unRAR sources in separate form
-- or as a part of other software is permitted, provided that it is clearly
-- stated in the documentation and source comments that the code may
-- not be used to develop a RAR (WinRAR) compatible archiver.
--
--
- --
- Igor Pavlov
-diff --git a/DOC/MANUAL/cmdline/switches/update.htm b/DOC/MANUAL/cmdline/switches/update.htm
-index 27385b1..0190fc1 100644
---- a/DOC/MANUAL/cmdline/switches/update.htm
-+++ b/DOC/MANUAL/cmdline/switches/update.htm
-@@ -139,7 +139,7 @@ someone in another time zone.</P>
- <LI>UTC file systems: NTFS
- <LI>UTC archive formats: .zip with -mtc switch, 7z, tar, gzip2, iso, wim
- <LI>Local time file systems : FAT, FAT32
--<LI>Local time archive formats : rar, zip, cab
-+<LI>Local time archive formats : zip, cab
- </UL>
-
- <H4>Examples</H4>
-diff --git a/DOC/MANUAL/general/formats.htm b/DOC/MANUAL/general/formats.htm
-index 7996c5c..cd01bd6 100644
---- a/DOC/MANUAL/general/formats.htm
-+++ b/DOC/MANUAL/general/formats.htm
-@@ -47,7 +47,6 @@
- <TR> <TD align="center">NSIS</TD> <TD></TD> <TD>nsis</TD> </TR>
- <TR> <TD align="center">NTFS</TD> <TD></TD> <TD>ntfs img</TD> </TR>
- <TR> <TD align="center">MBR</TD> <TD></TD> <TD>mbr</TD> </TR>
-- <TR> <TD align="center">RAR</TD> <TD></TD> <TD>rar r00</TD> </TR>
- <TR> <TD align="center">RPM</TD> <TD></TD> <TD>rpm</TD></TR>
- <TR> <TD align="center">PPMD</TD> <TD></TD> <TD>ppmd</TD> </TR>
- <TR> <TD align="center">QCOW2</TD> <TD></TD> <TD>qcow qcow2 qcow2c</TD> </TR>
-diff --git a/DOC/Methods.txt b/DOC/Methods.txt
-index 1a1c54c..daa94e2 100644
---- a/DOC/Methods.txt
-+++ b/DOC/Methods.txt
-@@ -97,12 +97,6 @@ List of defined IDs
- 02 -
- 02 - BZip2
-
-- 03 - [Rar]
-- 01 - Rar1
-- 02 - Rar2
-- 03 - Rar3
-- 05 - Rar5
--
- 04 - [Arj]
- 01 - Arj(1,2,3)
- 02 - Arj4
-@@ -146,10 +140,6 @@ List of defined IDs
- 01 - [Zip]
- 01 - ZipCrypto (Main Zip crypto algo)
-
-- 03 - [RAR]
-- 02 -
-- 03 - Rar29AES (AES-128 + modified SHA-1)
--
- 07 - [7z]
- 01 - 7zAES (AES-256 + SHA-256)
-
-diff --git a/DOC/readme.txt b/DOC/readme.txt
-index 4a6998c..00591d4 100644
---- a/DOC/readme.txt
-+++ b/DOC/readme.txt
-@@ -9,30 +9,9 @@
- License Info
- ------------
-
--7-Zip is free software distributed under the GNU LGPL
--(except for unRar code).
-+7-Zip is free software distributed under the GNU LGPL.
- read License.txt for more infomation about license.
-
--Notes about unRAR license:
--
--Please check main restriction from unRar license:
--
-- 2. The unRAR sources may be used in any software to handle RAR
-- archives without limitations free of charge, but cannot be used
-- to re-create the RAR compression algorithm, which is proprietary.
-- Distribution of modified unRAR sources in separate form or as a
-- part of other software is permitted, provided that it is clearly
-- stated in the documentation and source comments that the code may
-- not be used to develop a RAR (WinRAR) compatible archiver.
--
--In brief it means:
--1) You can compile and use compiled files under GNU LGPL rules, since
-- unRAR license almost has no restrictions for compiled files.
-- You can link these compiled files to LGPL programs.
--2) You can fix bugs in source code and use compiled fixed version.
--3) You can not use unRAR sources to re-create the RAR compression algorithm.
--
--
- LZMA SDK
- --------
-
-@@ -96,7 +75,6 @@ DOC Documentation
- ---
- 7zFormat.txt - 7z format description
- copying.txt - GNU LGPL license
-- unRarLicense.txt - License for unRAR part of source code
- src-history.txt - Sources history
- Methods.txt - Compression method IDs
- readme.txt - Readme file
-diff --git a/DOC/src-history.txt b/DOC/src-history.txt
-index 6b48c80..dda8057 100644
---- a/DOC/src-history.txt
-+++ b/DOC/src-history.txt
-@@ -188,8 +188,6 @@ HISTORY of the 7-Zip source code
- - 7-Zip now has 128 MB dictionary limit for 32-bit version:
- It's for speed optimization: kNumLogBits = 9 + sizeof(size_t) / 2;
- - TAR: 'D' link flag support.
--- 7-Zip now can unpack multivolume RAR archives created with
-- "old style volume names" scheme (-vn switch) and names *.001, *.002, ...
- - Fixed bugs:
- - 7-Zip FM could not copy / move files to root network folders like \\COMPNAME\FOLDERNAME\
- In case of move it removed original files.
-@@ -200,8 +198,6 @@ HISTORY of the 7-Zip source code
- 7-zip tries to delete all extra fileds (except for WzAES).
- And that code could hang.
- - 7-Zip GUI didn't suggest BZip2 dictionary size used in previous run.
-- - If creation time stamp was included in .RAR archive, 7-zip used creation time stamp
-- as modification time stamp.
-
- 4.58 alpha 2 2007-12-31
- -------------------------
-@@ -251,7 +247,6 @@ HISTORY of the 7-Zip source code
- stratup code, or you must add CPP/Common/CRC.cpp to your project.
- - Method ID in .7z now is 63-bit integer (UInt64).
- - Open error messages
--- unRar 1.5 fixed
- - unShrink fixed
- - BUG of 4.43 beta and 4.44 beta was fixed.
- 7-Zip compressing to .zip in multi-threading mode didn't work in some cases.
-@@ -433,11 +428,6 @@ HISTORY of the 7-Zip source code
- contains common resurces
-
-
--2.30 Beta 19 2002-04-11
---------------------------
--- SDK/Archive/Rar/Handler.cpp
-- supporting RAR29
--
- 2.30 Beta 18 2002-03-25
- -------------------------
- - SDK/Archive/Cab/MSZipDecoder.cpp
-diff --git a/GUI/Contents/Info.plist b/GUI/Contents/Info.plist
-index 71650e1..d60b262 100644
---- a/GUI/Contents/Info.plist
-+++ b/GUI/Contents/Info.plist
-@@ -311,24 +311,6 @@
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
-- <string>rar</string>
-- <string>RAR</string>
-- <string>.r00</string>
-- </array>
-- <key>CFBundleTypeIconFile</key>
-- <string>p7zip</string>
-- <key>CFBundleTypeName</key>
-- <string>Rar</string>
-- <key>CFBundleTypeRole</key>
-- <string>Viewer</string>
-- <key>LSTypeIsPackage</key>
-- <false/>
-- <key>NSPersistentStoreTypeKey</key>
-- <string>XML</string>
-- </dict>
-- <dict>
-- <key>CFBundleTypeExtensions</key>
-- <array>
- <string>ace</string>
- <string>ACE</string>
- <string>.c00</string>
-diff --git a/README b/README
-index b76407f..c03917b 100644
---- a/README
-+++ b/README
-@@ -8,7 +8,7 @@ p7zip is a port of the Windows programs 7z.exe and 7za.exe provided by 7-zip.
- 7-zip is a file archiver with the highest compression ratio.
- Homepage : www.7-zip.org
-
-- 7z uses plugins (7z.so and Codecs/Rar.so) to handle archives.
-+ 7z uses plugins (7z.so) to handle archives.
- 7za is a stand-alone executable (7za handles less archive formats than 7z).
- 7zr is a light stand-alone executable that supports only 7z/LZMA/BCJ/BCJ2.
-
-@@ -63,7 +63,6 @@ BUILD :
- make sfx : to build bin/7zCon.sfx (7za can now create SFX archive)
- make 7z : to build bin/7z and its plugins :
- - "bin/7z.so" (GNU LGPL + AES code license)
-- - "bin/Codecs/Rar.so" (GNU LGPL + unRAR restriction)
- make 7zr : to build bin/7zr
- make all : to build bin/7za and bin/7zCon.sfx
- make all2 : to build bin/7za, bin/7z (with its plugins) and bin/7zCon.sfx
-@@ -74,7 +73,6 @@ BUILD :
-
- make 7zG : to build bin/7zG and its plugins :
- - "bin/7z.so" (GNU LGPL + AES code license)
-- - "bin/Codecs/Rar.so" (GNU LGPL + unRAR restriction)
- make test_7zG : to test bin/7zG (extracting, archiving, ...)
-
-
-diff --git a/Utils/bin_to_sources.py b/Utils/bin_to_sources.py
-index 1be72ec..7da359a 100644
---- a/Utils/bin_to_sources.py
-+++ b/Utils/bin_to_sources.py
-@@ -13,9 +13,6 @@ file0='Utils/file_7zCon_sfx.py'
- dir0='CPP/7zip/UI/Console'
- file0='Utils/file_7z.py'
-
--dir0='CPP/7zip/Compress/Rar'
--file0='Utils/file_Codecs_Rar_so.py'
--
- dir0='CPP/7zip/Bundles/Format7zFree'
- file0='Utils/file_7z_so.py'
-
-diff --git a/Utils/file_7z_so.py b/Utils/file_7z_so.py
-index 7ca9fff..43edb87 100644
---- a/Utils/file_7z_so.py
-+++ b/Utils/file_7z_so.py
-@@ -111,8 +111,6 @@ files_cpp=[
- 'CPP/7zip/Archive/PeHandler.cpp',
- 'CPP/7zip/Archive/PpmdHandler.cpp',
- 'CPP/7zip/Archive/QcowHandler.cpp',
-- 'CPP/7zip/Archive/Rar/RarHandler.cpp',
-- 'CPP/7zip/Archive/Rar/Rar5Handler.cpp',
- 'CPP/7zip/Archive/RpmHandler.cpp',
- 'CPP/7zip/Archive/SplitHandler.cpp',
- 'CPP/7zip/Archive/SquashfsHandler.cpp',
-@@ -215,9 +213,6 @@ files_cpp=[
- 'CPP/7zip/Crypto/MyAesReg.cpp',
- 'CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp',
- 'CPP/7zip/Crypto/RandGen.cpp',
-- 'CPP/7zip/Crypto/Rar20Crypto.cpp',
-- 'CPP/7zip/Crypto/Rar5Aes.cpp',
-- 'CPP/7zip/Crypto/RarAes.cpp',
- 'CPP/7zip/Crypto/WzAes.cpp',
- 'CPP/7zip/Crypto/ZipCrypto.cpp',
- 'CPP/7zip/Crypto/ZipStrong.cpp',
-diff --git a/Utils/generate.py b/Utils/generate.py
-index 132024a..62c0456 100755
---- a/Utils/generate.py
-+++ b/Utils/generate.py
-@@ -281,7 +281,6 @@ import file_7zr
- import file_7zG
- import file_7zFM
- import file_7z_so
--import file_Codecs_Rar_so
- import file_Codecs_Lzham_so
- import file_LzmaCon
- import file_Client7z
-@@ -440,43 +439,6 @@ LOCAL_CFLAGS := -DANDROID_NDK -fexceptions \
- -I../../../include_windows
- ''')
-
--project_Codecs_Rar=Structure(name="Rar",name2="Rar",
-- type=TYPE_DLL,
-- need_AES=False,
-- includedirs=includedirs_7za,
-- defines=[ "EXTERNAL_CODECS", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_REENTRANT", "ENV_UNIX", "BREAK_HANDLER", "UNICODE", "_UNICODE", "UNIX_USE_WIN_FILE" ],
-- files_c=file_Codecs_Rar_so.files_c,
-- files_cpp=file_Codecs_Rar_so.files_cpp,
-- cmake_end='''
--
--find_library(DL_LIB dl)
--
--link_directories(${DL_LIB_PATH})
--
--IF(APPLE)
-- TARGET_LINK_LIBRARIES(Rar ${COREFOUNDATION_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
--ELSE(APPLE)
-- IF(HAVE_PTHREADS)
-- TARGET_LINK_LIBRARIES(Rar ${CMAKE_THREAD_LIBS_INIT} dl)
-- ENDIF(HAVE_PTHREADS)
--ENDIF(APPLE)
--
--''',
--android_header=r'''
--LOCAL_CFLAGS := -DANDROID_NDK -fexceptions \
-- -DNDEBUG -D_REENTRANT -DENV_UNIX \
-- -DEXTERNAL_CODECS \
-- -DBREAK_HANDLER \
-- -DUNICODE -D_UNICODE -DUNIX_USE_WIN_FILE \
-- -I../../../Windows \
-- -I../../../Common \
-- -I../../../../C \
---I../../../myWindows \
---I../../../ \
---I../../../include_windows
--''')
--
--
-
- project_Codecs_Lzham=Structure(name="Lzham",name2="Lzham",
- type=TYPE_DLL,
-@@ -762,7 +724,6 @@ generate_makefile_list('../CPP/7zip/Bundles/Alone/makefile.list',project_7za)
- generate_makefile_list('../CPP/7zip/Bundles/Alone7z/makefile.list',project_7zr)
- generate_makefile_list('../CPP/7zip/UI/Console/makefile.list',project_7z)
- generate_makefile_list('../CPP/7zip/Bundles/Format7zFree/makefile.list',project_Format7zFree)
--generate_makefile_list('../CPP/7zip/Compress/Rar/makefile.list',project_Codecs_Rar,'../../../../bin/Codecs')
- generate_makefile_list('../CPP/7zip/Compress/Lzham/makefile.list',project_Codecs_Lzham,'../../../../bin/Codecs')
- generate_makefile_list('../CPP/7zip/Bundles/SFXCon/makefile.list',project_7zCon_sfx)
- generate_makefile_list('../CPP/7zip/UI/GUI/makefile.list',project_7zG)
-@@ -776,7 +737,6 @@ generate_pro('../CPP/7zip/QMAKE/7za/7za.pro',project_7za)
- generate_pro('../CPP/7zip/QMAKE/7zr/7zr.pro',project_7zr)
- generate_pro('../CPP/7zip/QMAKE/7z_/7z_.pro',project_7z)
- generate_pro('../CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro',project_Format7zFree)
--generate_pro('../CPP/7zip/QMAKE/Rar/Rar.pro',project_Codecs_Rar)
- generate_pro('../CPP/7zip/QMAKE/Lzham/Lzham.pro',project_Codecs_Lzham)
-
- generate_premake4('../CPP/7zip/PREMAKE/premake4.lua',project_7za)
-diff --git a/contrib/qnx630sp3/qnx630sp3-shared b/contrib/qnx630sp3/qnx630sp3-shared
-index 6f5481f..ea07114 100644
---- a/contrib/qnx630sp3/qnx630sp3-shared
-+++ b/contrib/qnx630sp3/qnx630sp3-shared
-@@ -8,7 +8,7 @@ mv ./bin/7z ../${BIN} && mv ./bin/7za ../${BIN} && mv ./bin/7zr ../${BIN} && mv
- make clean && \
- cp makefile.qnx_shared.so makefile.machine && \
- make 7z && \
--mv ./bin/7z.so ../${BIN} && mv ./bin/Codecs/Rar.so ../${BIN}/Codecs && \
-+mv ./bin/7z.so ../${BIN} && \
- make clean && \
- mv makefile.machine.bak makefile.machine
- echo "All done - look for binaries in ../${BIN}"
-diff --git a/makefile b/makefile
-index 745c8ed..f8e8e33 100644
---- a/makefile
-+++ b/makefile
-@@ -31,7 +31,6 @@ depend:
- $(MAKE) -C CPP/7zip/UI/Client7z depend
- $(MAKE) -C CPP/7zip/UI/Console depend
- $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend
-- $(MAKE) -C CPP/7zip/Compress/Rar depend
- $(MAKE) -C CPP/7zip/UI/GUI depend
- $(MAKE) -C CPP/7zip/UI/FileManager depend
-
-@@ -42,7 +41,6 @@ sfx: common
- common7z:common
- $(MKDIR) bin/Codecs
- $(MAKE) -C CPP/7zip/Bundles/Format7zFree all
-- $(MAKE) -C CPP/7zip/Compress/Rar all
-
- lzham:common
- $(MKDIR) bin/Codecs
-@@ -67,7 +65,6 @@ clean_C:
- $(MAKE) -C CPP/7zip/UI/FileManager clean
- $(MAKE) -C CPP/7zip/UI/GUI clean
- $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean
-- $(MAKE) -C CPP/7zip/Compress/Rar clean
- $(MAKE) -C CPP/7zip/Compress/Lzham clean
- $(MAKE) -C CPP/7zip/Bundles/LzmaCon clean2
- $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean
-diff --git a/makefile.oldmake b/makefile.oldmake
-index afc681c..690af08 100644
---- a/makefile.oldmake
-+++ b/makefile.oldmake
-@@ -31,7 +31,6 @@ depend:
- cd CPP/7zip/UI/Client7z ; $(MAKE) depend
- cd CPP/7zip/UI/Console ; $(MAKE) depend
- cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend
-- cd CPP/7zip/Compress/Rar ; $(MAKE) depend
- cd CPP/7zip/UI/GUI ; $(MAKE) depend
- cd CPP/7zip/UI/FileManager ; $(MAKE) depend
-
-@@ -42,7 +41,6 @@ sfx: common
- common7z:common
- $(MKDIR) bin/Codecs
- cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all
-- cd CPP/7zip/Compress/Rar ; $(MAKE) all
-
- lzham:common
- $(MKDIR) bin/Codecs
-@@ -67,7 +65,6 @@ clean_C:
- cd CPP/7zip/UI/FileManager ; $(MAKE) clean
- cd CPP/7zip/UI/GUI ; $(MAKE) clean
- cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean
-- cd CPP/7zip/Compress/Rar ; $(MAKE) clean
- cd CPP/7zip/Compress/Lzham ; $(MAKE) clean
- cd CPP/7zip/Bundles/LzmaCon ; $(MAKE) clean2
- cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean
-diff --git a/makefile.qnx_shared.so b/makefile.qnx_shared.so
-index abd1caf..cff5485 100644
---- a/makefile.qnx_shared.so
-+++ b/makefile.qnx_shared.so
-@@ -1,5 +1,5 @@
- ###################################################
--# makefile.machine for "7z.so , Codecs/Rar.so" :
-+# makefile.machine for "7z.so" :
- # tested with p7zip-4.47_beta on qnx-6.3.0 sp3 x86 target
-
- OPTFLAGS=-O -s
diff --git a/gnu/packages/patches/xlispstat-fix-compilation-with-modern-gcc.patch b/gnu/packages/patches/xlispstat-fix-compilation-with-modern-gcc.patch
new file mode 100644
index 0000000000..46825d1132
--- /dev/null
+++ b/gnu/packages/patches/xlispstat-fix-compilation-with-modern-gcc.patch
@@ -0,0 +1,213 @@
+From 29d14d78a17f2d85bc9e37f380e71221c2055dd8 Mon Sep 17 00:00:00 2001
+From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
+Date: Thu, 23 Oct 2025 22:13:53 +0300
+Subject: [PATCH] src: Fix compilation with GCC version 14 or newer
+
+GCC version 14 now treats some deprecation warnings as errors, namely
+it is not allowed to use implicit "int" types, implicit function
+declarations (see <https://gcc.gnu.org/gcc-14/porting_to.html>.) In
+this patch, deprecated code updated to match the new requirements of
+GCC.
+
+* src/c/ddists.c, src/c/objects.c, src/include/sysvr4-foreign.h,
+src/c/iviewdat.c, src/c/postscript.c: Explicitly specify variable
+types and procedure return value types to satisfy requirements of
+GCC version 14 or newer.
+* src/c/X11graph.c: Likewise.
+(StBlockForInput): Modernize "select" call.
+* src/c/X11BSDstuff.c (line_available): Modernize "select" call.
+---
+ src/c/X11BSDstuff.c | 4 +++-
+ src/c/X11graph.c | 10 +++++++---
+ src/c/ddists.c | 4 +++-
+ src/c/iviewdat.c | 2 +-
+ src/c/objects.c | 6 ++++--
+ src/c/postscript.c | 7 ++++---
+ src/include/sysvr4-foreign.h | 2 +-
+ 7 files changed, 23 insertions(+), 12 deletions(-)
+
+diff --git a/src/c/X11BSDstuff.c b/src/c/X11BSDstuff.c
+index 5bb7144..4a9b91b 100644
+--- a/src/c/X11BSDstuff.c
++++ b/src/c/X11BSDstuff.c
+@@ -3,6 +3,8 @@
+ /* Additions to Xlisp 2.1, Copyright (c) 1989 by David Michael Betz */
+ /* You may give out copies of this software; for conditions see the */
+ /* file COPYING included with this distribution. */
++/* Additions to XLISP-STAT 2.1, Copyright (c) 2025, */
++/* by Artyom V. Poptsov <poptsov.artyom@gmail.com> */
+ /* */
+ /* Some modifications included from WINTERP */
+ /* WINTERP 1.0 Copyright 1989 Hewlett-Packard Company (by Niels Mayer).*/
+@@ -549,7 +551,7 @@ LOCAL int line_available()
+ FD_ZERO(&readmask);
+ FD_SET(fileno(stdin), &readmask);
+
+- result = select(ndfs, (int *) &readmask, NULL, NULL, &tv);
++ result = select(ndfs, &readmask, NULL, NULL, &tv);
+ if (result > 0) return(TRUE);
+ /* *** should merge the select here with the one for blocking ***/
+ else return(StBlockForInput());
+diff --git a/src/c/X11graph.c b/src/c/X11graph.c
+index 70dff08..920957c 100644
+--- a/src/c/X11graph.c
++++ b/src/c/X11graph.c
+@@ -1,6 +1,8 @@
+ /* X11graph - X11 support for XLISP-STAT */
+ /* XLISP-STAT 2.1 Copyright (c) 1990, by Luke Tierney */
+ /* Additions to Xlisp 2.1, Copyright (c) 1989 by David Michael Betz */
++/* Additions to XLISP-STAT 2.1, Copyright (c) 2025, */
++/* by Artyom V. Poptsov <poptsov.artyom@gmail.com> */
+ /* You may give out copies of this software; for conditions see the */
+ /* file COPYING included with this distribution. */
+
+@@ -23,8 +25,8 @@ extern VOID InstallMenuButton P2H(Window, LVAL);
+ extern VOID DeleteMenuButton P1H(Window);
+ extern VOID StX11FinishMenus(V);
+ extern VOID StX11FinishDialogs(V);
+-extern StX11InitMenus(V);
+-extern StX11InitDialogs(V);
++extern void StX11InitMenus(V);
++extern void StX11InitDialogs(V);
+
+ extern char *getenv();
+
+@@ -316,7 +318,7 @@ int StBlockForInput()
+ if (tmp > maxfd) maxfd = tmp;
+ FD_SET(maxfd, &readmask);
+ }
+- result = select(maxfd+1, (int *) &readmask, NULL, NULL, NULL);
++ result = select(maxfd+1, &readmask, NULL, NULL, NULL);
+ return((FD_ISSET(fileno(stdin), &readmask)) ? TRUE : FALSE);
+ }
+ else return(FALSE);
+@@ -1221,6 +1223,7 @@ VOID StWGetLocation(w, left, top, frame)
+ VOID StWSetSize(w, width, height, frame)
+ Window w;
+ int width, height;
++ int frame;
+ {
+ Display *dpy = StX11Display();
+ StGWWinInfo *gwinfo;
+@@ -1286,6 +1289,7 @@ VOID StWGetSize(w, pwidth, pheight, frame)
+ VOID StGWSetSize(gwinfo, width, height, frame)
+ StGWWinInfo *gwinfo;
+ int width, height;
++ int frame;
+ {
+ Window w;
+ if (gwinfo == NULL || (w = gwinfo->window) == NullWindow) return;
+diff --git a/src/c/ddists.c b/src/c/ddists.c
+index e6abeaa..dcefa23 100644
+--- a/src/c/ddists.c
++++ b/src/c/ddists.c
+@@ -3,6 +3,8 @@
+ /* Additions to Xlisp 2.1, Copyright (c) 1989 by David Michael Betz */
+ /* You may give out copies of this software; for conditions see the */
+ /* file COPYING included with this distribution. */
++/* Additions to XLISP-STAT 2.1, Copyright (c) 2025, */
++/* by Artyom V. Poptsov <poptsov.artyom@gmail.com> */
+
+ #include "xlisp.h"
+ #include "xlstat.h"
+@@ -29,7 +31,7 @@ LOCAL VOID getpoisarg P1H(double *);
+ LOCAL double poisson_cdf P2H(int, double);
+ LOCAL int binomial_quant P3H(double, int, double);
+ LOCAL int poisson_quant P2H(double, double);
+-LOCAL poisson_rand P1H(double);
++LOCAL int poisson_rand P1H(double);
+ LOCAL int binomial_rand P2H(int, double);
+
+ /* numerical distribution function */
+diff --git a/src/c/iviewdat.c b/src/c/iviewdat.c
+index 0b35e05..28fd2df 100644
+--- a/src/c/iviewdat.c
++++ b/src/c/iviewdat.c
+@@ -237,7 +237,7 @@ static VOID IViewBasicPointsSetTransformation P2C(IViewBasicPoints, p, double **
+ static VOID IViewBasicPointsApplyTransformation P3C(IViewBasicPoints, p,
+ double **, a, int *, inbasis)
+ {
+- static maxvars = 0;
++ static int maxvars = 0;
+ static Fixed **b, *x, **screen_data, *screen_location;
+ int vars, n, i, j;
+ double *scale = p->scale, *location = p->location;
+diff --git a/src/c/objects.c b/src/c/objects.c
+index d9c61f2..1084b47 100644
+--- a/src/c/objects.c
++++ b/src/c/objects.c
+@@ -3,7 +3,9 @@
+ /* Additions to Xlisp 2.1, Copyright (c) 1989 by David Michael Betz */
+ /* You may give out copies of this software; for conditions see the */
+ /* file COPYING included with this distribution. */
+-
++/* Additions to XLISP-STAT 2.1, Copyright (c) 2025, */
++/* by Artyom V. Poptsov <poptsov.artyom@gmail.com> */
++
+ #include "xlisp.h"
+ #include "xlstat.h"
+
+@@ -1260,7 +1262,7 @@ LVAL xsobject_isnew(V)
+ VOID xsaddmsg P2C(LVAL, object, char *, str)
+ {
+ LVAL fcn;
+- static offset = FIRST_METHOD_OFFSET;
++ static int offset = FIRST_METHOD_OFFSET;
+
+ xlsave1(fcn);
+ fcn = cvsubr(funtab[offset].fd_subr,funtab[offset].fd_type,offset);
+diff --git a/src/c/postscript.c b/src/c/postscript.c
+index 6ddbfb9..ea57351 100644
+--- a/src/c/postscript.c
++++ b/src/c/postscript.c
+@@ -9,6 +9,7 @@
+ /* pbmtops.c - read a portable bitmap and produce a PostScript bitmap file
+ **
+ ** Copyright (C) 1988 by Jef Poskanzer.
++** Copyright (C) 2025 by Artyom V. Poptsov <poptsov.artyom@gmail.com>
+ **
+ ** Permission to use, copy, modify, and distribute this software and its
+ ** documentation for any purpose and without fee is hereby granted, provided
+@@ -60,7 +61,7 @@ static FILE *fp;
+ /**************************************************************************/
+
+ /* set up global variables and print the postscript preamble */
+-psputinit(file, cols, rows, scale )
++void psputinit(file, cols, rows, scale )
+ FILEP file;
+ int cols, rows;
+ double scale;
+@@ -120,7 +121,7 @@ psputinit(file, cols, rows, scale )
+ }
+
+ /* enter a bit into the image */
+-psputbit(b)
++void psputbit(b)
+ int b;
+ {
+ if ( bitsperitem == 8 ) {
+@@ -133,7 +134,7 @@ psputbit(b)
+ }
+
+ /* clean up and print the showpage command */
+-psputrest( )
++void psputrest( )
+ {
+ if ( bitsperitem > 0 )
+ putitem( );
+diff --git a/src/include/sysvr4-foreign.h b/src/include/sysvr4-foreign.h
+index f40acc8..709fc6c 100644
+--- a/src/include/sysvr4-foreign.h
++++ b/src/include/sysvr4-foreign.h
+@@ -16,7 +16,7 @@ LOCAL VOID link_and_load(fname, libs, fort)
+ char *fname, *libs;
+ int fort;
+ {
+- static initialized = FALSE;
++ static int initialized = FALSE;
+ void *handle;
+
+ if (! initialized) {
+--
+2.51.0
+
generated by cgit v1.2.3 (git 2.50.1) at 2025-10-24 21:47:10 +0000