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

[Sébastien Luttringer]

    Date: Monday, January 14, 2019 @ 14:08:30
  Author: seblu
Revision: 344070

upgpkg: tar 1.31-2

- fix FS#61326

Modified:
  tar/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-14 13:59:42 UTC (rev 344069)
+++ PKGBUILD	2019-01-14 14:08:30 UTC (rev 344070)
@@ -4,7 +4,7 @@
 
 pkgname=tar
 pkgver=1.31
-pkgrel=1
+pkgrel=2
 pkgdesc='Utility used to store, backup, and transport files'
 arch=('x86_64')
 url='https://www.gnu.org/software/tar/'
@@ -13,19 +13,22 @@
 depends=('glibc' 'acl' 'attr')
 options=('!emptydirs')
 validpgpkeys=('325F650C4C2B6AD58807327A3602B07F55D0C732') # Sergey Poznyakoff
-source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
+       '01.patch::http://git.savannah.gnu.org/cgit/tar.git/patch/?id=85c005ee1345c342f707f3c55317daf6cb050603')
 md5sums=('bc9a89da1185ceb2210de12552c43ce2'
-         'SKIP')
+         'SKIP'
+         'c59638fdf88b94c46561fb68d869c5ff')
 
 prepare() {
   cd $pkgname-$pkgver
   # apply patch from the source array (should be a pacman feature)
-  local filename
-  for filename in "${source[@]}"; do
-    if [[ "$filename" =~ \.patch$ ]]; then
-      msg2 "Applying patch ${filename##*/}"
-      patch -p1 -N -i "$srcdir/${filename##*/}"
-    fi
+  local src
+  for src in "${source[@]}"; do
+    src="${src%%::*}"
+    src="${src##*/}"
+    [[ $src = *.patch ]] || continue
+    msg2 "Applying patch $src..."
+    patch -Np1 < "../$src"
   done
   :
 }