* update btrfs-progs to 4.20.2

btrfs-progs/PKGBUILD

@@ -4,10 +4,10 @@
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=btrfs-progs
-pkgver=4.20.1
+pkgver=4.20.2
-pkgrel=2
+pkgrel=1
 pkgdesc='Btrfs filesystem utilities'
-arch=('x86_64' 'powerpc64le')
+arch=(x86_64 powerpc64le)
 makedepends=('git' 'asciidoc' 'xmlto' 'systemd' 'python' 'python-setuptools')
 depends=('glibc' 'libutil-linux' 'e2fsprogs' 'lzo' 'zlib' 'zstd')
 optdepends=('python: libbtrfsutil python bindings')
@@ -18,7 +18,6 @@ provides=('btrfs-progs-unstable')
 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@.service'
@@ -26,19 +25,23 @@ source=("https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-
 install=btrfs-progs.install
 options=(!staticlibs)
 md5sums=('SKIP'
-         '9aa0a16236c7087ded08425c7256044f'
+         'f5487352c734a73c7b1ccded3b126715'
-         'b19d00df3b5d9d5b053d15f34ca7a2f9'
          '7241ba3a4286d08da0d50b7176941112'
          'b09688a915a0ec8f40e2f5aacbabc9ad'
          '917b31f4eb90448d6791e17ea0f386c7'
-         '502221c1b47a3bb2c06703d4fb90a0c2')
+         '42475169de355a33d551b2f368eb0a50')
 
 prepare() {
   cd $pkgname-v$pkgver
-
+  # apply patch from the source array (should be a pacman feature)
-  # https://bugs.archlinux.org/task/61471
+  local src
-  # https://github.com/kdave/btrfs-progs/issues/162#issuecomment-458320281
+  for src in "${source[@]}"; do
-  patch -Np1 -i '../FS#61471.patch'
+    src="${src%%::*}"
+    src="${src##*/}"
+    [[ $src = *.patch ]] || continue
+    msg2 "Applying patch $src..."
+    patch -Np1 < "../$src"
+  done
 }
 
 build() {

btrfs-progs/btrfs-progs.install

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  if (( "$(vercmp "$2" 0.19.20121005)" < 0 )); then
+    echo 'btrfs multi-device support now relies on linux 3.6 or later'
+  elif (( "$(vercmp "$2" 4.3.1-2)" < 0 )); then
+    echo 'btrfs-scrub@.timer instance names must not be prefix by dash anymore'
+    echo 'use btrfs-scrub@-.timer to scrub / monthly'
+    echo '    btrfs-scrub@home.timer to scrub /home monthly.'
+  fi
+}
+
+# vim:set ts=2 sw=2 et:

btrfs-progs/btrfs-scrub@.service

@@ -0,0 +1,8 @@
+[Unit]
+Description=Btrfs scrub on %f
+
+[Service]
+Nice=19
+IOSchedulingClass=idle
+KillSignal=SIGINT
+ExecStart=/usr/bin/btrfs scrub start -B %f

btrfs-progs/btrfs-scrub@.timer

@@ -0,0 +1,11 @@
+[Unit]
+Description=Monthly Btrfs scrub on %f
+
+[Timer]
+OnCalendar=monthly
+AccuracySec=1d
+RandomizedDelaySec=1w
+Persistent=true
+
+[Install]
+WantedBy=multi-user.target

btrfs-progs/initcpio-hook-btrfs

@@ -0,0 +1,7 @@
+#!/usr/bin/ash
+
+run_hook() {
+    btrfs device scan
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

btrfs-progs/initcpio-install-btrfs

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+build() {
+    add_module btrfs
+    add_binary btrfs
+    add_binary btrfsck
+    add_runscript
+}
+
+help() {
+    cat <<HELPEOF
+This hook provides support for multi-device btrfs volumes. This hook
+is only needed for initramfs images which do not use udev.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et: