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

[David Runge]

    Date: Monday, July 26, 2021 @ 20:04:15
  Author: dvzrv
Revision: 420437

upgpkg: squashfs-tools 4.5-1: Upgrade to 4.5.

Switch back to upstream release tarballs as source.
Add patch to fix the installation of symlinks in the install target.
Remove unnecessary and undocumented sed call in prepare().
Switch to (more) correct license identifier (GPL2).
Update maintainer info.

Added:
  squashfs-tools/trunk/squashfs-tools-4.5-symlink_install.patch
Modified:
  squashfs-tools/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   46 +++++++++++++++--------------
 squashfs-tools-4.5-symlink_install.patch |   11 ++++++
 2 files changed, 36 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-26 19:18:28 UTC (rev 420436)
+++ PKGBUILD	2021-07-26 20:04:15 UTC (rev 420437)
@@ -1,38 +1,42 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
 # Original TU: Jeff Mickey <j at codemac.net>
 # Contributor: ciccio.a
 
 pkgname=squashfs-tools
-pkgver=4.4_git.1
+pkgver=4.5
 pkgrel=1
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
 url="https://github.com/plougher/squashfs-tools"
-license=("GPL")
+license=('GPL2')
 arch=('x86_64')
-depends=('zlib' 'lzo' 'xz' 'lz4' 'zstd')
-makedepends=('git')
-source=("git+https://github.com/plougher/squashfs-tools#tag=${pkgver/_/-}")
-sha256sums=('SKIP')
+depends=('lz4' 'lzo' 'xz' 'zlib' 'zstd')
+source=("https://github.com/plougher/squashfs-tools#tag=${pkgver/_/-}")
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/plougher/${pkgname}/archive/refs/tags/${pkgver}.tar.gz"
+        "${pkgname}-4.5-symlink_install.patch")
+sha512sums=('e00610487d24eed9e5dadcf84014a3d7faa9815d8ce00fd4660e6c8ce394dccf185ed9f387f4fa1313b9812fe770f802bdcbaef87887f2bcefacf234594a72e0'
+            'c2c77fb3741b75c2921ec6402d3532f87fd3d83e0e7042d88cf18835e30264547ce30b228bf5c0e5819075134871d27e2c8c5418257cbc66bfbfb730ef59a792')
+b2sums=('2fc8ab9bb6565b97656afd63b76bfd7449d96b83697286e88b55a8cd82957b395df17a707ee93e8a99ed19dc5ba73966ce33530ef6c35797924dad4e3f16ed3b'
+        'd19e07109630eb10952630611a0ebdc1349585a89bed29341c9b7a623e7d165e3c047332396edd4ababe3516010289e2743e8dc09be733f464e216fffd09036e')
 
 prepare() {
-    cd "$srcdir"/${pkgname}/${pkgname}
-    sed -i '1,1i#include <sys/sysmacros.h>' mksquashfs.c unsquashfs.c
+  cd  ${pkgname}-${pkgver}
+  # fix the creation of symlinks in install target
+  patch -Np1 -i "../${pkgname}-4.5-symlink_install.patch"
 }
 
 build() {
-    cd "$srcdir"/${pkgname}/${pkgname}
-    make \
-        GZIP_SUPPORT=1 \
-        XZ_SUPPORT=1 \
-        LZO_SUPPORT=1 \
-        LZMA_XZ_SUPPORT=1 \
-        LZ4_SUPPORT=1 \
-        ZSTD_SUPPORT=1 \
-        XATTR_SUPPORT=1
+  make -C ${pkgname}-${pkgver}/${pkgname} \
+    GZIP_SUPPORT=1 \
+    XZ_SUPPORT=1 \
+    LZO_SUPPORT=1 \
+    LZMA_XZ_SUPPORT=1 \
+    LZ4_SUPPORT=1 \
+    ZSTD_SUPPORT=1 \
+    XATTR_SUPPORT=1
 }
 
 package() {
-    cd "$srcdir"/${pkgname}/${pkgname}
-    make install INSTALL_DIR="${pkgdir}"/usr/bin
+  make -C ${pkgname}-${pkgver}/${pkgname} install INSTALL_DIR="${pkgdir}/usr/bin"
 }

Added: squashfs-tools-4.5-symlink_install.patch
===================================================================
--- squashfs-tools-4.5-symlink_install.patch	                        (rev 0)
+++ squashfs-tools-4.5-symlink_install.patch	2021-07-26 20:04:15 UTC (rev 420437)
@@ -0,0 +1,11 @@
+diff -ruN a/squashfs-tools/Makefile b/squashfs-tools/Makefile
+--- a/squashfs-tools/Makefile	2021-07-22 22:11:24.000000000 +0200
++++ b/squashfs-tools/Makefile	2021-07-26 20:15:40.345471019 +0200
+@@ -406,5 +406,5 @@
+ 	mkdir -p $(INSTALL_DIR)
+ 	cp mksquashfs $(INSTALL_DIR)
+ 	cp unsquashfs $(INSTALL_DIR)
+-	ln -fs $(INSTALL_DIR)/unsquashfs $(INSTALL_DIR)/sqfscat
+-	ln -fs $(INSTALL_DIR)/mksquashfs $(INSTALL_DIR)/sqfstar
++	ln -fs unsquashfs $(INSTALL_DIR)/sqfscat
++	ln -fs mksquashfs $(INSTALL_DIR)/sqfstar