wok-6.x diff busybox/stuff/busybox-1.30-zmodules.u @ rev 21297

updated libshout and libshout-dev (2.2.1 -> 2.4.1)
author Hans-G?nter Theisgen
date Wed Apr 17 16:47:19 2019 +0100 (2019-04-17)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/busybox/stuff/busybox-1.30-zmodules.u	Wed Apr 17 16:47:19 2019 +0100
     1.3 @@ -0,0 +1,27 @@
     1.4 +Add LZMA_DEFAULT_MAGIC support
     1.5 +--- busybox-1.30/archival/libarchive/open_transformer.c
     1.6 ++++ busybox-1.30/archival/libarchive/open_transformer.c
     1.7 +@@ -173,6 +173,23 @@
     1.8 + 	/* .gz and .bz2 both have 2-byte signature, and their
     1.9 + 	 * unpack_XXX_stream wants this header skipped. */
    1.10 + 	xread(fd, magic.b16, sizeof(magic.b16[0]));
    1.11 ++#if 1
    1.12 ++// SliTaz may use .gz suffix for lzma'd kernel modules
    1.13 ++#if BB_BIG_ENDIAN
    1.14 ++#define LZMA_DEFAULT_MAGIC 0x5d00
    1.15 ++#else
    1.16 ++#define LZMA_DEFAULT_MAGIC 0x5d
    1.17 ++#endif
    1.18 ++	if (ENABLE_FEATURE_SEAMLESS_LZMA
    1.19 ++	 && magic.b16[0] == LZMA_DEFAULT_MAGIC
    1.20 ++	) {
    1.21 ++		xlseek(fd, -xstate->signature_skipped, SEEK_CUR);
    1.22 ++		xstate->signature_skipped = 0;
    1.23 ++		xstate->xformer = unpack_lzma_stream;
    1.24 ++		USE_FOR_NOMMU(xstate->xformer_prog = "unlzma";)
    1.25 ++		goto found_magic;
    1.26 ++	}
    1.27 ++#endif
    1.28 + 	if (ENABLE_FEATURE_SEAMLESS_GZ
    1.29 + 	 && magic.b16[0] == GZIP_MAGIC
    1.30 + 	) {