[arch-commits] Commit in btrfs-progs/trunk (FS#61471.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Monday, February 25, 2019 @ 21:43:37
  Author: seblu
Revision: 346811

upgpkg: btrfs-progs 4.20.2-1

Modified:
  btrfs-progs/trunk/PKGBUILD
Deleted:
  btrfs-progs/trunk/FS#61471.patch

----------------+
 FS#61471.patch |   12 ------------
 PKGBUILD       |   21 ++++++++++++---------
 2 files changed, 12 insertions(+), 21 deletions(-)

Deleted: FS#61471.patch
===================================================================
--- FS#61471.patch	2019-02-25 20:06:56 UTC (rev 346810)
+++ FS#61471.patch	2019-02-25 21:43:37 UTC (rev 346811)
@@ -1,12 +0,0 @@
-diff -u -r btrfs-progs-v4.20.1/utils.c btrfs-progs-v4.20.1-issue162/utils.c
---- btrfs-progs-v4.20.1/utils.c	2019-01-23 12:56:53.000000000 +0000
-+++ btrfs-progs-v4.20.1-issue162/utils.c	2019-02-02 22:56:06.320029310 +0000
-@@ -2079,7 +2079,7 @@
- 	while ((ent = getmntent(mnttab))) {
- 		len = strlen(ent->mnt_dir);
- 		if (strncmp(ent->mnt_dir, path, len) == 0 &&
--		    (path[len] == '/' || path[len] == '\0')) {
-+		    (len == 1 || path[len] == '/' || path[len] == '\0')) {
- 			/* match found and use the latest match */
- 			if (longest_matchlen <= len) {
- 				free(longest_match);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-25 20:06:56 UTC (rev 346810)
+++ PKGBUILD	2019-02-25 21:43:37 UTC (rev 346811)
@@ -3,8 +3,8 @@
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=btrfs-progs
-pkgver=4.20.1
-pkgrel=2
+pkgver=4.20.2
+pkgrel=1
 pkgdesc='Btrfs filesystem utilities'
 arch=('x86_64')
 makedepends=('git' 'asciidoc' 'xmlto' 'systemd' 'python' 'python-setuptools')
@@ -17,7 +17,6 @@
 license=('GPL2')
 validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B')
 source=("https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar."{sign,xz}
-        'FS#61471.patch'
         'initcpio-install-btrfs'
         'initcpio-hook-btrfs'
         'btrfs-scrub at .service'
@@ -25,8 +24,7 @@
 install=btrfs-progs.install
 options=(!staticlibs)
 md5sums=('SKIP'
-         '9aa0a16236c7087ded08425c7256044f'
-         'b19d00df3b5d9d5b053d15f34ca7a2f9'
+         'f5487352c734a73c7b1ccded3b126715'
          '7241ba3a4286d08da0d50b7176941112'
          'b09688a915a0ec8f40e2f5aacbabc9ad'
          '917b31f4eb90448d6791e17ea0f386c7'
@@ -34,10 +32,15 @@
 
 prepare() {
   cd $pkgname-v$pkgver
-
-  # https://bugs.archlinux.org/task/61471
-  # https://github.com/kdave/btrfs-progs/issues/162#issuecomment-458320281
-  patch -Np1 -i '../FS#61471.patch'
+  # apply patch from the source array (should be a pacman feature)
+  local src
+  for src in "${source[@]}"; do
+    src="${src%%::*}"
+    src="${src##*/}"
+    [[ $src = *.patch ]] || continue
+    msg2 "Applying patch $src..."
+    patch -Np1 < "../$src"
+  done
 }
 
 build() {