From 8990e328271aa91d287e1f891bb3188cd7104bdc Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 3 Sep 2015 09:07:00 -0500 Subject: [PATCH] New upstream version v4.2 --- .gitignore | 1 + btrfs-mkfs-missing-exit.patch | 26 -------------------------- btrfs-progs.spec | 9 ++++----- sources | 2 +- 4 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 btrfs-mkfs-missing-exit.patch diff --git a/.gitignore b/.gitignore index 9b3063f..6f2b49e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /btrfs-progs-v4.0.1.tar.xz /btrfs-progs-v4.1.tar.xz /btrfs-progs-v4.1.2.tar.xz +/btrfs-progs-v4.2.tar.xz diff --git a/btrfs-mkfs-missing-exit.patch b/btrfs-mkfs-missing-exit.patch deleted file mode 100644 index bc114b3..0000000 --- a/btrfs-mkfs-missing-exit.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 4add89acc9cb0786aa123af4f33b6e45c724dca0 -Author: Qu Wenruo -Date: Wed Jul 29 10:28:17 2015 +0800 - - btrfs-progs: Add missing exit for parse_profile function - - In parse_profile() function, in error handling route, it output error - message but forgot to exit(1), causing even profile is not valid, it - will just fallback to single. - - Reported-by: James Harvey - Signed-off-by: Qu Wenruo - Signed-off-by: David Sterba - -diff --git a/mkfs.c b/mkfs.c -index 9073f87..7d635dc 100644 ---- a/mkfs.c -+++ b/mkfs.c -@@ -356,6 +356,7 @@ static u64 parse_profile(char *s) - return 0; - } else { - fprintf(stderr, "Unknown profile %s\n", s); -+ exit(1); - } - /* not reached */ - return 0; diff --git a/btrfs-progs.spec b/btrfs-progs.spec index 45c92fb..3e6687b 100644 --- a/btrfs-progs.spec +++ b/btrfs-progs.spec @@ -1,5 +1,5 @@ Name: btrfs-progs -Version: 4.1.2 +Version: 4.2 release: 1%{?dist} Summary: Userspace programs for btrfs @@ -12,8 +12,6 @@ Source0: https://www.kernel.org/pub/linux/kernel/people/kdave/%{name}/%{name}-v% # Still must reverse-engineer fixes in there and get upstream Patch0: btrfs-progs-valgrind.patch Patch1: btrfs-init-dev-list.patch -# Applied -Patch2: btrfs-mkfs-missing-exit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,8 +41,6 @@ btrfs filesystem-specific programs. %prep %setup -q -n %{name}-v%{version} -%patch2 -p1 - %build ./autogen.sh %configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -84,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libbtrfs.so %changelog +* Thu Sep 03 2015 Eric Sandeen 4.2-1 +- New upstream release + * Thu Aug 06 2015 Eric Sandeen 4.1.2-1 - New upstream release - Fix to reject unknown mkfs options (#1246468) diff --git a/sources b/sources index b4d5b01..8f8ee4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f6655ea42682487e1beca6c33b787a22 btrfs-progs-v4.1.2.tar.xz +74c9490ea0e23be6f5f57e437540e15b btrfs-progs-v4.2.tar.xz