# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1598957092 0
# Node ID 9616e3b570451086d890435f06097614a08159ee
# Parent  607d608abcf0ce5b56c14375436a328ea1b238ce
busybox: update patches

diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/ash.u
--- a/busybox/stuff/patches/ash.u	Tue Sep 01 10:31:46 2020 +0000
+++ b/busybox/stuff/patches/ash.u	Tue Sep 01 10:44:52 2020 +0000
@@ -1,7 +1,7 @@
 Some SliTaz scripts (cook) need that... 
---- busybox-1.27/shell/ash.c
-+++ busybox-1.27/shell/ash.c
-@@ -12632,7 +12632,13 @@
+--- busybox-1.31/shell/ash.c
++++ busybox-1.31/shell/ash.c
+@@ -13304,7 +13304,13 @@
  	if (strchr(name, '/'))
  		return name;
  
diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/cmdline.u
--- a/busybox/stuff/patches/cmdline.u	Tue Sep 01 10:31:46 2020 +0000
+++ b/busybox/stuff/patches/cmdline.u	Tue Sep 01 10:44:52 2020 +0000
@@ -1,7 +1,6 @@
-Display command line in usage output. Useful to debug scripts with variables.
---- busybox-1.27/libbb/appletlib.c
-+++ busybox-1.27/libbb/appletlib.c
-@@ -129,9 +129,16 @@
+--- busybox-1.30/libbb/appletlib.c
++++ busybox-1.30/libbb/appletlib.c
+@@ -118,9 +118,16 @@
  
  #endif /* FEATURE_COMPRESS_USAGE */
  
@@ -18,16 +17,16 @@
 +
  	if (ENABLE_SHOW_USAGE) {
  #ifdef SINGLE_APPLET_STR
- 		/* Imagine that this applet is "true". Dont suck in printf! */
-@@ -753,6 +760,7 @@
- /* If we were called as "busybox..." */
- static int busybox_main(char **argv)
+ 		/* Imagine that this applet is "true". Dont link in printf! */
+@@ -820,6 +827,7 @@
+ #  endif
+ int busybox_main(int argc UNUSED_PARAM, char **argv)
  {
 +	bb_argv = argv;
  	if (!argv[1]) {
  		/* Called without arguments */
  		const char *a;
-@@ -952,6 +960,7 @@
+@@ -1033,6 +1041,7 @@
  int main(int argc UNUSED_PARAM, char **argv)
  #endif
  {
diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/cpio.u
--- a/busybox/stuff/patches/cpio.u	Tue Sep 01 10:31:46 2020 +0000
+++ b/busybox/stuff/patches/cpio.u	Tue Sep 01 10:44:52 2020 +0000
@@ -1,6 +1,6 @@
---- busybox-1.25/archival/cpio.c
-+++ busybox-1.25/archival/cpio.c
-@@ -244,6 +244,9 @@
+--- busybox-1.31/archival/cpio.c
++++ busybox-1.31/archival/cpio.c
+@@ -247,6 +247,9 @@
  			if (!(S_ISLNK(st.st_mode) || S_ISREG(st.st_mode)))
  				st.st_size = 0; /* paranoia */
  
diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/diet.u
--- a/busybox/stuff/patches/diet.u	Tue Sep 01 10:31:46 2020 +0000
+++ b/busybox/stuff/patches/diet.u	Tue Sep 01 10:44:52 2020 +0000
@@ -1,7 +1,7 @@
---- busybox-1.25/include/platform.h
-+++ busybox-1.25/include/platform.h
-@@ -506,6 +506,20 @@
- # undef HAVE_NET_ETHERNET_H
+--- busybox-1.31/include/platform.h
++++ busybox-1.31/include/platform.h
+@@ -533,6 +533,25 @@
+ # undef HAVE_PRINTF_PERCENTM
  #endif
  
 +#if defined(__dietlibc__)
@@ -12,18 +12,23 @@
 +# define S_TYPEISMQ(x)	0
 +# define S_TYPEISSEM(x)	0
 +# define S_TYPEISSHM(x)	0
++# define O_CLOEXEC		0
 +# undef HAVE_STRVERSCMP
 +# undef HAVE_DPRINTF
 +# undef HAVE_STRCASESTR
++#undef ALWAYS_INLINE
++#define ALWAYS_INLINE inline
++#undef NOINLINE
++#define NOINLINE
 +# define ttyname_r(a,b,c)	(strlcpy(b, ttyname(a), c) == 0)
 +#endif
 + 
  /*
   * Now, define prototypes for all the functions defined in platform.c
   * These must come after all the HAVE_* macros are defined (or not)
---- busybox-1.25/networking/ping.c
-+++ busybox-1.25/networking/ping.c
-@@ -30,6 +30,84 @@
+--- busybox-1.31/networking/ping.c
++++ busybox-1.31/networking/ping.c
+@@ -123,6 +124,84 @@
  #include "libbb.h"
  #include "common_bufsiz.h"
  
diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/diff.u
--- a/busybox/stuff/patches/diff.u	Tue Sep 01 10:31:46 2020 +0000
+++ b/busybox/stuff/patches/diff.u	Tue Sep 01 10:44:52 2020 +0000
@@ -1,6 +1,6 @@
---- busybox-1.26/editors/diff.c
-+++ busybox-1.26/editors/diff.c
-@@ -111,6 +111,7 @@
+--- busybox-1.31/editors/diff.c
++++ busybox-1.31/editors/diff.c
+@@ -109,6 +109,7 @@
  //usage:     "\n	-B	Ignore changes whose lines are all blank"
  //usage:     "\n	-d	Try hard to find a smaller set of changes"
  //usage:     "\n	-i	Ignore case differences"
@@ -8,7 +8,7 @@
  //usage:     "\n	-L	Use LABEL instead of the filename in the unified header"
  //usage:     "\n	-N	Treat absent files as empty"
  //usage:     "\n	-q	Output only whether files differ"
-@@ -142,6 +143,7 @@
+@@ -140,6 +141,7 @@
  	FLAG_b,
  	FLAG_d,
  	FLAG_i,
@@ -16,7 +16,7 @@
  	FLAG_L,         /* never used, handled by getopt32 */
  	FLAG_N,
  	FLAG_q,
-@@ -756,6 +758,14 @@
+@@ -754,6 +756,14 @@
  		j = fread(buf1, 1, sz, fp[1]);
  		if (i != j) {
  			differ = true;
@@ -31,7 +31,7 @@
  			i = MIN(i, j);
  		}
  		if (i == 0)
-@@ -869,7 +879,9 @@
+@@ -867,7 +877,9 @@
  		 * Using list.len to specify its length,
  		 * add_to_dirlist will remove it. */
  		list[i].len = strlen(p[i]);
@@ -42,12 +42,12 @@
  				add_to_dirlist, skip_dir, &list[i], 0);
  		/* Sort dl alphabetically.
  		 * GNU diff does this ignoring any number of trailing dots.
-@@ -983,7 +995,7 @@
- #if ENABLE_FEATURE_DIFF_LONG_OPTIONS
- 	applet_long_options = diff_longopts;
- #endif
--	getopt32(argv, "abdiL:*NqrsS:tTU:+wupBE",
-+	getopt32(argv, "abdilL:*NqrsS:tTU:+wupBE",
+@@ -982,7 +994,7 @@
+ 	INIT_G();
+ 
+ 	/* exactly 2 params; collect multiple -L <label>; -U N */
+-	GETOPT32(argv, "^" "abdiL:*NqrsS:tTU:+wupBE" "\0" "=2"
++	GETOPT32(argv, "^" "abdilL:*NqrsS:tTU:+wupBE" "\0" "=2"
+ 			LONGOPTS,
  			&L_arg, &s_start, &opt_U_context);
  	argv += optind;
- 	while (L_arg)
diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/httpd.u
--- a/busybox/stuff/patches/httpd.u	Tue Sep 01 10:31:46 2020 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-From 2b400d9b2b7309d6e479102fc3ce646e893058a5 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.linux@googlemail.com>
-Date: Mon, 18 Sep 2017 13:09:11 +0200
-Subject: httpd: fix handling of range requests
-
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- networking/httpd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/networking/httpd.c b/networking/httpd.c
-index e072f23..5e32fc9 100644
---- a/networking/httpd.c
-+++ b/networking/httpd.c
-@@ -2337,7 +2337,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
- 			if (STRNCASECMP(iobuf, "Range:") == 0) {
- 				/* We know only bytes=NNN-[MMM] */
- 				char *s = skip_whitespace(iobuf + sizeof("Range:")-1);
--				if (is_prefixed_with(s, "bytes=") == 0) {
-+				if (is_prefixed_with(s, "bytes=")) {
- 					s += sizeof("bytes=")-1;
- 					range_start = BB_STRTOOFF(s, &s, 10);
- 					if (s[0] != '-' || range_start < 0) {
--- 
-cgit v0.12
-
diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/losetup.u
--- a/busybox/stuff/patches/losetup.u	Tue Sep 01 10:31:46 2020 +0000
+++ b/busybox/stuff/patches/losetup.u	Tue Sep 01 10:44:52 2020 +0000
@@ -1,7 +1,7 @@
 keep previous default behaviour and display cloop devices
---- busybox-1.26/util-linux/losetup.c
-+++ busybox-1.26/util-linux/losetup.c
-@@ -82,17 +82,21 @@
+--- busybox-1.31/util-linux/losetup.c
++++ busybox-1.31/util-linux/losetup.c
+@@ -96,17 +96,21 @@
  	}
  
  	/* -a */
diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/mkfs_vfat.u
--- a/busybox/stuff/patches/mkfs_vfat.u	Tue Sep 01 10:31:46 2020 +0000
+++ b/busybox/stuff/patches/mkfs_vfat.u	Tue Sep 01 10:44:52 2020 +0000
@@ -1,6 +1,6 @@
---- busybox-1.27/util-linux/mkfs_vfat.c
-+++ busybox-1.27/util-linux/mkfs_vfat.c
-@@ -239,6 +239,7 @@
+--- busybox-1.31/util-linux/mkfs_vfat.c
++++ busybox-1.31/util-linux/mkfs_vfat.c
+@@ -226,6 +226,7 @@
  	char *device_name;
  	uoff_t volume_size_bytes;
  	uoff_t volume_size_sect;
@@ -8,7 +8,7 @@
  	uint32_t total_clust;
  	uint32_t volume_id;
  	int dev;
-@@ -287,6 +288,7 @@
+@@ -275,6 +276,7 @@
  	// Get image size and sector size
  	//
  	bytes_per_sect = SECTOR_SIZE;
@@ -16,7 +16,7 @@
  	if (!S_ISBLK(st.st_mode)) {
  		if (!S_ISREG(st.st_mode)) {
  			if (!argv[1])
-@@ -343,6 +345,7 @@
+@@ -331,6 +333,7 @@
  			// hard drive
  			sect_per_track = geometry.sectors;
  			heads = geometry.heads;
@@ -24,7 +24,7 @@
  
   set_cluster_size:
  			/* For FAT32, try to do the same as M$'s format command
-@@ -510,7 +513,7 @@
+@@ -498,7 +501,7 @@
  		//STORE_LE(boot_blk->sect_per_fat, 0);
  		STORE_LE(boot_blk->sect_per_track, sect_per_track);
  		STORE_LE(boot_blk->heads, heads);
diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/ris.u
--- a/busybox/stuff/patches/ris.u	Tue Sep 01 10:31:46 2020 +0000
+++ b/busybox/stuff/patches/ris.u	Tue Sep 01 10:44:52 2020 +0000
@@ -1,9 +1,9 @@
 Add support for the Windows Remote Installation Service
---- busybox-1.26/networking/tftp.c
-+++ busybox-1.26/networking/tftp.c
-@@ -39,6 +39,15 @@
- //config:comment "Common options for tftp/tftpd"
- //config:	depends on TFTP || TFTPD
+--- busybox-1.31.0/networking/tftp.c
++++ busybox-1.31.0/networking/tftp.c
+@@ -46,6 +46,15 @@
+ //config:	In other words: it should be run from inetd in nowait mode,
+ //config:	or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR"
  //config:
 +//config:config FEATURE_TFTPD_RIS
 +//config:	bool "Enable \"RIS\" support"
@@ -17,7 +17,7 @@
  //config:config FEATURE_TFTP_GET
  //config:	bool "Enable 'tftp get' and/or tftpd upload code"
  //config:	default y
-@@ -743,6 +752,59 @@
+@@ -747,6 +756,59 @@
  #undef remote_file
  }
  
@@ -77,7 +77,7 @@
  #if ENABLE_TFTP
  
  int tftp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-@@ -891,6 +953,10 @@
+@@ -935,6 +997,10 @@
  	G.block_buf_tail[0] = '\0';
  
  	local_file = G.block_buf + 2;
diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/scriptreplay.u
--- a/busybox/stuff/patches/scriptreplay.u	Tue Sep 01 10:31:46 2020 +0000
+++ b/busybox/stuff/patches/scriptreplay.u	Tue Sep 01 10:44:52 2020 +0000
@@ -1,6 +1,6 @@
---- busybox-1.26/util-linux/scriptreplay.c
-+++ busybox-1.26/util-linux/scriptreplay.c
-@@ -18,10 +18,20 @@
+--- busybox-1.31/util-linux/scriptreplay.c
++++ busybox-1.31/util-linux/scriptreplay.c
+@@ -17,10 +17,20 @@
  
  //kbuild:lib-$(CONFIG_SCRIPTREPLAY) += scriptreplay.o
  
@@ -12,7 +12,7 @@
 +//config:	  Tune replay speed with + - = space return hotkeys.
 +
  //usage:#define scriptreplay_trivial_usage
- //usage:       "timingfile [typescript [divisor]]"
+ //usage:       "TIMINGFILE [TYPESCRIPT [DIVISOR]]"
  //usage:#define scriptreplay_full_usage "\n\n"
  //usage:       "Play back typescripts, using timing information"
 +//usage:	IF_SCRIPTREPLAY_HOTKEYS(
@@ -21,7 +21,7 @@
  
  #include "libbb.h"
  
-@@ -31,6 +41,10 @@
+@@ -30,6 +40,10 @@
  	const char *script = "typescript";
  	double delay, factor = 1000000.0;
  	int fd;
@@ -32,7 +32,7 @@
  	unsigned long count;
  	FILE *tfp;
  
-@@ -48,6 +62,21 @@
+@@ -47,6 +61,21 @@
  	while (fscanf(tfp, "%lf %lu\n", &delay, &count) == 2) {
  		usleep(delay * factor);
  		bb_copyfd_exact_size(fd, STDOUT_FILENO, count);
diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/series
--- a/busybox/stuff/patches/series	Tue Sep 01 10:31:46 2020 +0000
+++ b/busybox/stuff/patches/series	Tue Sep 01 10:44:52 2020 +0000
@@ -12,4 +12,3 @@
 scriptreplay.u
 mkfs_vfat.u
 ash.u
-httpd.u
diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/shutdown.u
--- a/busybox/stuff/patches/shutdown.u	Tue Sep 01 10:31:46 2020 +0000
+++ b/busybox/stuff/patches/shutdown.u	Tue Sep 01 10:44:52 2020 +0000
@@ -1,6 +1,6 @@
---- busybox-1.27/init/halt.c
-+++ busybox-1.27/init/halt.c
-@@ -49,6 +49,7 @@
+--- busybox-1.31/init/halt.c
++++ busybox-1.31/init/halt.c
+@@ -59,6 +59,7 @@
  //                   APPLET_ODDNAME:name      main  location     suid_type     help
  //applet:IF_POWEROFF(APPLET_ODDNAME(poweroff, halt, BB_DIR_SBIN, BB_SUID_DROP, poweroff))
  //applet:IF_REBOOT(  APPLET_ODDNAME(reboot,   halt, BB_DIR_SBIN, BB_SUID_DROP, reboot))
@@ -8,7 +8,7 @@
  
  //kbuild:lib-$(CONFIG_HALT) += halt.o
  //kbuild:lib-$(CONFIG_POWEROFF) += halt.o
-@@ -80,6 +81,15 @@
+@@ -90,6 +91,15 @@
  //usage:     "\n	-d SEC	Delay interval"
  //usage:     "\n	-n	Do not sync"
  //usage:     "\n	-f	Force (don't go through init)"
@@ -24,7 +24,7 @@
  
  #include "libbb.h"
  #include "reboot.h"
-@@ -113,6 +123,7 @@
+@@ -164,6 +174,7 @@
  int halt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int halt_main(int argc UNUSED_PARAM, char **argv)
  {
@@ -32,7 +32,7 @@
  	static const int magic[] = {
  		RB_HALT_SYSTEM,
  		RB_POWER_OFF,
-@@ -133,15 +144,26 @@
+@@ -184,15 +195,26 @@
  	if (!ENABLE_HALT && !ENABLE_POWEROFF && ENABLE_REBOOT)
  		which = 2;
  	else
diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/stat.u
--- a/busybox/stuff/patches/stat.u	Tue Sep 01 10:31:46 2020 +0000
+++ b/busybox/stuff/patches/stat.u	Tue Sep 01 10:44:52 2020 +0000
@@ -1,8 +1,8 @@
 Add non standard stat -m support to display file block list
 Useful to patch read-only filesystems such as ISO9660, for defragmentation
 tools or boot loaders
---- busybox-1.26/coreutils/stat.c
-+++ busybox-1.26/coreutils/stat.c
+--- busybox-1.31/coreutils/stat.c
++++ busybox-1.31/coreutils/stat.c
 @@ -54,6 +54,7 @@
  //usage:	)
  //usage:     "\n	-L	Follow links"
@@ -29,7 +29,7 @@
  };
  
  #if ENABLE_FEATURE_STAT_FORMAT
-@@ -463,6 +466,25 @@
+@@ -467,6 +470,25 @@
  }
  #endif  /* FEATURE_STAT_FORMAT */
  
@@ -55,22 +55,24 @@
  #if ENABLE_FEATURE_STAT_FILESYSTEM
  /* Stat the file system and print what we find.  */
  #if !ENABLE_FEATURE_STAT_FORMAT
-@@ -763,7 +785,7 @@
- 	statfunc_ptr statfunc = do_stat;
- 
- 	opt_complementary = "-1"; /* min one arg */
--	opts = getopt32(argv, "tL"
-+	opts = getopt32(argv, "tLm"
+@@ -770,7 +792,7 @@
+ 	opts =
+ #endif
+ 	getopt32(argv, "^"
+-		"tL"
++		"tLm"
  		IF_FEATURE_STAT_FILESYSTEM("f")
  		IF_SELINUX("Z")
- 		IF_FEATURE_STAT_FORMAT("c:", &format)
-@@ -777,6 +799,9 @@
+ 		IF_FEATURE_STAT_FORMAT("c:")
+@@ -786,6 +808,11 @@
  		selinux_or_die();
  	}
  #endif
++#if ENABLE_FEATURE_STAT_FILESYSTEM
 + 	if (opts & OPT_MAP) { /* -m */
 + 		statfunc = do_mapfile;
 +	}
++#endif
  	ok = 1;
  	argv += optind;
  	for (i = 0; argv[i]; ++i)
diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/tar.u
--- a/busybox/stuff/patches/tar.u	Tue Sep 01 10:31:46 2020 +0000
+++ b/busybox/stuff/patches/tar.u	Tue Sep 01 10:44:52 2020 +0000
@@ -1,7 +1,7 @@
 Accept and ignore --wildcards argument
---- busybox-1.27/archival/tar.c
-+++ busybox-1.27/archival/tar.c
-@@ -924,6 +924,7 @@
+--- busybox-1.31/archival/tar.c
++++ busybox-1.31/archival/tar.c
+@@ -915,6 +915,7 @@
  # if ENABLE_FEATURE_TAR_NOPRESERVE_TIME
  	"touch\0"               No_argument       "m"
  # endif
diff -r 607d608abcf0 -r 9616e3b57045 busybox/stuff/patches/zmodules.u
--- a/busybox/stuff/patches/zmodules.u	Tue Sep 01 10:31:46 2020 +0000
+++ b/busybox/stuff/patches/zmodules.u	Tue Sep 01 10:44:52 2020 +0000
@@ -1,10 +1,10 @@
 Add LZMA_DEFAULT_MAGIC support
---- busybox-1.25/archival/libarchive/open_transformer.c
-+++ busybox-1.25/archival/libarchive/open_transformer.c
-@@ -174,6 +174,23 @@
- 	/* .gz and .bz2 both have 2-byte signature, and their
+--- busybox-1.31/archival/libarchive/open_transformer.c
++++ busybox-1.31/archival/libarchive/open_transformer.c
+@@ -168,6 +168,23 @@
  	 * unpack_XXX_stream wants this header skipped. */
- 	xread(fd, magic.b16, sizeof(magic.b16[0]));
+ 	xstate->signature_skipped = 2;
+ 	xread(fd, xstate->magic.b16, 2);
 +#if 1
 +// SliTaz may use .gz suffix for lzma'd kernel modules
 +#if BB_BIG_ENDIAN
@@ -13,7 +13,7 @@
 +#define LZMA_DEFAULT_MAGIC 0x5d
 +#endif
 +	if (ENABLE_FEATURE_SEAMLESS_LZMA
-+	 && magic.b16[0] == LZMA_DEFAULT_MAGIC
++	 && xstate->magic.b16[0] == LZMA_DEFAULT_MAGIC
 +	) {
 +		xlseek(fd, -xstate->signature_skipped, SEEK_CUR);
 +		xstate->signature_skipped = 0;
@@ -23,5 +23,5 @@
 +	}
 +#endif
  	if (ENABLE_FEATURE_SEAMLESS_GZ
- 	 && magic.b16[0] == GZIP_MAGIC
+ 	 && xstate->magic.b16[0] == GZIP_MAGIC
  	) {