forked from pool/squashfs
Dirk Mueller
2cfa239220
- update to 4.6.1:
* Race condition which can cause corruption of the "fragment
table" fixed. This is a regression introduced in August 2022,
and it has been seen when tailend packing is used (-tailends option).
* Fix build failure when the tools are being built without
extended attribute (XATTRs) support.
* Fix XATTR error message when an unrecognised prefix is
found
* Fix incorrect free of pointer when an unrecognised XATTR
prefix is found.
* Major improvements in extended attribute handling,
pseudo file handling, and miscellaneous new options and
improvements
* Extended attribute handling improved in Mksquashfs and
Sqfstar
* New Pseudo file xattr definition to add extended
attributes to files.
* New xattrs-add Action to add extended attributes to files
* Extended attribute handling improved in Unsquashfs
* Other major improvements
* Unsquashfs can now output Pseudo files to standard out.
* Mksquashfs can now input Pseudo files from standard in.
* Squashfs filesystems can now be converted (different
block size compression etc) without unpacking to an
intermediate filesystem or mounting, by piping the output of
Unsquashfs to Mksquashfs.
* Pseudo files are now supported by Sqfstar.
* "Non-anchored" excludes are now supported by Unsquashfs.
OBS-URL: https://build.opensuse.org/request/show/1079568
OBS-URL: https://build.opensuse.org/package/show/filesystems/squashfs?expand=0&rev=56
51 lines
2.3 KiB
Diff
51 lines
2.3 KiB
Diff
Index: squashfs-tools-4.6.1/squashfs-tools/mksquashfs.c
|
|
===================================================================
|
|
--- squashfs-tools-4.6.1.orig/squashfs-tools/mksquashfs.c
|
|
+++ squashfs-tools-4.6.1/squashfs-tools/mksquashfs.c
|
|
@@ -6378,7 +6378,7 @@ static void print_options(FILE *stream,
|
|
fprintf(stream, "file on\n\t\t\tencountering them. This option makes ");
|
|
fprintf(stream, "Mksquashfs ignore\n\t\t\tthe zero filled blocks\n");
|
|
fprintf(stream, "\nExpert options (these may make the filesystem unmountable):\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, "-offset <offset>\tskip <offset> bytes at the beginning of ");
|
|
fprintf(stream, "FILESYSTEM.\n\t\t\tOptionally a suffix of K, M or G can be given ");
|
|
fprintf(stream, "to specify\n\t\t\tKbytes, Mbytes or Gbytes respectively.\n");
|
|
@@ -6606,7 +6606,7 @@ static void print_sqfstar_options(FILE *
|
|
fprintf(stream, "memory for caches. Default 25%%\n");
|
|
fprintf(stream, "-mem-default\t\tprint default memory usage in Mbytes\n");
|
|
fprintf(stream, "\nExpert options (these may make the filesystem unmountable):\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, "-offset <offset>\tskip <offset> bytes at the beginning of ");
|
|
fprintf(stream, "FILESYSTEM.\n\t\t\tOptionally a suffix of K, M or G can be given ");
|
|
fprintf(stream, "to specify\n\t\t\tKbytes, Mbytes or Gbytes respectively.\n");
|
|
@@ -7605,9 +7605,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);
|
|
}
|
|
|
|
res = close(fd);
|
|
@@ -8877,10 +8877,10 @@ print_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);
|
|
}
|
|
|
|
res = close(fd);
|