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

[David Runge]

    Date: Thursday, March 17, 2022 @ 21:06:51
  Author: dvzrv
Revision: 439882

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

Remove patch for proper symlink handling (fixed upstream).

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

------------------------------------------+
 PKGBUILD                                 |   22 +++++++---------------
 squashfs-tools-4.5-symlink_install.patch |   11 -----------
 2 files changed, 7 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-17 20:54:26 UTC (rev 439881)
+++ PKGBUILD	2022-03-17 21:06:51 UTC (rev 439882)
@@ -5,27 +5,19 @@
 # Contributor: ciccio.a
 
 pkgname=squashfs-tools
-pkgver=4.5
-pkgrel=2
+pkgver=4.5.1
+pkgrel=1
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux"
 arch=(x86_64)
 url="https://github.com/plougher/squashfs-tools"
 license=(GPL2)
 depends=(lz4 lzo xz zlib zstd)
+makedepends=(help2man)
 options=(debug)
-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')
+source=($pkgname-$pkgver.tar.gz::https://github.com/plougher/$pkgname/archive/refs/tags/$pkgver.tar.gz)
+sha512sums=('b3934ea1e26c7508110312711465644a6d9674b6b5332a7d011e191fa3c1d4b8be694214794a0f6005263d0f4e18bab96af2f7ed66a178f8e3bb3a781cd44896')
+b2sums=('cbd35daf582d284b021911bb754ed548763f2773e1bc02516ca18bab7034e352780c11eb7dfed1f047b70974dcfb716bb1a1d3729e5b25662203cfbf93553b73')
 
-prepare() {
-  cd $pkgname-$pkgver
-  # fix the creation of symlinks in install target
-  patch -Np1 -i "../$pkgname-4.5-symlink_install.patch"
-}
-
 build() {
   local _params=(GZIP_SUPPORT=1 XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1 ZSTD_SUPPORT=1 XATTR_SUPPORT=1)
   make ${_params[@]} -C $pkgname-$pkgver/$pkgname
@@ -32,6 +24,6 @@
 }
 
 package() {
-  make -C ${pkgname}-${pkgver}/${pkgname} install INSTALL_DIR="${pkgdir}/usr/bin"
+  make -C $pkgname-$pkgver/$pkgname install INSTALL_DIR="$pkgdir/usr/bin" INSTALL_MANPAGES_DIR="$pkgdir/usr/share/man/man1"
   install -vDm 644 $pkgname-$pkgver/{ACTIONS-README,CHANGES,USAGE} $pkgname-$pkgver/README-$pkgver -t "$pkgdir/usr/share/doc/$pkgname/"
 }

Deleted: squashfs-tools-4.5-symlink_install.patch
===================================================================
--- squashfs-tools-4.5-symlink_install.patch	2022-03-17 20:54:26 UTC (rev 439881)
+++ squashfs-tools-4.5-symlink_install.patch	2022-03-17 21:06:51 UTC (rev 439882)
@@ -1,11 +0,0 @@
-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