From 21fdc5cafaa2049fc394886159a4303bf83f6615 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 3 Oct 2019 19:01:26 +0000
Subject: user/squashfs-tools: [CVE] bump to 4.4, modernise (#163)

---
 user/squashfs-tools/APKBUILD | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'user/squashfs-tools/APKBUILD')

diff --git a/user/squashfs-tools/APKBUILD b/user/squashfs-tools/APKBUILD
index 227faf11d..c25eb0a83 100644
--- a/user/squashfs-tools/APKBUILD
+++ b/user/squashfs-tools/APKBUILD
@@ -1,35 +1,32 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=squashfs-tools
-pkgver=4.3
-pkgrel=5
+pkgver=4.4
+pkgrel=0
 pkgdesc="Tools for SquashFS, a highly compressed read-only filesystem"
 url="http://squashfs.sourceforge.net"
 arch="all"
 options="!check"  # No test suite.
 license="GPL-2.0+"
-depends=
-makedepends="zlib-dev xz-dev lzo-dev lz4-dev attr-dev"
-source="http://downloads.sourceforge.net/sourceforge/squashfs/squashfs$pkgver.tar.gz
+depends=""
+makedepends="attr-dev lz4-dev lzo-dev xz-dev zlib-dev"
+source="https://downloads.sourceforge.net/squashfs/squashfs$pkgver.tar.gz
 	fix-compat.patch
-	vla-overlow.patch
-	CVE-2015-4645.patch
-	0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch
-"
-builddir="$srcdir/squashfs$pkgver"
+	"
+builddir="$srcdir/squashfs$pkgver/$pkgname"
+
+# secfixes:
+#   4.4-r0:
+#     - CVE-2015-4645
+#     - CVE-2015-4646
 
 build() {
-	cd "$builddir"/$pkgname
 	make XZ_SUPPORT=1 LZO_SUPPORT=1 LZ4_SUPPORT=1
 }
 
 package() {
-	cd "$builddir"/$pkgname
 	mkdir -p "$pkgdir"/sbin
 	cp -a mksquashfs unsquashfs "$pkgdir"/sbin
 }
 
-sha512sums="854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79  squashfs4.3.tar.gz
-868e3923f98a7f8bb980fe8ab0d648e9ae9a55e324bea3830d6047aa348a4302dcb96d65bf59c6e04665891d822e18fad367a37c6704505b8492f64d749fc140  fix-compat.patch
-975d09d047f4122866e83c4322ce3a15795c051b850d14a85a615c3beef970378e5a620ee16058b9c5104c53f973f9b3804d96c3ba1ab4f622f1e096c04e0360  vla-overlow.patch
-77431a0a4a529ce63f1613a65a23af2fb8683a16d14ad1a5cfed3a9fac4df6a1212f081d1879ede188a25b77e860445058012131423c546657fb562069865d2c  CVE-2015-4645.patch
-1b2338a448ec8a2b75880ddc8c13f99392451847ab26277e1bc82b49a3a804796934e212dd1ba54a502940537a61891ee0103e913d0bda65cff0ca2827b8b41c  0001-mksquashfs-fix-rare-race-in-fragment-waiting-in-file.patch"
+sha512sums="e7119f82cea0eda8dffcbf15c9ee511ad457e004bfc0c5a5685e84785e49cf34f3c053036449af6bba0012cef48426f65958c97b9958d58f1b31175cb0bbbe24  squashfs4.4.tar.gz
+12f5739aa32b9e15ba3d22e5953034f17867a8837475f13bde5bbc378dbded0483cde42c0cdfc5d33ab3723b9de752c71b5ba8f4301ca7b59aa4054d669c262d  fix-compat.patch"
-- 
cgit v1.2.3-70-g09d2