forked from pool/squashfs
65f4d119ab
- Version 4.4 - 2019-08-29: * Reproducible builds, new compressors, CVE fixes, security hardening and new options for Mksquashfs/Unsquashfs. - Overall improvements: * Mksquashfs now generates reproducible images by default. * Mkfs time and file timestamps can also be specified. * Support for the Zstandard (ZSTD) compression algorithm. * CVE-2015-4645 and CVE-2015-4646 have been fixed. - Mksquashfs improvements and major bug fixes: * Pseudo files now support symbolic links. * New -mkfs-time option. * New -all-time option. * New -root-mode option. * New -quiet option. * New -noId option. * New -offset option. * Update lz4 wrapper to use new functions introduced in 1.7.0. * Bug fix, don't allow "/" pseudo filenames. * Bug fix, allow quoting of pseudo files, to better handle filenames with spaces. * Fix compilation with glibc 2.25+. - Unsquashfs improvements and major bug fixes: * CVE-2015-4645 and CVE-2015-4646 have been fixed. * Unsquashfs has been further hardened against corrupted filestems. * Unsquashfs is now more strict about error handling. * New -ignore-errors option. * New -strict-errors option. * New -lln[umeric] option. * New -lc option. * New -llc option. * New -mkfs-time option. * New -UTC option. * New -offset option. * New -quiet option. * Update lz4 wrapper to use new functions introduced in 1.7.0. * Bug fix, fatal and non-fatal errors now set the exit code to 1. * Bug fix, fix time setting for symlinks. * Bug fix, try to set sticky-bit when running as a user process. * Fix compilation with glibc 2.25+. - build changes * re-created patches to fit squashfs 4.4 OBS-URL: https://build.opensuse.org/request/show/741504 OBS-URL: https://build.opensuse.org/package/show/filesystems/squashfs?expand=0&rev=42
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
diff -dupr squashfs4.4/squashfs-tools/mksquashfs.c squashfs4.4_new/squashfs-tools/mksquashfs.c
|
|
--- squashfs4.4/squashfs-tools/mksquashfs.c 2019-08-29 03:58:04.000000000 +0200
|
|
+++ squashfs4.4/squashfs-tools/mksquashfs.c 2019-10-21 15:34:39.393253955 +0200
|
|
@@ -4948,9 +4948,9 @@ void write_filesystem_tables(struct squa
|
|
SQUASHFS_INSWAP_SUPER_BLOCK(sBlk);
|
|
write_destination(fd, SQUASHFS_START, sizeof(*sBlk), sBlk);
|
|
|
|
- if(!nopad && (i = bytes & (4096 - 1))) {
|
|
- char temp[4096] = {0};
|
|
- write_destination(fd, bytes, 4096 - i, temp);
|
|
+ if(!nopad && (i = bytes & (65536 - 1))) {
|
|
+ char temp[65536] = {0};
|
|
+ write_destination(fd, bytes, 65536 - i, temp);
|
|
}
|
|
|
|
close(fd);
|
|
@@ -5898,7 +5898,7 @@ printOptions:
|
|
ERROR("-force-uid <uid>\tset all file uids to <uid>\n");
|
|
ERROR("-force-gid <gid>\tset all file gids to <gid>\n");
|
|
ERROR("-nopad\t\t\tdo not pad filesystem to a multiple "
|
|
- "of 4K\n");
|
|
+ "of 64K\n");
|
|
ERROR("-keep-as-directory\tif one source directory is "
|
|
"specified, create a root\n");
|
|
ERROR("\t\t\tdirectory containing that directory, "
|