From 7278ebf373bad5260ef5e2226bd4952d7ceceede Mon Sep 17 00:00:00 2001 From: Vaclav Dolezal Date: Feb 10 2020 11:52:48 +0000 Subject: Fix FTBFS Resolves: #1799185 --- diff --git a/bacula-ftbfs-f_type.patch b/bacula-ftbfs-f_type.patch new file mode 100644 index 0000000..79c16c6 --- /dev/null +++ b/bacula-ftbfs-f_type.patch @@ -0,0 +1,25 @@ +From 7cdb9950acdc87e66364d3e02ad53bd078c01218 Mon Sep 17 00:00:00 2001 +From: Vaclav Dolezal +Date: Mon, 10 Feb 2020 11:07:50 +0100 +Subject: [PATCH] Fix FTBFS (#1799185) + +--- + src/findlib/fstype.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/findlib/fstype.c b/src/findlib/fstype.c +index 107f7a877..3a9a5ed59 100644 +--- a/src/findlib/fstype.c ++++ b/src/findlib/fstype.c +@@ -188,7 +188,7 @@ bool fstype(FF_PKT *ff_pkt, char *fs, int fslen) + * + * $ grep -r SUPER_MAGIC /usr/include/linux + */ +- switch (st.f_type) { ++ switch ((unsigned int) st.f_type) { + /* Known good values */ + /* ext2, ext3, and ext4 have the same code */ + case 0xef53: fstype = "ext2"; break; /* EXT2_SUPER_MAGIC */ +-- +2.20.1 + diff --git a/bacula.spec b/bacula.spec index 5ca721f..a248dc7 100644 --- a/bacula.spec +++ b/bacula.spec @@ -3,7 +3,7 @@ Name: bacula Version: 9.4.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -40,6 +40,7 @@ Patch8: %{name}-desktop.patch Patch9: %{name}-g++-options.patch # https://sources.debian.org/patches/bacula/9.4.1-1/upstream/add-libs3-checks/ Patch10: %{name}-s3-configure.patch +Patch11: %{name}-ftbfs-f_type.patch # Original patch removed by mistake, upstream is not willing to add it again: # http://www.bacula.org/git/cgit.cgi/bacula/commit/?h=Branch-7.0&id=51b3b98fb77ab3c0decee455cc6c4d2eb3c5303a @@ -748,6 +749,9 @@ fi %{_libdir}/nagios/plugins/check_bacula %changelog +* Mon Feb 10 2020 Václav Doležal - 9.4.4-4 +- Fix FTBFS (#1799185) + * Tue Jan 28 2020 Fedora Release Engineering - 9.4.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild