wok-next rev 21723

busybox: update patches
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Sep 01 10:44:52 2020 +0000 (4 months ago)
parents 607d608abcf0
children af02f8a36062
files busybox/stuff/patches/ash.u busybox/stuff/patches/cmdline.u busybox/stuff/patches/cpio.u busybox/stuff/patches/diet.u busybox/stuff/patches/diff.u busybox/stuff/patches/httpd.u busybox/stuff/patches/losetup.u busybox/stuff/patches/mkfs_vfat.u busybox/stuff/patches/ris.u busybox/stuff/patches/scriptreplay.u busybox/stuff/patches/series busybox/stuff/patches/shutdown.u busybox/stuff/patches/stat.u busybox/stuff/patches/tar.u busybox/stuff/patches/zmodules.u
line diff
     1.1 --- a/busybox/stuff/patches/ash.u	Tue Sep 01 10:31:46 2020 +0000
     1.2 +++ b/busybox/stuff/patches/ash.u	Tue Sep 01 10:44:52 2020 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  Some SliTaz scripts (cook) need that... 
     1.5 ---- busybox-1.27/shell/ash.c
     1.6 -+++ busybox-1.27/shell/ash.c
     1.7 -@@ -12632,7 +12632,13 @@
     1.8 +--- busybox-1.31/shell/ash.c
     1.9 ++++ busybox-1.31/shell/ash.c
    1.10 +@@ -13304,7 +13304,13 @@
    1.11   	if (strchr(name, '/'))
    1.12   		return name;
    1.13   
     2.1 --- a/busybox/stuff/patches/cmdline.u	Tue Sep 01 10:31:46 2020 +0000
     2.2 +++ b/busybox/stuff/patches/cmdline.u	Tue Sep 01 10:44:52 2020 +0000
     2.3 @@ -1,7 +1,6 @@
     2.4 -Display command line in usage output. Useful to debug scripts with variables.
     2.5 ---- busybox-1.27/libbb/appletlib.c
     2.6 -+++ busybox-1.27/libbb/appletlib.c
     2.7 -@@ -129,9 +129,16 @@
     2.8 +--- busybox-1.30/libbb/appletlib.c
     2.9 ++++ busybox-1.30/libbb/appletlib.c
    2.10 +@@ -118,9 +118,16 @@
    2.11   
    2.12   #endif /* FEATURE_COMPRESS_USAGE */
    2.13   
    2.14 @@ -18,16 +17,16 @@
    2.15  +
    2.16   	if (ENABLE_SHOW_USAGE) {
    2.17   #ifdef SINGLE_APPLET_STR
    2.18 - 		/* Imagine that this applet is "true". Dont suck in printf! */
    2.19 -@@ -753,6 +760,7 @@
    2.20 - /* If we were called as "busybox..." */
    2.21 - static int busybox_main(char **argv)
    2.22 + 		/* Imagine that this applet is "true". Dont link in printf! */
    2.23 +@@ -820,6 +827,7 @@
    2.24 + #  endif
    2.25 + int busybox_main(int argc UNUSED_PARAM, char **argv)
    2.26   {
    2.27  +	bb_argv = argv;
    2.28   	if (!argv[1]) {
    2.29   		/* Called without arguments */
    2.30   		const char *a;
    2.31 -@@ -952,6 +960,7 @@
    2.32 +@@ -1033,6 +1041,7 @@
    2.33   int main(int argc UNUSED_PARAM, char **argv)
    2.34   #endif
    2.35   {
     3.1 --- a/busybox/stuff/patches/cpio.u	Tue Sep 01 10:31:46 2020 +0000
     3.2 +++ b/busybox/stuff/patches/cpio.u	Tue Sep 01 10:44:52 2020 +0000
     3.3 @@ -1,6 +1,6 @@
     3.4 ---- busybox-1.25/archival/cpio.c
     3.5 -+++ busybox-1.25/archival/cpio.c
     3.6 -@@ -244,6 +244,9 @@
     3.7 +--- busybox-1.31/archival/cpio.c
     3.8 ++++ busybox-1.31/archival/cpio.c
     3.9 +@@ -247,6 +247,9 @@
    3.10   			if (!(S_ISLNK(st.st_mode) || S_ISREG(st.st_mode)))
    3.11   				st.st_size = 0; /* paranoia */
    3.12   
     4.1 --- a/busybox/stuff/patches/diet.u	Tue Sep 01 10:31:46 2020 +0000
     4.2 +++ b/busybox/stuff/patches/diet.u	Tue Sep 01 10:44:52 2020 +0000
     4.3 @@ -1,7 +1,7 @@
     4.4 ---- busybox-1.25/include/platform.h
     4.5 -+++ busybox-1.25/include/platform.h
     4.6 -@@ -506,6 +506,20 @@
     4.7 - # undef HAVE_NET_ETHERNET_H
     4.8 +--- busybox-1.31/include/platform.h
     4.9 ++++ busybox-1.31/include/platform.h
    4.10 +@@ -533,6 +533,25 @@
    4.11 + # undef HAVE_PRINTF_PERCENTM
    4.12   #endif
    4.13   
    4.14  +#if defined(__dietlibc__)
    4.15 @@ -12,18 +12,23 @@
    4.16  +# define S_TYPEISMQ(x)	0
    4.17  +# define S_TYPEISSEM(x)	0
    4.18  +# define S_TYPEISSHM(x)	0
    4.19 ++# define O_CLOEXEC		0
    4.20  +# undef HAVE_STRVERSCMP
    4.21  +# undef HAVE_DPRINTF
    4.22  +# undef HAVE_STRCASESTR
    4.23 ++#undef ALWAYS_INLINE
    4.24 ++#define ALWAYS_INLINE inline
    4.25 ++#undef NOINLINE
    4.26 ++#define NOINLINE
    4.27  +# define ttyname_r(a,b,c)	(strlcpy(b, ttyname(a), c) == 0)
    4.28  +#endif
    4.29  + 
    4.30   /*
    4.31    * Now, define prototypes for all the functions defined in platform.c
    4.32    * These must come after all the HAVE_* macros are defined (or not)
    4.33 ---- busybox-1.25/networking/ping.c
    4.34 -+++ busybox-1.25/networking/ping.c
    4.35 -@@ -30,6 +30,84 @@
    4.36 +--- busybox-1.31/networking/ping.c
    4.37 ++++ busybox-1.31/networking/ping.c
    4.38 +@@ -123,6 +124,84 @@
    4.39   #include "libbb.h"
    4.40   #include "common_bufsiz.h"
    4.41   
     5.1 --- a/busybox/stuff/patches/diff.u	Tue Sep 01 10:31:46 2020 +0000
     5.2 +++ b/busybox/stuff/patches/diff.u	Tue Sep 01 10:44:52 2020 +0000
     5.3 @@ -1,6 +1,6 @@
     5.4 ---- busybox-1.26/editors/diff.c
     5.5 -+++ busybox-1.26/editors/diff.c
     5.6 -@@ -111,6 +111,7 @@
     5.7 +--- busybox-1.31/editors/diff.c
     5.8 ++++ busybox-1.31/editors/diff.c
     5.9 +@@ -109,6 +109,7 @@
    5.10   //usage:     "\n	-B	Ignore changes whose lines are all blank"
    5.11   //usage:     "\n	-d	Try hard to find a smaller set of changes"
    5.12   //usage:     "\n	-i	Ignore case differences"
    5.13 @@ -8,7 +8,7 @@
    5.14   //usage:     "\n	-L	Use LABEL instead of the filename in the unified header"
    5.15   //usage:     "\n	-N	Treat absent files as empty"
    5.16   //usage:     "\n	-q	Output only whether files differ"
    5.17 -@@ -142,6 +143,7 @@
    5.18 +@@ -140,6 +141,7 @@
    5.19   	FLAG_b,
    5.20   	FLAG_d,
    5.21   	FLAG_i,
    5.22 @@ -16,7 +16,7 @@
    5.23   	FLAG_L,         /* never used, handled by getopt32 */
    5.24   	FLAG_N,
    5.25   	FLAG_q,
    5.26 -@@ -756,6 +758,14 @@
    5.27 +@@ -754,6 +756,14 @@
    5.28   		j = fread(buf1, 1, sz, fp[1]);
    5.29   		if (i != j) {
    5.30   			differ = true;
    5.31 @@ -31,7 +31,7 @@
    5.32   			i = MIN(i, j);
    5.33   		}
    5.34   		if (i == 0)
    5.35 -@@ -869,7 +879,9 @@
    5.36 +@@ -867,7 +877,9 @@
    5.37   		 * Using list.len to specify its length,
    5.38   		 * add_to_dirlist will remove it. */
    5.39   		list[i].len = strlen(p[i]);
    5.40 @@ -42,12 +42,12 @@
    5.41   				add_to_dirlist, skip_dir, &list[i], 0);
    5.42   		/* Sort dl alphabetically.
    5.43   		 * GNU diff does this ignoring any number of trailing dots.
    5.44 -@@ -983,7 +995,7 @@
    5.45 - #if ENABLE_FEATURE_DIFF_LONG_OPTIONS
    5.46 - 	applet_long_options = diff_longopts;
    5.47 - #endif
    5.48 --	getopt32(argv, "abdiL:*NqrsS:tTU:+wupBE",
    5.49 -+	getopt32(argv, "abdilL:*NqrsS:tTU:+wupBE",
    5.50 +@@ -982,7 +994,7 @@
    5.51 + 	INIT_G();
    5.52 + 
    5.53 + 	/* exactly 2 params; collect multiple -L <label>; -U N */
    5.54 +-	GETOPT32(argv, "^" "abdiL:*NqrsS:tTU:+wupBE" "\0" "=2"
    5.55 ++	GETOPT32(argv, "^" "abdilL:*NqrsS:tTU:+wupBE" "\0" "=2"
    5.56 + 			LONGOPTS,
    5.57   			&L_arg, &s_start, &opt_U_context);
    5.58   	argv += optind;
    5.59 - 	while (L_arg)
     6.1 --- a/busybox/stuff/patches/httpd.u	Tue Sep 01 10:31:46 2020 +0000
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,26 +0,0 @@
     6.4 -From 2b400d9b2b7309d6e479102fc3ce646e893058a5 Mon Sep 17 00:00:00 2001
     6.5 -From: Denys Vlasenko <vda.linux@googlemail.com>
     6.6 -Date: Mon, 18 Sep 2017 13:09:11 +0200
     6.7 -Subject: httpd: fix handling of range requests
     6.8 -
     6.9 -Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
    6.10 ----
    6.11 - networking/httpd.c | 2 +-
    6.12 - 1 file changed, 1 insertion(+), 1 deletion(-)
    6.13 -
    6.14 -diff --git a/networking/httpd.c b/networking/httpd.c
    6.15 -index e072f23..5e32fc9 100644
    6.16 ---- a/networking/httpd.c
    6.17 -+++ b/networking/httpd.c
    6.18 -@@ -2337,7 +2337,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
    6.19 - 			if (STRNCASECMP(iobuf, "Range:") == 0) {
    6.20 - 				/* We know only bytes=NNN-[MMM] */
    6.21 - 				char *s = skip_whitespace(iobuf + sizeof("Range:")-1);
    6.22 --				if (is_prefixed_with(s, "bytes=") == 0) {
    6.23 -+				if (is_prefixed_with(s, "bytes=")) {
    6.24 - 					s += sizeof("bytes=")-1;
    6.25 - 					range_start = BB_STRTOOFF(s, &s, 10);
    6.26 - 					if (s[0] != '-' || range_start < 0) {
    6.27 --- 
    6.28 -cgit v0.12
    6.29 -
     7.1 --- a/busybox/stuff/patches/losetup.u	Tue Sep 01 10:31:46 2020 +0000
     7.2 +++ b/busybox/stuff/patches/losetup.u	Tue Sep 01 10:44:52 2020 +0000
     7.3 @@ -1,7 +1,7 @@
     7.4  keep previous default behaviour and display cloop devices
     7.5 ---- busybox-1.26/util-linux/losetup.c
     7.6 -+++ busybox-1.26/util-linux/losetup.c
     7.7 -@@ -82,17 +82,21 @@
     7.8 +--- busybox-1.31/util-linux/losetup.c
     7.9 ++++ busybox-1.31/util-linux/losetup.c
    7.10 +@@ -96,17 +96,21 @@
    7.11   	}
    7.12   
    7.13   	/* -a */
     8.1 --- a/busybox/stuff/patches/mkfs_vfat.u	Tue Sep 01 10:31:46 2020 +0000
     8.2 +++ b/busybox/stuff/patches/mkfs_vfat.u	Tue Sep 01 10:44:52 2020 +0000
     8.3 @@ -1,6 +1,6 @@
     8.4 ---- busybox-1.27/util-linux/mkfs_vfat.c
     8.5 -+++ busybox-1.27/util-linux/mkfs_vfat.c
     8.6 -@@ -239,6 +239,7 @@
     8.7 +--- busybox-1.31/util-linux/mkfs_vfat.c
     8.8 ++++ busybox-1.31/util-linux/mkfs_vfat.c
     8.9 +@@ -226,6 +226,7 @@
    8.10   	char *device_name;
    8.11   	uoff_t volume_size_bytes;
    8.12   	uoff_t volume_size_sect;
    8.13 @@ -8,7 +8,7 @@
    8.14   	uint32_t total_clust;
    8.15   	uint32_t volume_id;
    8.16   	int dev;
    8.17 -@@ -287,6 +288,7 @@
    8.18 +@@ -275,6 +276,7 @@
    8.19   	// Get image size and sector size
    8.20   	//
    8.21   	bytes_per_sect = SECTOR_SIZE;
    8.22 @@ -16,7 +16,7 @@
    8.23   	if (!S_ISBLK(st.st_mode)) {
    8.24   		if (!S_ISREG(st.st_mode)) {
    8.25   			if (!argv[1])
    8.26 -@@ -343,6 +345,7 @@
    8.27 +@@ -331,6 +333,7 @@
    8.28   			// hard drive
    8.29   			sect_per_track = geometry.sectors;
    8.30   			heads = geometry.heads;
    8.31 @@ -24,7 +24,7 @@
    8.32   
    8.33    set_cluster_size:
    8.34   			/* For FAT32, try to do the same as M$'s format command
    8.35 -@@ -510,7 +513,7 @@
    8.36 +@@ -498,7 +501,7 @@
    8.37   		//STORE_LE(boot_blk->sect_per_fat, 0);
    8.38   		STORE_LE(boot_blk->sect_per_track, sect_per_track);
    8.39   		STORE_LE(boot_blk->heads, heads);
     9.1 --- a/busybox/stuff/patches/ris.u	Tue Sep 01 10:31:46 2020 +0000
     9.2 +++ b/busybox/stuff/patches/ris.u	Tue Sep 01 10:44:52 2020 +0000
     9.3 @@ -1,9 +1,9 @@
     9.4  Add support for the Windows Remote Installation Service
     9.5 ---- busybox-1.26/networking/tftp.c
     9.6 -+++ busybox-1.26/networking/tftp.c
     9.7 -@@ -39,6 +39,15 @@
     9.8 - //config:comment "Common options for tftp/tftpd"
     9.9 - //config:	depends on TFTP || TFTPD
    9.10 +--- busybox-1.31.0/networking/tftp.c
    9.11 ++++ busybox-1.31.0/networking/tftp.c
    9.12 +@@ -46,6 +46,15 @@
    9.13 + //config:	In other words: it should be run from inetd in nowait mode,
    9.14 + //config:	or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR"
    9.15   //config:
    9.16  +//config:config FEATURE_TFTPD_RIS
    9.17  +//config:	bool "Enable \"RIS\" support"
    9.18 @@ -17,7 +17,7 @@
    9.19   //config:config FEATURE_TFTP_GET
    9.20   //config:	bool "Enable 'tftp get' and/or tftpd upload code"
    9.21   //config:	default y
    9.22 -@@ -743,6 +752,59 @@
    9.23 +@@ -747,6 +756,59 @@
    9.24   #undef remote_file
    9.25   }
    9.26   
    9.27 @@ -77,7 +77,7 @@
    9.28   #if ENABLE_TFTP
    9.29   
    9.30   int tftp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
    9.31 -@@ -891,6 +953,10 @@
    9.32 +@@ -935,6 +997,10 @@
    9.33   	G.block_buf_tail[0] = '\0';
    9.34   
    9.35   	local_file = G.block_buf + 2;
    10.1 --- a/busybox/stuff/patches/scriptreplay.u	Tue Sep 01 10:31:46 2020 +0000
    10.2 +++ b/busybox/stuff/patches/scriptreplay.u	Tue Sep 01 10:44:52 2020 +0000
    10.3 @@ -1,6 +1,6 @@
    10.4 ---- busybox-1.26/util-linux/scriptreplay.c
    10.5 -+++ busybox-1.26/util-linux/scriptreplay.c
    10.6 -@@ -18,10 +18,20 @@
    10.7 +--- busybox-1.31/util-linux/scriptreplay.c
    10.8 ++++ busybox-1.31/util-linux/scriptreplay.c
    10.9 +@@ -17,10 +17,20 @@
   10.10   
   10.11   //kbuild:lib-$(CONFIG_SCRIPTREPLAY) += scriptreplay.o
   10.12   
   10.13 @@ -12,7 +12,7 @@
   10.14  +//config:	  Tune replay speed with + - = space return hotkeys.
   10.15  +
   10.16   //usage:#define scriptreplay_trivial_usage
   10.17 - //usage:       "timingfile [typescript [divisor]]"
   10.18 + //usage:       "TIMINGFILE [TYPESCRIPT [DIVISOR]]"
   10.19   //usage:#define scriptreplay_full_usage "\n\n"
   10.20   //usage:       "Play back typescripts, using timing information"
   10.21  +//usage:	IF_SCRIPTREPLAY_HOTKEYS(
   10.22 @@ -21,7 +21,7 @@
   10.23   
   10.24   #include "libbb.h"
   10.25   
   10.26 -@@ -31,6 +41,10 @@
   10.27 +@@ -30,6 +40,10 @@
   10.28   	const char *script = "typescript";
   10.29   	double delay, factor = 1000000.0;
   10.30   	int fd;
   10.31 @@ -32,7 +32,7 @@
   10.32   	unsigned long count;
   10.33   	FILE *tfp;
   10.34   
   10.35 -@@ -48,6 +62,21 @@
   10.36 +@@ -47,6 +61,21 @@
   10.37   	while (fscanf(tfp, "%lf %lu\n", &delay, &count) == 2) {
   10.38   		usleep(delay * factor);
   10.39   		bb_copyfd_exact_size(fd, STDOUT_FILENO, count);
    11.1 --- a/busybox/stuff/patches/series	Tue Sep 01 10:31:46 2020 +0000
    11.2 +++ b/busybox/stuff/patches/series	Tue Sep 01 10:44:52 2020 +0000
    11.3 @@ -12,4 +12,3 @@
    11.4  scriptreplay.u
    11.5  mkfs_vfat.u
    11.6  ash.u
    11.7 -httpd.u
    12.1 --- a/busybox/stuff/patches/shutdown.u	Tue Sep 01 10:31:46 2020 +0000
    12.2 +++ b/busybox/stuff/patches/shutdown.u	Tue Sep 01 10:44:52 2020 +0000
    12.3 @@ -1,6 +1,6 @@
    12.4 ---- busybox-1.27/init/halt.c
    12.5 -+++ busybox-1.27/init/halt.c
    12.6 -@@ -49,6 +49,7 @@
    12.7 +--- busybox-1.31/init/halt.c
    12.8 ++++ busybox-1.31/init/halt.c
    12.9 +@@ -59,6 +59,7 @@
   12.10   //                   APPLET_ODDNAME:name      main  location     suid_type     help
   12.11   //applet:IF_POWEROFF(APPLET_ODDNAME(poweroff, halt, BB_DIR_SBIN, BB_SUID_DROP, poweroff))
   12.12   //applet:IF_REBOOT(  APPLET_ODDNAME(reboot,   halt, BB_DIR_SBIN, BB_SUID_DROP, reboot))
   12.13 @@ -8,7 +8,7 @@
   12.14   
   12.15   //kbuild:lib-$(CONFIG_HALT) += halt.o
   12.16   //kbuild:lib-$(CONFIG_POWEROFF) += halt.o
   12.17 -@@ -80,6 +81,15 @@
   12.18 +@@ -90,6 +91,15 @@
   12.19   //usage:     "\n	-d SEC	Delay interval"
   12.20   //usage:     "\n	-n	Do not sync"
   12.21   //usage:     "\n	-f	Force (don't go through init)"
   12.22 @@ -24,7 +24,7 @@
   12.23   
   12.24   #include "libbb.h"
   12.25   #include "reboot.h"
   12.26 -@@ -113,6 +123,7 @@
   12.27 +@@ -164,6 +174,7 @@
   12.28   int halt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
   12.29   int halt_main(int argc UNUSED_PARAM, char **argv)
   12.30   {
   12.31 @@ -32,7 +32,7 @@
   12.32   	static const int magic[] = {
   12.33   		RB_HALT_SYSTEM,
   12.34   		RB_POWER_OFF,
   12.35 -@@ -133,15 +144,26 @@
   12.36 +@@ -184,15 +195,26 @@
   12.37   	if (!ENABLE_HALT && !ENABLE_POWEROFF && ENABLE_REBOOT)
   12.38   		which = 2;
   12.39   	else
    13.1 --- a/busybox/stuff/patches/stat.u	Tue Sep 01 10:31:46 2020 +0000
    13.2 +++ b/busybox/stuff/patches/stat.u	Tue Sep 01 10:44:52 2020 +0000
    13.3 @@ -1,8 +1,8 @@
    13.4  Add non standard stat -m support to display file block list
    13.5  Useful to patch read-only filesystems such as ISO9660, for defragmentation
    13.6  tools or boot loaders
    13.7 ---- busybox-1.26/coreutils/stat.c
    13.8 -+++ busybox-1.26/coreutils/stat.c
    13.9 +--- busybox-1.31/coreutils/stat.c
   13.10 ++++ busybox-1.31/coreutils/stat.c
   13.11  @@ -54,6 +54,7 @@
   13.12   //usage:	)
   13.13   //usage:     "\n	-L	Follow links"
   13.14 @@ -29,7 +29,7 @@
   13.15   };
   13.16   
   13.17   #if ENABLE_FEATURE_STAT_FORMAT
   13.18 -@@ -463,6 +466,25 @@
   13.19 +@@ -467,6 +470,25 @@
   13.20   }
   13.21   #endif  /* FEATURE_STAT_FORMAT */
   13.22   
   13.23 @@ -55,22 +55,24 @@
   13.24   #if ENABLE_FEATURE_STAT_FILESYSTEM
   13.25   /* Stat the file system and print what we find.  */
   13.26   #if !ENABLE_FEATURE_STAT_FORMAT
   13.27 -@@ -763,7 +785,7 @@
   13.28 - 	statfunc_ptr statfunc = do_stat;
   13.29 - 
   13.30 - 	opt_complementary = "-1"; /* min one arg */
   13.31 --	opts = getopt32(argv, "tL"
   13.32 -+	opts = getopt32(argv, "tLm"
   13.33 +@@ -770,7 +792,7 @@
   13.34 + 	opts =
   13.35 + #endif
   13.36 + 	getopt32(argv, "^"
   13.37 +-		"tL"
   13.38 ++		"tLm"
   13.39   		IF_FEATURE_STAT_FILESYSTEM("f")
   13.40   		IF_SELINUX("Z")
   13.41 - 		IF_FEATURE_STAT_FORMAT("c:", &format)
   13.42 -@@ -777,6 +799,9 @@
   13.43 + 		IF_FEATURE_STAT_FORMAT("c:")
   13.44 +@@ -786,6 +808,11 @@
   13.45   		selinux_or_die();
   13.46   	}
   13.47   #endif
   13.48 ++#if ENABLE_FEATURE_STAT_FILESYSTEM
   13.49  + 	if (opts & OPT_MAP) { /* -m */
   13.50  + 		statfunc = do_mapfile;
   13.51  +	}
   13.52 ++#endif
   13.53   	ok = 1;
   13.54   	argv += optind;
   13.55   	for (i = 0; argv[i]; ++i)
    14.1 --- a/busybox/stuff/patches/tar.u	Tue Sep 01 10:31:46 2020 +0000
    14.2 +++ b/busybox/stuff/patches/tar.u	Tue Sep 01 10:44:52 2020 +0000
    14.3 @@ -1,7 +1,7 @@
    14.4  Accept and ignore --wildcards argument
    14.5 ---- busybox-1.27/archival/tar.c
    14.6 -+++ busybox-1.27/archival/tar.c
    14.7 -@@ -924,6 +924,7 @@
    14.8 +--- busybox-1.31/archival/tar.c
    14.9 ++++ busybox-1.31/archival/tar.c
   14.10 +@@ -915,6 +915,7 @@
   14.11   # if ENABLE_FEATURE_TAR_NOPRESERVE_TIME
   14.12   	"touch\0"               No_argument       "m"
   14.13   # endif
    15.1 --- a/busybox/stuff/patches/zmodules.u	Tue Sep 01 10:31:46 2020 +0000
    15.2 +++ b/busybox/stuff/patches/zmodules.u	Tue Sep 01 10:44:52 2020 +0000
    15.3 @@ -1,10 +1,10 @@
    15.4  Add LZMA_DEFAULT_MAGIC support
    15.5 ---- busybox-1.25/archival/libarchive/open_transformer.c
    15.6 -+++ busybox-1.25/archival/libarchive/open_transformer.c
    15.7 -@@ -174,6 +174,23 @@
    15.8 - 	/* .gz and .bz2 both have 2-byte signature, and their
    15.9 +--- busybox-1.31/archival/libarchive/open_transformer.c
   15.10 ++++ busybox-1.31/archival/libarchive/open_transformer.c
   15.11 +@@ -168,6 +168,23 @@
   15.12   	 * unpack_XXX_stream wants this header skipped. */
   15.13 - 	xread(fd, magic.b16, sizeof(magic.b16[0]));
   15.14 + 	xstate->signature_skipped = 2;
   15.15 + 	xread(fd, xstate->magic.b16, 2);
   15.16  +#if 1
   15.17  +// SliTaz may use .gz suffix for lzma'd kernel modules
   15.18  +#if BB_BIG_ENDIAN
   15.19 @@ -13,7 +13,7 @@
   15.20  +#define LZMA_DEFAULT_MAGIC 0x5d
   15.21  +#endif
   15.22  +	if (ENABLE_FEATURE_SEAMLESS_LZMA
   15.23 -+	 && magic.b16[0] == LZMA_DEFAULT_MAGIC
   15.24 ++	 && xstate->magic.b16[0] == LZMA_DEFAULT_MAGIC
   15.25  +	) {
   15.26  +		xlseek(fd, -xstate->signature_skipped, SEEK_CUR);
   15.27  +		xstate->signature_skipped = 0;
   15.28 @@ -23,5 +23,5 @@
   15.29  +	}
   15.30  +#endif
   15.31   	if (ENABLE_FEATURE_SEAMLESS_GZ
   15.32 - 	 && magic.b16[0] == GZIP_MAGIC
   15.33 + 	 && xstate->magic.b16[0] == GZIP_MAGIC
   15.34   	) {