Accepting request 360783 from home:dsterba:branches:filesystems

- update to 4.4

OBS-URL: https://build.opensuse.org/request/show/360783
OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=228

0001-btrfs-progs-mkfs-use-correct-size-for-superblock-csu.patch

@@ -1,41 +0,0 @@
-From bf1ac8305ab3f191d9345793b88c4f5ec691cb9b Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.com>
-Date: Thu, 19 Nov 2015 15:55:05 +0100
-Subject: [PATCH] btrfs-progs: mkfs: use correct size for superblock csum and
- writeout
-
-If sectorsize is not BTRFS_SUPER_INFO_SIZE (4k), the superblock checksum
-is wrong and mkfs fails. This has been reported on ppc64 where we pick
-sectorisize from page size (64k).  This has been broken since ages
-(2008) and discovered by the recently added superblock checks.
-
-Reported-by: Dinar Valeev <dvaleev@suse.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- utils.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/utils.c b/utils.c
-index 60235d84889c..13835051a1a5 100644
---- a/utils.c
-+++ b/utils.c
-@@ -552,12 +552,12 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
- 
- 	/* and write out the super block */
- 	BUG_ON(sizeof(super) > cfg->sectorsize);
--	memset(buf->data, 0, cfg->sectorsize);
-+	memset(buf->data, 0, BTRFS_SUPER_INFO_SIZE);
- 	memcpy(buf->data, &super, sizeof(super));
--	buf->len = cfg->sectorsize;
-+	buf->len = BTRFS_SUPER_INFO_SIZE;
- 	csum_tree_block_size(buf, BTRFS_CRC32_SIZE, 0);
--	ret = pwrite(fd, buf->data, cfg->sectorsize, cfg->blocks[0]);
--	if (ret != cfg->sectorsize) {
-+	ret = pwrite(fd, buf->data, BTRFS_SUPER_INFO_SIZE, cfg->blocks[0]);
-+	if (ret != BTRFS_SUPER_INFO_SIZE) {
- 		ret = (ret < 0 ? -errno : -EIO);
- 		goto out;
- 	}
--- 
-2.6.2
-

btrfs-progs-v4.3.1.tar.gz

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

btrfs-progs-v4.4.tar.gz

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

btrfsprogs.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Fri Jan 22 00:00:00 CET 2016 - dsterba@suse.cz
+
+- update to 4.4
+  * mkfs.btrfs --data dup
+  * support balance filters added/enhanced in linux 4.4
+  * manual pages enhanced (btrfs, mkfs, mount, filesystem, balance)
+  * 'btrfs filesystem usage' works with mixed blockgroups
+  * build: installation to /usr/local
+  * build: the 'ar' tool is properly deteced during cross-compilation
+  * improved stability on fuzzed/crafted images when reading sys array in
+    superblock
+  * debug-tree: option -t understands ids for tree root and chnuk tree
+  * check: properly reset nlink of multi-linked file
+  * chunk recovery: fix floating point exception
+  * chunk recovery: endianity bugfix during rebuild
+  * mkfs with 64K pages and nodesize reported superblock checksum mismatch
+- Removed patches:
+  * 0001-btrfs-progs-mkfs-use-correct-size-for-superblock-csu.patch
+  * fix-doc-build-on-SLE11SP3.diff
+
 -------------------------------------------------------------------
 Thu Dec 10 16:04:16 CET 2015 - tiwai@suse.de
 

btrfsprogs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package btrfsprogs
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
 %endif
 
 Name:           btrfsprogs
-Version:        4.3.1
+Version:        4.4
 Release:        0
 Summary:        Utilities for the Btrfs filesystem
 License:        GPL-2.0
@@ -37,14 +37,11 @@ Source:         https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs
 Source1:        boot-btrfs.sh
 Source4:        setup-btrfs.sh
 
-Patch1:         0001-btrfs-progs-mkfs-use-correct-size-for-superblock-csu.patch
-
 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
 
 Patch1000:      local-version-override.patch
-Patch1001:      fix-doc-build-on-SLE11SP3.diff
 Patch1002:      2000-btrfs-full-balance-warning.diff
 
 BuildRequires:  asciidoc
@@ -112,12 +109,10 @@ build applications to interface with btrfs.
 
 %prep
 %setup -q -n btrfs-progs-v%{version}
-%patch1 -p1
 %patch163 -p1
 %patch167 -p1
 %patch168 -p1
 %patch1000 -p1
-%patch1001 -p1
 %patch1002 -p1
 
 %build

fix-doc-build-on-SLE11SP3.diff

@@ -1,20 +0,0 @@
-Build on SLE11SP3 complains:
-
-ERROR: btrfs-mount.xml.tmp1: line 9: second section must be named SYNOPSIS
-
-
-Index: btrfs-progs-v3.17.1/Documentation/btrfs-mount.txt
-===================================================================
---- btrfs-progs-v3.17.1.orig/Documentation/btrfs-mount.asciidoc
-+++ btrfs-progs-v3.17.1/Documentation/btrfs-mount.asciidoc
-@@ -5,6 +5,10 @@ NAME
- ----
- btrfs-mount - mount options and supported file attributes for the btrfs filesystem
- 
-+SYNOPSIS
-+--------
-+*man btrfs*
-+
- DESCRIPTION
- -----------
- This document describes mount options specific to the btrfs filesystem.

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.3.1"
+-v="v4.4"
-+v="v4.3.1+20151124"
++v="v4.4+20160122"
  
  opt=$1