Update to 9.6.5
This commit is contained in:
Simone Caronni
parent
fa08626e6c
commit
db8f94b189
1
.gitignore
vendored
1
.gitignore
vendored
@ -49,3 +49,4 @@ bacula-docs-5.0.3.tar.bz2
|
||||
/bacula-9.4.4.tar.gz
|
||||
/bacula-9.6.2.tar.gz
|
||||
/bacula-9.6.3.tar.gz
|
||||
/bacula-9.6.5.tar.gz
|
||||
|
||||
@ -1,22 +1,17 @@
|
||||
diff -Naur bacula-9.0.2.old/scripts/bacula-tray-monitor.desktop.in bacula-9.0.2/scripts/bacula-tray-monitor.desktop.in
|
||||
--- bacula-9.0.2.old/scripts/bacula-tray-monitor.desktop.in 2017-07-24 15:22:19.884540422 +0200
|
||||
+++ bacula-9.0.2/scripts/bacula-tray-monitor.desktop.in 2017-07-24 15:37:02.175038149 +0200
|
||||
@@ -1,10 +1,9 @@
|
||||
[Desktop Entry]
|
||||
Name=Bacula Monitor
|
||||
Comment=Notification Tray Monitor
|
||||
-Icon=/usr/share/pixmaps/bacula-tray-monitor.xpm
|
||||
+Icon=/usr/share/pixmaps/bacula-tray-monitor.png
|
||||
Exec=@sbindir@/bacula-tray-monitor -c @sysconfdir@/tray-monitor.conf
|
||||
diff -Naur bacula-9.6.5.old/scripts/bacula-tray-monitor.desktop.in bacula-9.6.5/scripts/bacula-tray-monitor.desktop.in
|
||||
--- bacula-9.6.5.old/scripts/bacula-tray-monitor.desktop.in 2020-07-24 09:11:40.976119619 +0200
|
||||
+++ bacula-9.6.5/scripts/bacula-tray-monitor.desktop.in 2020-07-24 09:16:52.055851377 +0200
|
||||
@@ -5,6 +5,5 @@
|
||||
Exec=@sbindir@/bacula-tray-monitor -c @sysconfdir@/bacula-tray-monitor.conf
|
||||
Terminal=false
|
||||
Type=Application
|
||||
-Encoding=UTF-8
|
||||
X-Desktop-File-Install-Version=0.3
|
||||
-Categories=System;Application;Utility;X-Red-Hat-Base;
|
||||
+Categories=Utility;
|
||||
diff -Naur bacula-9.0.2.old/scripts/bat.desktop.in bacula-9.0.2/scripts/bat.desktop.in
|
||||
--- bacula-9.0.2.old/scripts/bat.desktop.in 2017-07-24 15:22:19.884540422 +0200
|
||||
+++ bacula-9.0.2/scripts/bat.desktop.in 2017-07-24 15:36:22.753301014 +0200
|
||||
+Categories=System;Utility;
|
||||
diff -Naur bacula-9.6.5.old/scripts/bat.desktop.in bacula-9.6.5/scripts/bat.desktop.in
|
||||
--- bacula-9.6.5.old/scripts/bat.desktop.in 2020-07-24 09:11:40.976119619 +0200
|
||||
+++ bacula-9.6.5/scripts/bat.desktop.in 2020-07-24 09:17:21.178294361 +0200
|
||||
@@ -5,7 +5,6 @@
|
||||
Exec=@sbindir@/bat -c @sysconfdir@/bat.conf
|
||||
Terminal=false
|
||||
@ -25,10 +20,10 @@ diff -Naur bacula-9.0.2.old/scripts/bat.desktop.in bacula-9.0.2/scripts/bat.desk
|
||||
StartupNotify=true
|
||||
X-Desktop-File-Install-Version=0.3
|
||||
-Categories=System;Application;Utility;X-Red-Hat-Base;
|
||||
+Categories=Utility;
|
||||
diff -Naur bacula-9.0.2.old/scripts/Makefile.in bacula-9.0.2/scripts/Makefile.in
|
||||
--- bacula-9.0.2.old/scripts/Makefile.in 2017-07-24 15:22:19.884540422 +0200
|
||||
+++ bacula-9.0.2/scripts/Makefile.in 2017-07-24 15:25:03.829605989 +0200
|
||||
+Categories=System;Utility;
|
||||
diff -Naur bacula-9.6.5.old/scripts/Makefile.in bacula-9.6.5/scripts/Makefile.in
|
||||
--- bacula-9.6.5.old/scripts/Makefile.in 2020-07-24 09:11:40.976119619 +0200
|
||||
+++ bacula-9.6.5/scripts/Makefile.in 2020-07-24 09:17:57.725850277 +0200
|
||||
@@ -67,7 +67,6 @@
|
||||
$(MV) -f ${DESTDIR}${scriptdir}/baculabackupreport ${DESTDIR}${scriptdir}/baculabackupreport.old; \
|
||||
fi
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff -Naur bacula-9.6.2.old/autoconf/configure.in bacula-9.6.2/autoconf/configure.in
|
||||
--- bacula-9.6.2.old/autoconf/configure.in 2020-03-03 16:21:10.910563621 +0100
|
||||
+++ bacula-9.6.2/autoconf/configure.in 2020-03-03 16:21:21.733789410 +0100
|
||||
@@ -3074,11 +3074,6 @@
|
||||
diff -Naur bacula-9.6.5.old/autoconf/configure.in bacula-9.6.5/autoconf/configure.in
|
||||
--- bacula-9.6.5.old/autoconf/configure.in 2020-07-24 09:11:40.890118308 +0200
|
||||
+++ bacula-9.6.5/autoconf/configure.in 2020-07-24 09:18:37.263451673 +0200
|
||||
@@ -3088,11 +3088,6 @@
|
||||
AC_DEFINE(FDLIBS)
|
||||
|
||||
CFLAGS=${CFLAGS--O}
|
||||
|
||||
@ -1,31 +1,18 @@
|
||||
diff -Naur bacula-9.6.2.old/autoconf/configure.in bacula-9.6.2/autoconf/configure.in
|
||||
--- bacula-9.6.2.old/autoconf/configure.in 2020-03-05 09:46:32.131750774 +0100
|
||||
+++ bacula-9.6.2/autoconf/configure.in 2020-03-05 09:47:33.786041438 +0100
|
||||
@@ -3498,11 +3498,11 @@
|
||||
src/qt-console/bat.pro.mingw32 \
|
||||
src/qt-console/bat.pro.mingw64 \
|
||||
src/qt-console/install_conf_file \
|
||||
- src/qt-console/tray-monitor/tray-monitor.conf \
|
||||
src/qt-console/tray-monitor/bacula-tray-monitor.conf \
|
||||
src/qt-console/tray-monitor/tray-monitor.pro \
|
||||
src/qt-console/tray-monitor/tray-monitor.pro.mingw32 \
|
||||
src/qt-console/tray-monitor/tray-monitor.pro.mingw64 \
|
||||
+ src/qt-console/tray-monitor/install_conf_file \
|
||||
src/dird/Makefile \
|
||||
src/dird/bacula-dir.conf \
|
||||
src/lib/Makefile \
|
||||
@@ -3609,6 +3609,8 @@
|
||||
|
||||
cd src/qt-console
|
||||
diff -Naur bacula-9.6.5.old/autoconf/configure.in bacula-9.6.5/autoconf/configure.in
|
||||
--- bacula-9.6.5.old/autoconf/configure.in 2020-07-24 09:19:47.073513530 +0200
|
||||
+++ bacula-9.6.5/autoconf/configure.in 2020-07-24 09:25:50.708044682 +0200
|
||||
@@ -3612,6 +3612,8 @@
|
||||
chmod 755 install_conf_file build-depkgs-qt-console
|
||||
cd tray-monitor
|
||||
chmod 755 install_conf_file build-depkgs-qt-console
|
||||
+cd tray-monitor
|
||||
+chmod 755 install_conf_file build-depkgs-qt-console
|
||||
cd ${BUILD_DIR}
|
||||
|
||||
cd scripts
|
||||
diff -Naur bacula-9.6.2.old/examples/nagios/check_bacula/Makefile.in bacula-9.6.2/examples/nagios/check_bacula/Makefile.in
|
||||
--- bacula-9.6.2.old/examples/nagios/check_bacula/Makefile.in 2020-03-05 09:46:32.128750711 +0100
|
||||
+++ bacula-9.6.2/examples/nagios/check_bacula/Makefile.in 2020-03-05 09:46:40.145918546 +0100
|
||||
diff -Naur bacula-9.6.5.old/examples/nagios/check_bacula/Makefile.in bacula-9.6.5/examples/nagios/check_bacula/Makefile.in
|
||||
--- bacula-9.6.5.old/examples/nagios/check_bacula/Makefile.in 2020-07-24 09:11:40.888118277 +0200
|
||||
+++ bacula-9.6.5/examples/nagios/check_bacula/Makefile.in 2020-07-24 09:25:50.708044682 +0200
|
||||
@@ -72,7 +72,7 @@
|
||||
(cd $(srcdir); $(RMF) Makefile)
|
||||
|
||||
@ -35,21 +22,9 @@ diff -Naur bacula-9.6.2.old/examples/nagios/check_bacula/Makefile.in bacula-9.6.
|
||||
|
||||
uninstall:
|
||||
(cd $(DESTDIR)$(sbindir); $(RMF) check_bacula)
|
||||
diff -Naur bacula-9.6.2.old/Makefile.in bacula-9.6.2/Makefile.in
|
||||
--- bacula-9.6.2.old/Makefile.in 2020-03-05 09:46:32.135750858 +0100
|
||||
+++ bacula-9.6.2/Makefile.in 2020-03-05 09:46:40.146918567 +0100
|
||||
@@ -173,6 +173,8 @@
|
||||
done
|
||||
(cd src/qt-console; \
|
||||
chmod 755 install_conf_file build-depkgs-qt-console)
|
||||
+ (cd src/qt-console/tray-monitor; \
|
||||
+ chmod 755 install_conf_file build-depkgs-qt-console)
|
||||
|
||||
clean:
|
||||
@for I in ${all_subdirs} ; \
|
||||
diff -Naur bacula-9.6.2.old/src/qt-console/bat.pro.in bacula-9.6.2/src/qt-console/bat.pro.in
|
||||
--- bacula-9.6.2.old/src/qt-console/bat.pro.in 2020-03-05 09:46:32.163751446 +0100
|
||||
+++ bacula-9.6.2/src/qt-console/bat.pro.in 2020-03-05 09:46:40.146918567 +0100
|
||||
diff -Naur bacula-9.6.5.old/src/qt-console/bat.pro.in bacula-9.6.5/src/qt-console/bat.pro.in
|
||||
--- bacula-9.6.5.old/src/qt-console/bat.pro.in 2020-07-24 09:13:23.953685986 +0200
|
||||
+++ bacula-9.6.5/src/qt-console/bat.pro.in 2020-07-24 09:25:52.180067067 +0200
|
||||
@@ -12,7 +12,7 @@
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||
|
||||
@ -59,9 +34,9 @@ diff -Naur bacula-9.6.2.old/src/qt-console/bat.pro.in bacula-9.6.2/src/qt-consol
|
||||
confs.path = /$(DESTDIR)@sysconfdir@
|
||||
confs.commands = ./install_conf_file
|
||||
help.path = /$(DESTDIR)@htmldir@
|
||||
diff -Naur bacula-9.6.2.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-9.6.2/src/qt-console/tray-monitor/tray-monitor.pro.in
|
||||
--- bacula-9.6.2.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2020-03-05 09:46:32.166751509 +0100
|
||||
+++ bacula-9.6.2/src/qt-console/tray-monitor/tray-monitor.pro.in 2020-03-05 09:46:40.146918567 +0100
|
||||
diff -Naur bacula-9.6.5.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-9.6.5/src/qt-console/tray-monitor/tray-monitor.pro.in
|
||||
--- bacula-9.6.5.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2020-07-24 09:11:40.947119177 +0200
|
||||
+++ bacula-9.6.5/src/qt-console/tray-monitor/tray-monitor.pro.in 2020-07-24 09:25:52.212067555 +0200
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
diff -Naur bacula-9.6.2.old/autoconf/configure.in bacula-9.6.2/autoconf/configure.in
|
||||
--- bacula-9.6.2.old/autoconf/configure.in 2020-03-03 16:21:50.126381725 +0100
|
||||
+++ bacula-9.6.2/autoconf/configure.in 2020-03-03 16:22:03.870668458 +0100
|
||||
@@ -1938,6 +1938,20 @@
|
||||
|
||||
AC_CHECK_FUNC(accept4, [AC_DEFINE(HAVE_ACCEPT4, 1, [Define to 1 if you have the 'accept4' function.])])
|
||||
|
||||
+dnl ---------------------------------------------------
|
||||
+dnl Check for S3 support/directory (default on)
|
||||
+dnl ---------------------------------------------------
|
||||
+dnl this allows you to turn it completely off
|
||||
+
|
||||
+AC_ARG_ENABLE(s3,
|
||||
+ AC_HELP_STRING([--disable-s3], [disable S3 support @<:@default=yes@:>@]),
|
||||
+ [
|
||||
+ if test x$enableval = xno; then
|
||||
+ support_s3=no
|
||||
+ fi
|
||||
+ ]
|
||||
+)
|
||||
+
|
||||
S3_INC=
|
||||
S3_LIBS=
|
||||
S3_LDFLAGS=
|
||||
@@ -3713,6 +3727,7 @@
|
||||
Encryption support: ${support_crypto}
|
||||
ZLIB support: ${have_zlib}
|
||||
LZO support: ${have_lzo}
|
||||
+ S3 support: ${have_libs3}
|
||||
enable-smartalloc: ${support_smartalloc}
|
||||
enable-lockmgr: ${support_lockmgr}
|
||||
bat support: ${support_bat}
|
||||
@ -1,6 +1,6 @@
|
||||
diff -Naur bacula-9.4.0.old/src/lib/message.c bacula-9.4.0/src/lib/message.c
|
||||
--- bacula-9.4.0.old/src/lib/message.c 2018-12-16 11:30:25.000000000 +0100
|
||||
+++ bacula-9.4.0/src/lib/message.c 2019-01-12 15:20:25.794653213 +0100
|
||||
diff -Naur bacula-9.6.5.old/src/lib/message.c bacula-9.6.5/src/lib/message.c
|
||||
--- bacula-9.6.5.old/src/lib/message.c 2020-07-24 09:11:40.900118460 +0200
|
||||
+++ bacula-9.6.5/src/lib/message.c 2020-07-24 09:12:48.705149825 +0200
|
||||
@@ -28,6 +28,7 @@
|
||||
*
|
||||
*/
|
||||
@ -9,7 +9,7 @@ diff -Naur bacula-9.4.0.old/src/lib/message.c bacula-9.4.0/src/lib/message.c
|
||||
#include "bacula.h"
|
||||
#include "jcr.h"
|
||||
|
||||
@@ -1413,7 +1414,8 @@
|
||||
@@ -1429,7 +1430,8 @@
|
||||
|
||||
if (type == M_ABORT) {
|
||||
char *p = 0;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
%global username bacula
|
||||
|
||||
Name: bacula
|
||||
Version: 9.6.3
|
||||
Version: 9.6.5
|
||||
Release: 1%{?dist}
|
||||
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
|
||||
# See LICENSE for details
|
||||
@ -37,7 +37,6 @@ Patch7: %{name}-non-free-code.patch
|
||||
# desktop-file-install not supported on RHEL 6
|
||||
Patch8: %{name}-desktop.patch
|
||||
Patch9: %{name}-g++-options.patch
|
||||
Patch10: %{name}-s3-configure.patch
|
||||
Patch11: %{name}-ftbfs-f_type.patch
|
||||
Patch12: %{name}-install.patch
|
||||
# Original patch removed by mistake, upstream is not willing to add it again:
|
||||
@ -743,6 +742,9 @@ fi
|
||||
%{_libdir}/nagios/plugins/check_bacula
|
||||
|
||||
%changelog
|
||||
* Fri Jul 24 2020 Simone Caronni <negativo17@gmail.com> - 9.6.5-1
|
||||
- Update to 9.6.5.
|
||||
|
||||
* Tue Mar 17 2020 Simone Caronni <negativo17@gmail.com> - 9.6.3-1
|
||||
- Update to 9.6.3.
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (bacula-9.6.3.tar.gz) = 8ee14311945ff04c4d3ca736725e2187bcf3e9e0a3093df215c8651bd6a7b07792edea4912ba84189ee79df614c1e99a4333ce173163cfc7efb536dad582106f
|
||||
SHA512 (bacula-9.6.5.tar.gz) = 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70
|
||||
|
||||
Loading…
Reference in New Issue
Block a user