forked from pool/squashfs
Dirk Mueller
76ddb9bee5
- update to 4.5:
* Mksquashfs now supports "Actions".
* New sqfstar command which will create a Squashfs image from a tar archive.
* Tar style handling of source pathnames in Mksquashfs.
* Cpio style handling of source pathnames in Mksquashfs.
* New option to throttle the amount of CPU and I/O.
* Mksquashfs now allows no source directory to be specified.
* New Pseudo file "R" definition which allows a Regular file
o be created with data stored within the Pseudo file.
* Symbolic links are now followed in extract files
* Unsquashfs now supports "exclude" files.
* Max depth traversal option added.
* Unsquashfs can now output a "Pseudo file" representing the
input Squashfs filesystem.
* New -one-file-system option in Mksquashfs.
* New -no-hardlinks option in Mksquashfs.
* Exit code in Unsquashfs changed to distinguish between
non-fatal errors (exit 2), and fatal errors (exit 1).
* Xattr id count added in Unsquashfs "-stat" output.
* Unsquashfs "write outside directory" exploit fixed.
* Error handling in Unsquashfs writer thread fixed.
* Fix failure to truncate destination if appending aborted.
* Prevent Mksquashfs reading the destination file.
OBS-URL: https://build.opensuse.org/request/show/939998
OBS-URL: https://build.opensuse.org/package/show/filesystems/squashfs?expand=0&rev=49
36 lines
1.8 KiB
Diff
36 lines
1.8 KiB
Diff
Index: squashfs-tools-4.5/squashfs-tools/mksquashfs.c
|
|
===================================================================
|
|
--- squashfs-tools-4.5.orig/squashfs-tools/mksquashfs.c
|
|
+++ squashfs-tools-4.5/squashfs-tools/mksquashfs.c
|
|
@@ -5954,7 +5954,7 @@ static void print_options(FILE *stream,
|
|
fprintf(stream, "-root-gid <gid>\t\tset root directory group to <gid>\n");
|
|
fprintf(stream, "-force-uid <uid>\tset all file uids to <uid>\n");
|
|
fprintf(stream, "-force-gid <gid>\tset all file gids to <gid>\n");
|
|
- fprintf(stream, "-nopad\t\t\tdo not pad filesystem to a multiple of 4K\n");
|
|
+ fprintf(stream, "-nopad\t\t\tdo not pad filesystem to a multiple of 64K\n");
|
|
fprintf(stream, "-keep-as-directory\tif one source directory is specified, ");
|
|
fprintf(stream, "create a root\n");
|
|
fprintf(stream, "\t\t\tdirectory containing that directory, rather than the\n");
|
|
@@ -6112,7 +6112,7 @@ static void print_sqfstar_options(FILE *
|
|
fprintf(stream, "-root-gid <gid>\t\tset root directory group to <gid>\n");
|
|
fprintf(stream, "-force-uid <uid>\tset all file uids to <uid>\n");
|
|
fprintf(stream, "-force-gid <gid>\tset all file gids to <gid>\n");
|
|
- fprintf(stream, "-nopad\t\t\tdo not pad filesystem to a multiple of 4K\n");
|
|
+ fprintf(stream, "-nopad\t\t\tdo not pad filesystem to a multiple of 64K\n");
|
|
fprintf(stream, "\nFilesystem filter options:\n");
|
|
fprintf(stream, "-ef <exclude_file>\tlist of exclude dirs/files. ");
|
|
fprintf(stream, "One per line\n");
|
|
@@ -6877,9 +6877,9 @@ print_sqfstar_compressor_options:
|
|
set_progressbar_state(FALSE);
|
|
write_filesystem_tables(&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);
|