summaryrefslogtreecommitdiffstats
path: root/source/ap/squashfs-tools/squashfs-tools.SlackBuild
diff options
context:
space:
mode:
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
commit83d09b5d6f08bc5e8012e3cec57ba73eb5786bd5 (patch)
treeeb265c82550edf70c6653b320734657366807105 /source/ap/squashfs-tools/squashfs-tools.SlackBuild
parent4ccd8ebc9a81dc3f38e2a81b044788b9f1e6dd6e (diff)
downloadcurrent-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/squashfs-tools.SlackBuild')
-rwxr-xr-xsource/ap/squashfs-tools/squashfs-tools.SlackBuild31
1 files changed, 11 insertions, 20 deletions
diff --git a/source/ap/squashfs-tools/squashfs-tools.SlackBuild b/source/ap/squashfs-tools/squashfs-tools.SlackBuild
index 67871e9f8..2141b1436 100755
--- a/source/ap/squashfs-tools/squashfs-tools.SlackBuild
+++ b/source/ap/squashfs-tools/squashfs-tools.SlackBuild
@@ -1,6 +1,5 @@
#!/bin/bash
-
-# Copyright 2015 Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2018 Eric Hameleers, Eindhoven, NL
# Copyright 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
@@ -24,8 +23,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=squashfs-tools
-VERSION=${VERSION:-$(echo squashfs*.tar.xz | cut -b9- | rev | cut -f3- -d . | rev)}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-$( echo squashfs-tools*.tar.?z | cut -d- -f3- | rev | cut -f3- -d . | rev )}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -75,16 +74,9 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf squashfs${VERSION}
-tar xvf $CWD/squashfs${VERSION}.tar.xz || exit 1
-cd squashfs${VERSION} || exit 1
-
-zcat $CWD/0001-kfreebsd.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/0002-fix_phys_mem_calculation.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/0003-CVE-2015-4645_and_CVE-2015-4646.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/0004-unsquashfs-add-support-for-LZMA-magics.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/0006-uptream-fix-race.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/0007-fix-2GB-limit-in-mksquashfs.patch.gz | patch -p1 --verbose || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
chown -R root:root .
find . \
@@ -102,6 +94,7 @@ make $NUMJOBS \
XZ_SUPPORT="1" \
LZO_SUPPORT="1" \
LZMA_XZ_SUPPORT="1" \
+ ZSTD_SUPPORT="1" \
COMP_DEFAULT="xz" || exit 1
# Install:
@@ -114,13 +107,11 @@ make install INSTALL_DIR=$PKG/usr/bin || exit 1
)
# Add a documentation directory:
+cd ..
mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
-( cd ..
- cp -a \
- ACKNOWLEDGEMENTS CHANGES COPYING DONATIONS INSTALL \
- README* PERFORMANCE.README *.example \
- $PKG/usr/doc/${PKGNAM}-$VERSION
-)
+cp -a \
+ ACKNOWLEDGEMENTS CHANGES COPYING* INSTALL *README* \
+ $PKG/usr/doc/${PKGNAM}-$VERSION
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc