Accepting request 519527 from filesystems

spec cleanup for Factory (forwarded request 519526 from dsterba)

OBS-URL: https://build.opensuse.org/request/show/519527
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=84

0167-Btrfs-progs-make-find_and_setup_root-return-an-error.patch

@@ -1,25 +0,0 @@
-From cc4992b4c3610de4b30ea6a168573841e6cd43e5 Mon Sep 17 00:00:00 2001
-From: Josef Bacik <josef@redhat.com>
-Date: Wed, 7 Dec 2011 16:11:23 -0500
-Subject: [PATCH 167/170] Btrfs-progs: make find_and_setup_root return an error
-
-Don't BUG(), return an error so the recovery program can work its mojo.
-
-Signed-off-by: Josef Bacik <josef@redhat.com>
----
- disk-io.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-Index: btrfs-progs-v0.20-rc1-598-g8116550e1662/disk-io.c
-===================================================================
---- btrfs-progs-v0.20-rc1-598-g8116550e1662.orig/disk-io.c
-+++ btrfs-progs-v0.20-rc1-598-g8116550e1662/disk-io.c
-@@ -524,6 +524,8 @@ static int find_and_setup_root(struct bt
- 	generation = btrfs_root_generation(&root->root_item);
- 	root->node = read_tree_block(root, btrfs_root_bytenr(&root->root_item),
- 				     blocksize, generation);
-+	if (!root->node)
-+		return -ENOENT;
- 	if (!extent_buffer_uptodate(root->node))
- 		return -EIO;
- 

0168-Btrfs-progs-don-t-bug-out-if-we-can-t-find-the-last-.patch

@@ -1,29 +0,0 @@
-From 6c90b5f56a389b37fcdd85e6dd904288d601b27a Mon Sep 17 00:00:00 2001
-From: Josef Bacik <josef@redhat.com>
-Date: Wed, 7 Dec 2011 15:54:13 -0500
-Subject: [PATCH 168/170] Btrfs-progs: don't bug out if we can't find the last
- root
-
-Return an error instead of BUG()'ing out.
-
-Signed-off-by: Josef Bacik <josef@redhat.com>
----
- root-tree.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-Index: btrfs-progs-v0.20-rc1-598-g8116550e1662/root-tree.c
-===================================================================
---- btrfs-progs-v0.20-rc1-598-g8116550e1662.orig/root-tree.c
-+++ btrfs-progs-v0.20-rc1-598-g8116550e1662/root-tree.c
-@@ -45,6 +45,11 @@ int btrfs_find_last_root(struct btrfs_ro
- 
- 	BUG_ON(ret == 0);
- 	l = path->nodes[0];
-+	if (path->slots[0] == 0) {
-+		ret = -ENOENT;
-+		goto out;
-+	}
-+
- 	slot = path->slots[0] - 1;
- 	btrfs_item_key_to_cpu(l, &found_key, slot);
- 	if (found_key.objectid != objectid) {

btrfs-progs-v4.10.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be89105767008e6f3e92a34bb9135e827b11cf6256bff9846f4f5ab195e9b0c4
-size 1819566

btrfs-progs-v4.12.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ada7fb690d6620dcd8236a6a1704dfdbf9a79b0ab1810552ceb9e5c3943deadf
+size 2015458

btrfsprogs.changes

@@ -1,3 +1,58 @@
+-------------------------------------------------------------------
+Tue Aug 29 00:00:01 CEST 2017 - dsterba@suse.cz
+
+- Removed patches:
+  - 0167-Btrfs-progs-make-find_and_setup_root-return-an-error.patch
+  - 0168-Btrfs-progs-don-t-bug-out-if-we-can-t-find-the-last-.patch
+
+-------------------------------------------------------------------
+Tue Aug 29 00:00:00 CEST 2017 - dsterba@suse.cz
+
+- update to 4.12.1
+  * build:
+    * fix cross-compilation
+    * use gnu90 explicitly
+  * dump-tree: more relaxed checks so -b can print block on a damaged fs
+  * convert: fix the 1MB range exclusion
+  * check: more dir_item hash checks
+  * other
+    * added missing getopt spec for some options
+    * doc fixes
+    * cleanups
+    * test updates
+- update to 4.12
+  * subvol show: new options --rootid, --uuid to show subvol by the given spec
+  * convert: progress report fixes, found by tsan
+  * image: progress report fixes, found by tsan
+  * fix infinite looping in find-root, or when looking for free extents
+  * other:
+    * code refactoring
+    * docs updates
+    * build: ThreadSanitizer support
+    * tests: stricter checks for mounted filesystem
+- update to -4.11.1
+  * image: restoring from multiple devices
+  * dev stats: make --check option work
+  * check: fix false alert with extent hole on a NO_HOLE filesystem
+  * check: lowmem mode, fix false alert in case of mixed inline and compressed
+    extent
+  * convert: work with large filesystems (many TB)
+  * convert: fix overwriting of eb header flags
+  * convert: do not clear NODATASUM flag in inodes when run with --no-datasum
+  * docs updates
+  * build: sync Android.mk with Makefile
+  * tests:
+    * new tests
+    * fix 008 and 009, shell quotation mistake
+- update to 4.11
+  * receive: fix handling empty stream with -e (multi-stream)
+  * send dump: fix printing long file names
+  * stability fixes for: dump-super, print-tree, check
+  * option parser updates: global options are parsed before the subcommand name
+    (old xfstests will fail)
+  * new and updated tests
+  * documentation updates
+
 -------------------------------------------------------------------
 Sat Jun 10 15:00:59 UTC 2017 - meissner@suse.com
 

btrfsprogs.spec

@@ -28,7 +28,7 @@
 %endif
 
 Name:           btrfsprogs
-Version:        4.10.2
+Version:        4.12.1
 Release:        0
 Summary:        Utilities for the Btrfs filesystem
 License:        GPL-2.0
@@ -43,8 +43,6 @@ Source4:        setup-btrfs.sh
 Source5:        sles11-defaults.h
 
 Patch163:       0163-btrfs-progs-fsck-fix-segfault.patch
-Patch167:       0167-Btrfs-progs-make-find_and_setup_root-return-an-error.patch
-Patch168:       0168-Btrfs-progs-don-t-bug-out-if-we-can-t-find-the-last-.patch
 Patch169:       btrfs-support-pie.patch
 
 Patch1000:      local-version-override.patch
@@ -141,8 +139,6 @@ thing.
 %prep
 %setup -q -n btrfs-progs-v%{version}
 %patch163 -p1
-%patch167 -p1
-%patch168 -p1
 %patch169 -p1
 %patch1000 -p1
 %patch1001 -p1

local-version-override.patch

@@ -6,8 +6,8 @@ Index: btrfs-progs-v4.1/version.sh
  # Copyright 2008, Oracle
  # Released under the GNU GPLv2
  
--v="v4.10.2"
+-v="v4.12.1"
-+v="v4.10.2+20170406"
++v="v4.12.1+20170829"
  
  opt=$1