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

Jan Steffens heftig at archlinux.org
Sat Feb 2 22:59:54 UTC 2019


    Date: Saturday, February 2, 2019 @ 22:59:53
  Author: heftig
Revision: 345170

4.20.1-2: Fix FS#61471

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

----------------+
 FS#58237.patch |   16 ----------------
 FS#61471.patch |   12 ++++++++++++
 PKGBUILD       |   12 +++++++++++-
 3 files changed, 23 insertions(+), 17 deletions(-)

Deleted: FS#58237.patch
===================================================================
--- FS#58237.patch	2019-02-02 22:27:38 UTC (rev 345169)
+++ FS#58237.patch	2019-02-02 22:59:53 UTC (rev 345170)
@@ -1,16 +0,0 @@
-diff --git a/utils.c b/utils.c
-index e9cb3a82f..f867e5a7f 100644
---- a/utils.c
-+++ b/utils.c
-@@ -2484,11 +2484,6 @@ const char *subvol_strip_mountpoint(const char *mnt, const char *full_path)
- 	if (!len)
- 		return full_path;
- 
--	if ((strncmp(mnt, full_path, len) != 0) || (full_path[len] != '/')) {
--		error("not on mount point: %s", mnt);
--		exit(1);
--	}
--
- 	if (mnt[len - 1] != '/')
- 		len += 1;
- 

Added: FS#61471.patch
===================================================================
--- FS#61471.patch	                        (rev 0)
+++ FS#61471.patch	2019-02-02 22:59:53 UTC (rev 345170)
@@ -0,0 +1,12 @@
+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-02 22:27:38 UTC (rev 345169)
+++ PKGBUILD	2019-02-02 22:59:53 UTC (rev 345170)
@@ -4,7 +4,7 @@
 
 pkgname=btrfs-progs
 pkgver=4.20.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Btrfs filesystem utilities'
 arch=('x86_64')
 makedepends=('git' 'asciidoc' 'xmlto' 'systemd' 'python' 'python-setuptools')
@@ -17,6 +17,7 @@
 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,11 +26,20 @@
 options=(!staticlibs)
 md5sums=('SKIP'
          '9aa0a16236c7087ded08425c7256044f'
+         'b19d00df3b5d9d5b053d15f34ca7a2f9'
          '7241ba3a4286d08da0d50b7176941112'
          'b09688a915a0ec8f40e2f5aacbabc9ad'
          '917b31f4eb90448d6791e17ea0f386c7'
          '502221c1b47a3bb2c06703d4fb90a0c2')
 
+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'
+}
+
 build() {
   cd $pkgname-v$pkgver
   ./configure --prefix=/usr



More information about the arch-commits mailing list