[arch-commits] Commit in squashfs-tools/trunk (PKGBUILD)

[Sergej Pupykin]

    Date: Monday, December 10, 2018 @ 08:51:23
  Author: spupykin
Revision: 413876

upgpkg: squashfs-tools 4.3-8

Modified:
  squashfs-tools/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-10 08:50:14 UTC (rev 413875)
+++ PKGBUILD	2018-12-10 08:51:23 UTC (rev 413876)
@@ -5,27 +5,24 @@
 
 pkgname=squashfs-tools
 pkgver=4.3
-pkgrel=7
+pkgrel=8
+_commit=6e242dc95485ada8d1d0b3dd9346c5243d4a517f
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
-url="http://squashfs.sourceforge.net"
+url="https://github.com/plougher/squashfs-tools"
 license=("GPL")
 arch=('x86_64')
 depends=('zlib' 'lzo' 'xz' 'lz4' 'zstd')
-source=("http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz"
-	"https://sources.debian.org/data/main/s/squashfs-tools/1:4.3-6/debian/patches/0003-CVE-2015-4645_and_CVE-2015-4646.patch"
-	"https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch")
-sha512sums=('854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79'
-            '84bf4dc961387fd72a97229eda5432c2ba97211541131cb5a5032d7a807a675d5423473b9df2ad5341514dcb864daaeadca8ae9c8543eb3efb499f5baf838bb0'
-            'c21466b2f0aa6d6ae65b3693148274250bc42d8e7ea5142d6d4048d663ff4343dc539822320cf732d88c5bac048766a9771e1d2b739b1176cb9fafa96c4d306a')
+makedepends=('git')
+source=("git+https://github.com/plougher/squashfs-tools#commit=${_commit}")
+sha256sums=('SKIP')
 
 prepare() {
-    cd "$srcdir"/squashfs${pkgver}/${pkgname}
-    patch -p2 -i ../../squashfs-tools-4.3-sysmacros.patch
-    patch -p2 -i ../../0003-CVE-2015-4645_and_CVE-2015-4646.patch
+    cd "$srcdir"/${pkgname}/${pkgname}
+    sed -i '1,1i#include <sys/sysmacros.h>' mksquashfs.c unsquashfs.c
 }
 
 build() {
-    cd "$srcdir"/squashfs${pkgver}/${pkgname}
+    cd "$srcdir"/${pkgname}/${pkgname}
     make \
         GZIP_SUPPORT=1 \
         XZ_SUPPORT=1 \
@@ -37,7 +34,6 @@
 }
 
 package() {
-    cd "$srcdir"/squashfs${pkgver}/${pkgname}
-    install -Dm755 mksquashfs "$pkgdir"/usr/bin/mksquashfs
-    install -m755 unsquashfs "$pkgdir"/usr/bin/unsquashfs
+    cd "$srcdir"/${pkgname}/${pkgname}
+    make install INSTALL_DIR="${pkgdir}"/usr/bin
 }