From d9f137c81f559648ec90605759e1e2b3b2ebaff0 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 6 Aug 2015 12:30:22 -0500 Subject: [PATCH 1/5] New upstream version v4.1.2 Fix for unknown mkfs options --- .gitignore | 1 + btrfs-mkfs-missing-exit.patch | 26 ++++++++++++++++++++++++++ btrfs-progs.spec | 10 +++++++++- sources | 2 +- 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 btrfs-mkfs-missing-exit.patch 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 From 8990e328271aa91d287e1f891bb3188cd7104bdc Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 3 Sep 2015 09:07:00 -0500 Subject: [PATCH 2/5] 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 From 7fb513587d9604a162ba34cd14128ac0b07ba2c3 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Tue, 22 Sep 2015 04:05:34 -0500 Subject: [PATCH 3/5] New upstream version 4.2.1 --- .gitignore | 1 + btrfs-progs.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6f2b49e..8707df9 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /btrfs-progs-v4.1.tar.xz /btrfs-progs-v4.1.2.tar.xz /btrfs-progs-v4.2.tar.xz +/btrfs-progs-v4.2.1.tar.xz diff --git a/btrfs-progs.spec b/btrfs-progs.spec index 3e6687b..a62b7a8 100644 --- a/btrfs-progs.spec +++ b/btrfs-progs.spec @@ -1,5 +1,5 @@ Name: btrfs-progs -Version: 4.2 +Version: 4.2.1 release: 1%{?dist} Summary: Userspace programs for btrfs @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libbtrfs.so %changelog +* Tue Sep 22 2015 Eric Sandeen 4.2.1-1 +- New upstream release + * Thu Sep 03 2015 Eric Sandeen 4.2-1 - New upstream release diff --git a/sources b/sources index 8f8ee4d..c7c4c99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -74c9490ea0e23be6f5f57e437540e15b btrfs-progs-v4.2.tar.xz +f686447af4c3bc87b7a6a3a4da53aba4 btrfs-progs-v4.2.1.tar.xz From 70a974f5774df4634b3fb72f721e915651892597 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 8 Oct 2015 09:39:12 -0500 Subject: [PATCH 4/5] New upstream version v4.2.2 --- .gitignore | 1 + btrfs-progs.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8707df9..e773990 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /btrfs-progs-v4.1.2.tar.xz /btrfs-progs-v4.2.tar.xz /btrfs-progs-v4.2.1.tar.xz +/btrfs-progs-v4.2.2.tar.xz diff --git a/btrfs-progs.spec b/btrfs-progs.spec index a62b7a8..2a5f7b3 100644 --- a/btrfs-progs.spec +++ b/btrfs-progs.spec @@ -1,6 +1,6 @@ Name: btrfs-progs -Version: 4.2.1 -release: 1%{?dist} +Version: 4.2.2 +Release: 1%{?dist} Summary: Userspace programs for btrfs Group: System Environment/Base @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libbtrfs.so %changelog +* Wed Oct 08 2015 Eric Sandeen 4.2.2-1 +- New upstream release + * Tue Sep 22 2015 Eric Sandeen 4.2.1-1 - New upstream release diff --git a/sources b/sources index c7c4c99..202ee74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f686447af4c3bc87b7a6a3a4da53aba4 btrfs-progs-v4.2.1.tar.xz +7b1cfba5198622e5cd915f4ac12500c6 btrfs-progs-v4.2.2.tar.xz From c7176fbbad7e439d087bb1390152588fdfe683d1 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Wed, 18 Nov 2015 09:47:09 -0600 Subject: [PATCH 5/5] New upstream version v4.3.1 --- .gitignore | 1 + btrfs-progs.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e773990..86fdbd9 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /btrfs-progs-v4.2.tar.xz /btrfs-progs-v4.2.1.tar.xz /btrfs-progs-v4.2.2.tar.xz +/btrfs-progs-v4.3.1.tar.xz diff --git a/btrfs-progs.spec b/btrfs-progs.spec index 2a5f7b3..0e0b23f 100644 --- a/btrfs-progs.spec +++ b/btrfs-progs.spec @@ -1,5 +1,5 @@ Name: btrfs-progs -Version: 4.2.2 +Version: 4.3.1 Release: 1%{?dist} Summary: Userspace programs for btrfs @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libbtrfs.so %changelog +* Wed Nov 18 2015 Eric Sandeen 4.3.1-1 +- New upstream release + * Wed Oct 08 2015 Eric Sandeen 4.2.2-1 - New upstream release diff --git a/sources b/sources index 202ee74..4aa95e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b1cfba5198622e5cd915f4ac12500c6 btrfs-progs-v4.2.2.tar.xz +ae04b324a059482e4c7e9710043c4e93 btrfs-progs-v4.3.1.tar.xz