Fix FTBFS

Resolves: #1799185
This commit is contained in:
Vaclav Dolezal 2020-02-10 12:52:48 +01:00
parent 48e34c9a94
commit 7278ebf373
2 changed files with 30 additions and 1 deletions

25
bacula-ftbfs-f_type.patch Normal file
View File

@ -0,0 +1,25 @@
From 7cdb9950acdc87e66364d3e02ad53bd078c01218 Mon Sep 17 00:00:00 2001
From: Vaclav Dolezal <vdolezal@redhat.com>
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

View File

@ -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 <vdolezal@redhat.com> - 9.4.4-4
- Fix FTBFS (#1799185)
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild