rpms/bacula
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Add upstream patch to fix el5 i386 builds

Browse Source
This commit is contained in:
Simone Caronni 2016-07-25 13:43:30 +02:00
parent dfd0432664
commit ac0f7b91fa
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bacula-7.4.3-fix-el5-build.patch Normal file
View File

@ -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;

7
bacula.spec
View File

@ -3,7 +3,7 @@
Name: bacula Name: bacula
Version: 7.4.3 Version: 7.4.3
Release: 2%{?dist} Release: 3%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details # See LICENSE for details
License: AGPLv3 with exceptions License: AGPLv3 with exceptions
@ -40,6 +40,7 @@ Patch4: %{name}-7.4.0-bat-build.patch
Patch5: %{name}-7.4.0-seg-fault.patch Patch5: %{name}-7.4.0-seg-fault.patch
Patch6: %{name}-5.2.13-logwatch.patch Patch6: %{name}-5.2.13-logwatch.patch
Patch7: %{name}-7.2.0-non-free-code.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: # 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 # 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 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1
%patch10 -p1 %patch10 -p1
cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
@ -772,6 +774,9 @@ fi
%{_libdir}/nagios/plugins/check_bacula %{_libdir}/nagios/plugins/check_bacula
%changelog %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 * Wed Jul 20 2016 Simone Caronni <negativo17@gmail.com> - 7.4.3-2
- Remove GCC 6+ workaround bug, reset to default distribution optimizations. - Remove GCC 6+ workaround bug, reset to default distribution optimizations.