From ac0f7b91fa3028de90739aa60fed64e9bca34278 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Jul 25 2016 11:43:30 +0000
Subject: Add upstream patch to fix el5 i386 builds


---

diff --git a/bacula-7.4.3-fix-el5-build.patch b/bacula-7.4.3-fix-el5-build.patch
new file mode 100644
index 0000000..81a0df4
--- /dev/null
+++ b/bacula-7.4.3-fix-el5-build.patch
@@ -0,0 +1,13 @@
+--- a/src/lib/edit.c
++++ b/src/lib/edit.c
+@@ -350,8 +350,8 @@ static bool strunit_to_uint64(char *str, int str_len, uint64_t *value,
+                            1000000,        /* mb megabyte */
+                            1073741824,     /* gigabyte */
+                            1000000000,     /* gb gigabyte */
+-                           1099511627776,  /* terabyte */
+-                           1000000000000}; /* tb terabyte */
++                           1099511627776LL,  /* terabyte */
++                           1000000000000LL}; /* tb terabyte */
+ 
+    if (!get_modifier(str, num_str, sizeof(num_str), mod_str, sizeof(mod_str))) {
+       return 0;
diff --git a/bacula.spec b/bacula.spec
index 5f28739..dddf4ec 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
 
 Name:               bacula
 Version:            7.4.3
-Release:            2%{?dist}
+Release:            3%{?dist}
 Summary:            Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:            AGPLv3 with exceptions
@@ -40,6 +40,7 @@ Patch4:             %{name}-7.4.0-bat-build.patch
 Patch5:             %{name}-7.4.0-seg-fault.patch
 Patch6:             %{name}-5.2.13-logwatch.patch
 Patch7:             %{name}-7.2.0-non-free-code.patch
+Patch8:             %{name}-7.4.3-fix-el5-build.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
@@ -331,6 +332,7 @@ Provides check_bacula support for Nagios.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 %patch10 -p1
 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -772,6 +774,9 @@ fi
 %{_libdir}/nagios/plugins/check_bacula
 
 %changelog
+* Mon Jul 25 2016 Simone Caronni <negativo17@gmail.com> - 7.4.3-3
+- Add upstream patch to fix el5 i386 builds.
+
 * Wed Jul 20 2016 Simone Caronni <negativo17@gmail.com> - 7.4.3-2
 - Remove GCC 6+ workaround bug, reset to default distribution optimizations.