Accepting request 526352 from filesystems

- update to version 4.13:

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

0163-btrfs-progs-fsck-fix-segfault.patch

@@ -1,26 +0,0 @@
-From f0294c7f1135acd58320c8282ed68a337138a7c7 Mon Sep 17 00:00:00 2001
-From: David Sterba <dsterba@suse.cz>
-Date: Mon, 30 Apr 2012 17:46:53 +0200
-Subject: [PATCH 163/170] btrfs-progs: fsck: fix segfault
-
-fix from Chris Mason via pastebin
-
-Signed-off-by: David Sterba <dsterba@suse.cz>
----
- cmds-check.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: btrfs-progs-v0.20-rc1-598-g8116550e1662/cmds-check.c
-===================================================================
---- btrfs-progs-v0.20-rc1-598-g8116550e1662.orig/cmds-check.c
-+++ btrfs-progs-v0.20-rc1-598-g8116550e1662/cmds-check.c
-@@ -2209,7 +2209,8 @@ static int check_owner_ref(struct btrfs_
- 		if (btrfs_header_owner(buf) == back->root)
- 			return 0;
- 	}
--	BUG_ON(rec->is_root);
-+	if (rec->is_root)
-+		return 1;
- 
- 	/* try to find the block by search corresponding fs tree */
- 	key.objectid = btrfs_header_owner(buf);

btrfs-progs-v4.12.1.tar.gz

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

btrfs-progs-v4.13.tar.gz

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

btrfs-support-pie.patch

@@ -1,104 +0,0 @@
-Index: btrfs-progs-v4.10.2/Makefile
-===================================================================
---- btrfs-progs-v4.10.2.orig/Makefile
-+++ btrfs-progs-v4.10.2/Makefile
-@@ -341,25 +341,25 @@ $(lib_links):
- 
- btrfs-%.static: btrfs-%.static.o $(static_objects) $(patsubst %.o,%.static.o,$(standalone_deps)) $(static_libbtrfs_objects)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(STATIC_CFLAGS) -o $@ $@.o $(static_objects) \
-+	$(Q)$(CC) -o $@ $@.o $(static_objects) \
- 		$(patsubst %.o, %.static.o, $($(subst -,_,$(subst .static,,$@)-objects))) \
- 		$(static_libbtrfs_objects) $(STATIC_LDFLAGS) \
- 		$($(subst -,_,$(subst .static,,$@)-libs)) $(STATIC_LIBS)
- 
- btrfs-%: btrfs-%.o $(objects) $(standalone_deps) $(libs_static)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(CFLAGS) -o $@ $(objects) $@.o \
-+	$(Q)$(CC) -o $@ $(objects) $@.o \
- 		$($(subst -,_,$@-objects)) \
- 		$(libs_static) \
- 		$(LDFLAGS) $(LIBS) $($(subst -,_,$@-libs))
- 
- btrfs: btrfs.o $(objects) $(cmds_objects) $(libs_static)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP)
-+	$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP)
- 
- btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(STATIC_CFLAGS) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
-+	$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
- 
- # For backward compatibility, 'btrfs' changes behaviour to fsck if it's named 'btrfsck'
- btrfsck: btrfs
-@@ -372,43 +372,43 @@ btrfsck.static: btrfs.static
- 
- mkfs.btrfs: $(mkfs_objects) $(objects) $(libs_static)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
-+	$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
- 
- mkfs.btrfs.static: $(static_mkfs_objects) $(static_objects) $(static_libbtrfs_objects)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(STATIC_CFLAGS) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS)
-+	$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS)
- 
- btrfstune: btrfstune.o $(objects) $(libs_static)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
-+	$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
- 
- btrfstune.static: btrfstune.static.o $(static_objects) $(static_libbtrfs_objects)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(STATIC_CFLAGS) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS)
-+	$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS)
- 
- btrfs-image: image/main.o $(objects) $(libs_static)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP)
-+	$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP)
- 
- btrfs-image.static: image/main.static.o $(static_objects) $(static_libbtrfs_objects)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(STATIC_CFLAGS) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
-+	$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
- 
- btrfs-convert: $(convert_objects) $(objects) $(libs_static)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(btrfs_convert_libs) $(LIBS)
-+	$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(btrfs_convert_libs) $(LIBS)
- 
- btrfs-convert.static: $(static_convert_objects) $(static_objects) $(static_libbtrfs_objects)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(STATIC_CFLAGS) -o $@ $^ $(STATIC_LDFLAGS) $(btrfs_convert_libs) $(STATIC_LIBS)
-+	$(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(btrfs_convert_libs) $(STATIC_LIBS)
- 
- dir-test: dir-test.o $(objects) $(libs)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
-+	$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
- 
- quick-test: quick-test.o $(objects) $(libs)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
-+	$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
- 
- ioctl-test.o: ioctl-test.c ioctl.h kerncompat.h ctree.h
- 	@echo "    [CC]   $@"
-@@ -430,13 +430,13 @@ ioctl-test: ioctl-test.o
- 
- ioctl-test-32: ioctl-test-32.o
- 	@echo "    [LD32]   $@"
--	$(Q)$(CC) $(CFLAGS) -m32 -o $@ $< $(LDFLAGS)
-+	$(Q)$(CC) -m32 -o $@ $< $(LDFLAGS)
- 	@echo "   ?[PAHOLE] $@.pahole"
- 	-$(Q)pahole $@ > $@.pahole
- 
- ioctl-test-64: ioctl-test-64.o
- 	@echo "    [LD64]   $@"
--	$(Q)$(CC) $(CFLAGS) -m64 -o $@ $< $(LDFLAGS)
-+	$(Q)$(CC) -m64 -o $@ $< $(LDFLAGS)
- 	@echo "   ?[PAHOLE] $@.pahole"
- 	-$(Q)pahole $@ > $@.pahole
- 

btrfsprogs.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Thu Sep 14 00:00:00 CEST 2017 - dsterba@suse.cz
+
+- update to version 4.13:
+  * convert: reiserfs support
+  * check: new option --force to allow check of a mounted filesystem (no repair)
+  * mkfs: --rootdir will now copy special files
+  * dump-tree: minor output changes
+  * inspect rootid: accept file as arugment
+  * dev usage: don't calculate slack space for missing devices
+  * fi du: don't print error on EMPTY_SUBVOL (inode number 2)
+  * build:
+    * fixed support for sanitization features on gcc (tsan, asan, ubsan)
+    * fix PIE build
+  * other:
+    * misc cleanups and stability fixes
+    * travis CI enhancements
+    * new tests, fuzzed images
+    * testsuite cleanups
+- Removed patches:
+  - 0163-btrfs-progs-fsck-fix-segfault.patch - will be upstreamed
+  - local-version-override.patch - not needed anymore
+  - btrfs-support-pie.patch - upstremed
+
 -------------------------------------------------------------------
 Tue Aug 29 00:00:01 CEST 2017 - dsterba@suse.cz
 

btrfsprogs.spec

@@ -28,7 +28,7 @@
 %endif
 
 Name:           btrfsprogs
-Version:        4.12.1
+Version:        4.13
 Release:        0
 Summary:        Utilities for the Btrfs filesystem
 License:        GPL-2.0
@@ -42,11 +42,7 @@ Source1:        boot-btrfs.sh
 Source4:        setup-btrfs.sh
 Source5:        sles11-defaults.h
 
-Patch163:       0163-btrfs-progs-fsck-fix-segfault.patch
+Patch1:         mkfs-default-features.patch
-Patch169:       btrfs-support-pie.patch
-
-Patch1000:      local-version-override.patch
-Patch1001:      mkfs-default-features.patch
 
 BuildRequires:  asciidoc
 BuildRequires:  autoconf
@@ -54,6 +50,7 @@ BuildRequires:  automake
 BuildRequires:  libattr-devel
 BuildRequires:  libblkid-devel
 BuildRequires:  libext2fs-devel
+BuildRequires:  libreiserfscore-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  lzo-devel
 BuildRequires:  pkg-config
@@ -138,10 +135,7 @@ thing.
 
 %prep
 %setup -q -n btrfs-progs-v%{version}
-%patch163 -p1
+%patch1 -p1
-%patch169 -p1
-%patch1000 -p1
-%patch1001 -p1
 
 %build
 ./autogen.sh

local-version-override.patch

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