SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/busybox/stuff/busybox-1.16.1-zmodules.u	Sat Jun 26 11:57:03 2010 +0200
     1.3 @@ -0,0 +1,48 @@
     1.4 +--- busybox-1.16.1/modutils/depmod.c
     1.5 ++++ busybox-1.16.1/modutils/depmod.c
     1.6 +@@ -37,7 +37,10 @@
     1.7 + 	ARG_e = (1<<3), /* with -F, print unresolved symbols */
     1.8 + 	ARG_F = (1<<4), /* System.map that contains the symbols */
     1.9 + 	ARG_n = (1<<5), /* dry-run, print to stdout only */
    1.10 +-	ARG_r = (1<<6)  /* Compat dummy. Linux Makefile uses it */
    1.11 ++	ARG_r = (1<<6), /* Compat dummy. Linux Makefile uses it */
    1.12 ++	ARG_u = (1<<7), /* unresolved-error: ignored */
    1.13 ++	ARG_q = (1<<8), /* quiet: ignored */
    1.14 ++	ARG_C = (1<<9)  /* config: ignored */
    1.15 + };
    1.16 + 
    1.17 + static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARAM,
    1.18 +@@ -143,7 +146,7 @@
    1.19 + 	struct utsname uts;
    1.20 + 	int tmp;
    1.21 + 
    1.22 +-	getopt32(argv, "aAb:eF:nr", &moddir_base, NULL);
    1.23 ++	getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL);
    1.24 + 	argv += optind;
    1.25 + 
    1.26 + 	/* goto modules location */
    1.27 +
    1.28 +--- busybox-1.16.1/libbb/read.c
    1.29 ++++ busybox-1.16.1/libbb/read.c
    1.30 +@@ -328,16 +328,18 @@
    1.31 + 
    1.32 + 	sfx = strrchr(fname, '.');
    1.33 + 	if (sfx) {
    1.34 +-		if (ENABLE_FEATURE_SEAMLESS_LZMA && strcmp(sfx, ".lzma") == 0)
    1.35 +-			/* .lzma has no header/signature, just trust it */
    1.36 ++		xread(fd, &magic, 2);
    1.37 ++		if (ENABLE_FEATURE_SEAMLESS_LZMA && 
    1.38 ++		    ((magic[0] == 0x5d && magic[1] == 0) || strcmp(sfx, ".lzma") == 0)) {
    1.39 ++			xlseek(fd, 0, SEEK_SET);
    1.40 + 			open_transformer(fd, unpack_lzma_stream, "unlzma");
    1.41 ++		}
    1.42 + 		else
    1.43 + 		if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, ".gz") == 0)
    1.44 + 		 || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, ".bz2") == 0)
    1.45 + 		) {
    1.46 + 			/* .gz and .bz2 both have 2-byte signature, and their
    1.47 + 			 * unpack_XXX_stream wants this header skipped. */
    1.48 +-			xread(fd, &magic, 2);
    1.49 + #if ENABLE_FEATURE_SEAMLESS_GZ
    1.50 + #if BB_MMU
    1.51 + 			xformer = unpack_gz_stream;