aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAriadne Conill <ariadne@dereferenced.org>2021-09-07 11:25:05 -0600
committerAriadne Conill <ariadne@dereferenced.org>2021-09-07 11:33:35 -0600
commit5e6227270b7b6bc4b3e98be5f4b8cca110960c63 (patch)
tree6e38a0c41d5290d5f94c25a6c490fc710e2e1126
parentede026da09a3700b3f23423363976f417bee9b3a (diff)
downloadaports-5e6227270b7b6bc4b3e98be5f4b8cca110960c63.tar.gz
aports-5e6227270b7b6bc4b3e98be5f4b8cca110960c63.tar.bz2
aports-5e6227270b7b6bc4b3e98be5f4b8cca110960c63.tar.xz
main/squashfs-tools: security upgrade to 4.5 (CVE-2021-40153)
-rw-r--r--main/squashfs-tools/APKBUILD26
-rw-r--r--main/squashfs-tools/fix-compat.patch4
2 files changed, 18 insertions, 12 deletions
diff --git a/main/squashfs-tools/APKBUILD b/main/squashfs-tools/APKBUILD
index 44121f25db..f72ef3aa04 100644
--- a/main/squashfs-tools/APKBUILD
+++ b/main/squashfs-tools/APKBUILD
@@ -1,28 +1,34 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=squashfs-tools
-pkgver=4.4
+pkgver=4.5
pkgrel=0
-pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
+pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux"
url="https://github.com/plougher/squashfs-tools"
arch="all"
-license="GPL"
+license="GPL-2.0-or-later"
+options="!check" # no testsuite
makedepends="zlib-dev xz-dev lzo-dev lz4-dev attr-dev zstd-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/plougher/squashfs-tools/archive/$pkgver.tar.gz
fix-compat.patch
-"
+ "
+builddir="$srcdir/$pkgname-$pkgver/$pkgname"
-_builddir="$srcdir"/$pkgname-$pkgver
+# secfixes:
+# 4.5-r0:
+# - CVE-2021-40153
build() {
- cd "$builddir"/$pkgname
- CFLAGS="$CFLAGS -std=gnu89" \
+ cd "$builddir"
make XZ_SUPPORT=1 LZO_SUPPORT=1 LZ4_SUPPORT=1 ZSTD_SUPPORT=1
}
package() {
- cd "$builddir"/$pkgname
+ cd "$builddir"
mkdir -p "$pkgdir"/sbin
cp -a mksquashfs unsquashfs "$pkgdir"/sbin
}
-sha512sums="133ce437fb8c929933d52cff710b61dd9181f6f8be58250b0d6a59a7bb79a2b350f68f456b06a0e17c469409a71272d586802d570248273ddcd5dad088c00308 squashfs-tools-4.4.tar.gz
-157379cf4bafb72d717f14b1bc5dc350c97a9e68a7018e0febba4b1e59f9fd90c1de8485c4ffc48a035b53be8c3aa62046281291664bee4699100cec637b0bfa fix-compat.patch"
+
+sha512sums="
+e00610487d24eed9e5dadcf84014a3d7faa9815d8ce00fd4660e6c8ce394dccf185ed9f387f4fa1313b9812fe770f802bdcbaef87887f2bcefacf234594a72e0 squashfs-tools-4.5.tar.gz
+656242ec396d95a5e1029b60299bc91be7266ceedb50978c09a82ad80b32881576909dbd4e1e889abc3fa8c361da5ca9978ce6c319f40f5145bb532acb6c881d fix-compat.patch
+"
diff --git a/main/squashfs-tools/fix-compat.patch b/main/squashfs-tools/fix-compat.patch
index 8a5ff0697d..366d2fb696 100644
--- a/main/squashfs-tools/fix-compat.patch
+++ b/main/squashfs-tools/fix-compat.patch
@@ -1,5 +1,5 @@
---- a/squashfs-tools/action.c
-+++ b/squashfs-tools/action.c
+--- a/action.c
++++ b/action.c
@@ -1905,6 +1905,9 @@
return 1;
}