diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-03-03 11:49:57 +0100 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-03-03 11:50:24 +0100 |
commit | 313c3d0f39e19e08499a529c73875841d7ddff98 (patch) | |
tree | d946457fd1379d217a66dd8da65da1dbdc645c5b /package/squashfs/squashfs-4.2-no-gzip-fix.patch | |
parent | 764d844fbc20721b7be0c3b9328cbe130079a0ef (diff) |
squashfs: bump version
The EXTRA_CFLAGS patch is now upstream, but we need a fix for !gzip builds
instead.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/squashfs/squashfs-4.2-no-gzip-fix.patch')
-rw-r--r-- | package/squashfs/squashfs-4.2-no-gzip-fix.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/package/squashfs/squashfs-4.2-no-gzip-fix.patch b/package/squashfs/squashfs-4.2-no-gzip-fix.patch new file mode 100644 index 000000000..4cb5f50cb --- /dev/null +++ b/package/squashfs/squashfs-4.2-no-gzip-fix.patch @@ -0,0 +1,26 @@ +[PATCH] squashfs-tools: unbreak builds without gzip support + +The initialization of gzip_comp_ops if gzip support is disabled is +missing 2 null pointers, causing the id element to be initialized to 0 +rather than ZLIB_COMPRESSION, which breaks all the compressor functions +as they loop until finding the correct element or id = 0. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + squashfs-tools/compressor.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: squashfs4.2/squashfs-tools/compressor.c +=================================================================== +--- squashfs4.2.orig/squashfs-tools/compressor.c ++++ squashfs4.2/squashfs-tools/compressor.c +@@ -27,7 +27,8 @@ + + #ifndef GZIP_SUPPORT + static struct compressor gzip_comp_ops = { +- NULL, NULL, NULL, NULL, NULL, NULL, ZLIB_COMPRESSION, "gzip", 0 ++ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ZLIB_COMPRESSION, ++ "gzip", 0 + }; + #else + extern struct compressor gzip_comp_ops; |