From d9f137c81f559648ec90605759e1e2b3b2ebaff0 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Aug 06 2015 17:30:22 +0000 Subject: New upstream version v4.1.2 Fix for unknown mkfs options --- diff --git a/.gitignore b/.gitignore index 9663204..9b3063f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /btrfs-progs-v4.0.tar.xz /btrfs-progs-v4.0.1.tar.xz /btrfs-progs-v4.1.tar.xz +/btrfs-progs-v4.1.2.tar.xz diff --git a/btrfs-mkfs-missing-exit.patch b/btrfs-mkfs-missing-exit.patch new file mode 100644 index 0000000..bc114b3 --- /dev/null +++ b/btrfs-mkfs-missing-exit.patch @@ -0,0 +1,26 @@ +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 6a5c615..45c92fb 100644 --- a/btrfs-progs.spec +++ b/btrfs-progs.spec @@ -1,5 +1,5 @@ Name: btrfs-progs -Version: 4.1 +Version: 4.1.2 release: 1%{?dist} Summary: Userspace programs for btrfs @@ -12,6 +12,8 @@ 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) @@ -41,6 +43,8 @@ btrfs filesystem-specific programs. %prep %setup -q -n %{name}-v%{version} +%patch2 -p1 + %build ./autogen.sh %configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -80,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libbtrfs.so %changelog +* Thu Aug 06 2015 Eric Sandeen 4.1.2-1 +- New upstream release +- Fix to reject unknown mkfs options (#1246468) + * Mon Jun 22 2015 Eric Sandeen 4.1-1 - New upstream release diff --git a/sources b/sources index ab1c46f..b4d5b01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff451f4a40ec0c1bdecf3224465a3376 btrfs-progs-v4.1.tar.xz +f6655ea42682487e1beca6c33b787a22 btrfs-progs-v4.1.2.tar.xz