diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-09-13 21:41:51 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-09-14 09:00:31 +0200 |
commit | 83d09b5d6f08bc5e8012e3cec57ba73eb5786bd5 (patch) | |
tree | eb265c82550edf70c6653b320734657366807105 /source/ap/squashfs-tools/0004-unsquashfs-add-support-for-LZMA-magics.patch | |
parent | 4ccd8ebc9a81dc3f38e2a81b044788b9f1e6dd6e (diff) | |
download | current-83d09b5d6f08bc5e8012e3cec57ba73eb5786bd5.tar.gz current-83d09b5d6f08bc5e8012e3cec57ba73eb5786bd5.tar.xz |
Thu Sep 13 21:41:51 UTC 201820180913214151
a/sysvinit-scripts-2.1-noarch-20.txz: Rebuilt.
rc.6: it was reported by birdboy that JFS is not properly unmounted unless
the order of unmounting local filesystems followed by remounting the root
filesystem read-only is inverted. I tried that, and although it did get rid
of a "/ filesystem is busy" error during shutdown, the JFS / filesystem was
still checked at boot (and found to be clean). I believe that the existing
order of unmounting non-root filesystems followed by remounting the root
filesystem as read-only is the correct order, and found that putting
another sync between these also gets rid of the error on shutdown, so I've
done that. When using JFS as the root filesystem there's still another
similar error message that's generated earlier in the boot, though. I'm
unable to find any way to shut down a JFS root partition in a way that
leaves it clean enough that fsck will not check it at boot, but it is always
found to be clean so this should only be cosmetic. I recall this behavior of
JFS going all the way back to when it was first added to the kernel. If
anyone has a better fix, I'll take a look at it, but in my opinion it's not
really anything to worry about.
ap/ghostscript-9.25-x86_64-1.txz: Upgraded.
This release fixes problems with argument handling, some unintended
results of the security fixes to the SAFER file access restrictions
(specifically accessing ICC profile files), and some additional
security issues over the recent 9.24 release.
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-16509
(* Security fix *)
ap/squashfs-tools-20180612_6e242dc-x86_64-1.txz: Upgraded.
Linked against libzstd.so.1. Thanks to alienBOB.
ap/sudo-1.8.25p1-x86_64-1.txz: Upgraded.
d/binutils-2.31.1-x86_64-4.txz: Rebuilt.
Since baldzhang has pointed out a valid use case for windres on Linux,
we are restoring the "Windows only" utilities, as none of them are
very large and there may be valid uses for the other ones as well.
l/freetype-2.9.1-x86_64-2.txz: Rebuilt.
Patched to build properly if windres is present on the machine.
l/sg3_utils-1.44-x86_64-1.txz: Upgraded.
l/zstd-1.3.5-x86_64-1.txz: Added.
Thanks to alienBOB.
xfce/tumbler-0.2.3-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
Use the ter-114v terminus font. It has been reported that the font we were
using (ter-v14v) restricts the available console colors from 16 to 8 due
to needing an extra bit for the higher number of available glyphs (though
in testing here I couldn't see any difference). The new font covers
ISO8859-1, ISO8859-15, and Windows-1252 codepages. I'm still not sure it's
the best choice, so additional input is welcomed.
Thanks to bormant.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Use the ter-114v terminus font.
Diffstat (limited to 'source/ap/squashfs-tools/0004-unsquashfs-add-support-for-LZMA-magics.patch')
-rw-r--r-- | source/ap/squashfs-tools/0004-unsquashfs-add-support-for-LZMA-magics.patch | 102 |
1 files changed, 0 insertions, 102 deletions
diff --git a/source/ap/squashfs-tools/0004-unsquashfs-add-support-for-LZMA-magics.patch b/source/ap/squashfs-tools/0004-unsquashfs-add-support-for-LZMA-magics.patch deleted file mode 100644 index 258416bfa..000000000 --- a/source/ap/squashfs-tools/0004-unsquashfs-add-support-for-LZMA-magics.patch +++ /dev/null @@ -1,102 +0,0 @@ -From c2dc60a94b01a1fff4a22db1c0569651afa6c959 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski <jonas.gorski@gmail.com> -Date: Wed, 19 Oct 2011 11:44:57 +0200 -Subject: [PATCH] unsquashfs: add support for LZMA magics -X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+ - ;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG - !pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE - -Some vendor (e.g. Thomson/Technicolor) use a different super block magic -to indicate LZMA compression: - - qshs (0x71736873) - LZMA compression - shsq (0x73687371) - LZMA compression, SWAPPED fields - -Add support for detecting this and enable extraction for filesystems -from those firmwares. - -Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> -Tested-by: Antonio Ospite <ospite@studenti.unina.it> ---- - squashfs-tools/squashfs_fs.h | 6 ++++++ - squashfs-tools/unsquashfs.c | 24 ++++++++++++++++++------ - 2 files changed, 24 insertions(+), 6 deletions(-) - -diff --git a/squashfs-tools/squashfs_fs.h b/squashfs-tools/squashfs_fs.h -index d4fba1b..8462a6b 100644 ---- a/squashfs-tools/squashfs_fs.h -+++ b/squashfs-tools/squashfs_fs.h -@@ -30,6 +30,12 @@ - #define SQUASHFS_MAGIC_SWAP 0x68737173 - #define SQUASHFS_START 0 - -+/* -+ * Squashfs + LZMA -+ */ -+#define SQUASHFS_MAGIC_LZMA 0x71736873 -+#define SQUASHFS_MAGIC_LZMA_SWAP 0x73687371 -+ - /* size of metadata (inode and directory) blocks */ - #define SQUASHFS_METADATA_SIZE 8192 - #define SQUASHFS_METADATA_LOG 13 -diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c -index 320bead..7869a38 100644 ---- a/squashfs-tools/unsquashfs.c -+++ b/squashfs-tools/unsquashfs.c -@@ -1516,10 +1516,12 @@ int read_super(char *source) - */ - read_fs_bytes(fd, SQUASHFS_START, sizeof(struct squashfs_super_block), - &sBlk_4); -- swap = sBlk_4.s_magic != SQUASHFS_MAGIC; -+ swap = (sBlk_4.s_magic != SQUASHFS_MAGIC && -+ sBlk_4.s_magic != SQUASHFS_MAGIC_LZMA); - SQUASHFS_INSWAP_SUPER_BLOCK(&sBlk_4); - -- if(sBlk_4.s_magic == SQUASHFS_MAGIC && sBlk_4.s_major == 4 && -+ if((sBlk_4.s_magic == SQUASHFS_MAGIC || -+ sBlk_4.s_magic == SQUASHFS_MAGIC_LZMA) && sBlk_4.s_major == 4 && - sBlk_4.s_minor == 0) { - s_ops.squashfs_opendir = squashfs_opendir_4; - s_ops.read_fragment = read_fragment_4; -@@ -1532,7 +1534,11 @@ int read_super(char *source) - /* - * Check the compression type - */ -- comp = lookup_compressor_id(sBlk.s.compression); -+ if (sBlk_4.s_magic == SQUASHFS_MAGIC_LZMA) -+ comp = lookup_compressor("lzma"); -+ else -+ comp = lookup_compressor_id(sBlk.s.compression); -+ - return TRUE; - } - -@@ -1547,8 +1553,10 @@ int read_super(char *source) - * Check it is a SQUASHFS superblock - */ - swap = 0; -- if(sBlk_3.s_magic != SQUASHFS_MAGIC) { -- if(sBlk_3.s_magic == SQUASHFS_MAGIC_SWAP) { -+ if(sBlk_3.s_magic != SQUASHFS_MAGIC && -+ sBlk_3.s_magic != SQUASHFS_MAGIC_LZMA) { -+ if(sBlk_3.s_magic == SQUASHFS_MAGIC_SWAP || -+ sBlk_3.s_magic == SQUASHFS_MAGIC_LZMA_SWAP) { - squashfs_super_block_3 sblk; - ERROR("Reading a different endian SQUASHFS filesystem " - "on %s\n", source); -@@ -1626,7 +1634,11 @@ int read_super(char *source) - /* - * 1.x, 2.x and 3.x filesystems use gzip compression. - */ -- comp = lookup_compressor("gzip"); -+ if (sBlk.s.s_magic == SQUASHFS_MAGIC_LZMA) -+ comp = lookup_compressor("lzma"); -+ else -+ comp = lookup_compressor("gzip"); -+ - return TRUE; - - failed_mount: --- -1.7.10.4 - |