diff --git a/bacula-autoconf.patch b/bacula-autoconf.patch index 0cfe4c8..a495162 100644 --- a/bacula-autoconf.patch +++ b/bacula-autoconf.patch @@ -1,6 +1,6 @@ -diff -Naur bacula-7.0.4.old/autoconf/ltmain.sh bacula-7.0.4/autoconf/ltmain.sh ---- bacula-7.0.4.old/autoconf/ltmain.sh 2014-07-24 17:43:23.085243360 +0200 -+++ bacula-7.0.4/autoconf/ltmain.sh 2014-07-24 17:45:12.505330842 +0200 +diff -Naur bacula-13.0.4.old/autoconf/ltmain.sh bacula-13.0.4/autoconf/ltmain.sh +--- bacula-13.0.4.old/autoconf/ltmain.sh 2024-02-14 09:44:45.114001362 +0100 ++++ bacula-13.0.4/autoconf/ltmain.sh 2024-02-14 09:44:45.891014563 +0100 @@ -2429,6 +2429,7 @@ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries -shared only do dynamic linking of libtool libraries diff --git a/bacula-compile-options.patch b/bacula-compile-options.patch index 70e3540..a977eb0 100644 --- a/bacula-compile-options.patch +++ b/bacula-compile-options.patch @@ -1,6 +1,6 @@ -diff -Naur bacula-13.0.0.old/autoconf/bacula-macros/db.m4 bacula-13.0.0/autoconf/bacula-macros/db.m4 ---- bacula-13.0.0.old/autoconf/bacula-macros/db.m4 2022-07-13 15:03:38.205154215 +0200 -+++ bacula-13.0.0/autoconf/bacula-macros/db.m4 2022-07-13 15:03:43.486275326 +0200 +diff -Naur bacula-13.0.4.old/autoconf/bacula-macros/db.m4 bacula-13.0.4/autoconf/bacula-macros/db.m4 +--- bacula-13.0.4.old/autoconf/bacula-macros/db.m4 2024-02-14 09:44:45.114001362 +0100 ++++ bacula-13.0.4/autoconf/bacula-macros/db.m4 2024-02-14 09:44:45.522008294 +0100 @@ -102,7 +102,7 @@ fi DBI_INCLUDE=-I$DBI_INCDIR @@ -55,9 +55,9 @@ diff -Naur bacula-13.0.0.old/autoconf/bacula-macros/db.m4 bacula-13.0.0/autoconf else POSTGRESQL_LIBS="-L$POSTGRESQL_LIBDIR -lpq" fi -diff -Naur bacula-13.0.0.old/autoconf/configure.in bacula-13.0.0/autoconf/configure.in ---- bacula-13.0.0.old/autoconf/configure.in 2022-07-13 15:03:38.204154192 +0200 -+++ bacula-13.0.0/autoconf/configure.in 2022-07-13 15:03:43.489275395 +0200 +diff -Naur bacula-13.0.4.old/autoconf/configure.in bacula-13.0.4/autoconf/configure.in +--- bacula-13.0.4.old/autoconf/configure.in 2024-02-14 09:44:45.114001362 +0100 ++++ bacula-13.0.4/autoconf/configure.in 2024-02-14 09:44:45.523008311 +0100 @@ -16,7 +16,7 @@ cd ${BUILD_DIR} AC_SUBST(BUILD_DIR) @@ -75,7 +75,7 @@ diff -Naur bacula-13.0.0.old/autoconf/configure.in bacula-13.0.0/autoconf/config have_plugins=yes else DEFAULT_OBJECT_TYPE=".o" -@@ -3508,11 +3507,6 @@ +@@ -3513,11 +3512,6 @@ AC_DEFINE(FDLIBS) CFLAGS=${CFLAGS--O} @@ -87,9 +87,9 @@ diff -Naur bacula-13.0.0.old/autoconf/configure.in bacula-13.0.0/autoconf/config LDFLAGS=${LDFLAGS--O} CPPFLAGS="$CPPFLAGS" CFLAGS="$CFLAGS" -diff -Naur bacula-13.0.0.old/autoconf/Make.common.in bacula-13.0.0/autoconf/Make.common.in ---- bacula-13.0.0.old/autoconf/Make.common.in 2022-07-13 15:03:38.204154192 +0200 -+++ bacula-13.0.0/autoconf/Make.common.in 2022-07-13 15:03:43.490275418 +0200 +diff -Naur bacula-13.0.4.old/autoconf/Make.common.in bacula-13.0.4/autoconf/Make.common.in +--- bacula-13.0.4.old/autoconf/Make.common.in 2024-02-14 09:44:45.114001362 +0100 ++++ bacula-13.0.4/autoconf/Make.common.in 2024-02-14 09:44:45.523008311 +0100 @@ -39,7 +39,7 @@ mandir = @mandir@ manext = 8 @@ -118,9 +118,9 @@ diff -Naur bacula-13.0.0.old/autoconf/Make.common.in bacula-13.0.0/autoconf/Make # Flags & libs CFLAGS = @CFLAGS@ @OPENSSL_INC@ -diff -Naur bacula-13.0.0.old/src/qt-console/bat.pro.in bacula-13.0.0/src/qt-console/bat.pro.in ---- bacula-13.0.0.old/src/qt-console/bat.pro.in 2022-07-13 15:03:38.149152930 +0200 -+++ bacula-13.0.0/src/qt-console/bat.pro.in 2022-07-13 15:03:43.490275418 +0200 +diff -Naur bacula-13.0.4.old/src/qt-console/bat.pro.in bacula-13.0.4/src/qt-console/bat.pro.in +--- bacula-13.0.4.old/src/qt-console/bat.pro.in 2024-02-14 09:44:45.066000546 +0100 ++++ bacula-13.0.4/src/qt-console/bat.pro.in 2024-02-14 09:44:45.523008311 +0100 @@ -23,8 +23,8 @@ DEPENDPATH += . INCLUDEPATH += .. . ./console ./restore ./select @@ -141,9 +141,9 @@ diff -Naur bacula-13.0.0.old/src/qt-console/bat.pro.in bacula-13.0.0/src/qt-cons +QMAKE_CFLAGS += @CFLAGS@ +QMAKE_CXXFLAGS += @CXXFLAGS@ +QMAKE_LFLAGS += @LDFLAGS@ -diff -Naur bacula-13.0.0.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-13.0.0/src/qt-console/tray-monitor/tray-monitor.pro.in ---- bacula-13.0.0.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2022-07-13 15:03:38.166153320 +0200 -+++ bacula-13.0.0/src/qt-console/tray-monitor/tray-monitor.pro.in 2022-07-13 15:03:43.491275441 +0200 +diff -Naur bacula-13.0.4.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-13.0.4/src/qt-console/tray-monitor/tray-monitor.pro.in +--- bacula-13.0.4.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2024-02-14 09:44:45.068000580 +0100 ++++ bacula-13.0.4/src/qt-console/tray-monitor/tray-monitor.pro.in 2024-02-14 09:44:45.524008328 +0100 @@ -36,8 +36,8 @@ DEPENDPATH += . INCLUDEPATH += ../.. . diff --git a/bacula-desktop.patch b/bacula-desktop.patch index e4464d8..aca7095 100644 --- a/bacula-desktop.patch +++ b/bacula-desktop.patch @@ -1,6 +1,6 @@ -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 +diff -Naur bacula-13.0.4.old/scripts/bacula-tray-monitor.desktop.in bacula-13.0.4/scripts/bacula-tray-monitor.desktop.in +--- bacula-13.0.4.old/scripts/bacula-tray-monitor.desktop.in 2024-02-14 09:44:45.048000240 +0100 ++++ bacula-13.0.4/scripts/bacula-tray-monitor.desktop.in 2024-02-14 09:44:45.711011505 +0100 @@ -5,6 +5,5 @@ Exec=@sbindir@/bacula-tray-monitor -c @sysconfdir@/bacula-tray-monitor.conf Terminal=false @@ -9,9 +9,9 @@ diff -Naur bacula-9.6.5.old/scripts/bacula-tray-monitor.desktop.in bacula-9.6.5/ X-Desktop-File-Install-Version=0.3 -Categories=System;Application;Utility;X-Red-Hat-Base; +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 +diff -Naur bacula-13.0.4.old/scripts/bat.desktop.in bacula-13.0.4/scripts/bat.desktop.in +--- bacula-13.0.4.old/scripts/bat.desktop.in 2024-02-14 09:44:45.049000257 +0100 ++++ bacula-13.0.4/scripts/bat.desktop.in 2024-02-14 09:44:45.712011522 +0100 @@ -5,7 +5,6 @@ Exec=@sbindir@/bat -c @sysconfdir@/bat.conf Terminal=false diff --git a/bacula-docker-plugin.patch b/bacula-docker-plugin.patch index cb06696..5e7580a 100644 --- a/bacula-docker-plugin.patch +++ b/bacula-docker-plugin.patch @@ -1,7 +1,7 @@ -diff -Naur bacula-13.0.0.old/autoconf/configure.in bacula-13.0.0/autoconf/configure.in ---- bacula-13.0.0.old/autoconf/configure.in 2022-07-08 14:53:19.765602625 +0200 -+++ bacula-13.0.0/autoconf/configure.in 2022-07-08 14:54:32.972908546 +0200 -@@ -3404,20 +3404,9 @@ +diff -Naur bacula-13.0.4.old/autoconf/configure.in bacula-13.0.4/autoconf/configure.in +--- bacula-13.0.4.old/autoconf/configure.in 2024-02-14 09:44:45.616009891 +0100 ++++ bacula-13.0.4/autoconf/configure.in 2024-02-14 09:44:45.801013034 +0100 +@@ -3408,20 +3408,9 @@ ] ) if test x$support_docker = xyes -o x$support_docker = xauto; then diff --git a/bacula-install.patch b/bacula-install.patch index 3eda6e3..ab3853d 100644 --- a/bacula-install.patch +++ b/bacula-install.patch @@ -1,6 +1,6 @@ -diff -Naur bacula-13.0.0.old/autoconf/config.rpath bacula-13.0.0/autoconf/config.rpath ---- bacula-13.0.0.old/autoconf/config.rpath 2022-07-13 15:03:38.204154192 +0200 -+++ bacula-13.0.0/autoconf/config.rpath 2022-07-13 15:43:05.223631146 +0200 +diff -Naur bacula-13.0.4.old/autoconf/config.rpath bacula-13.0.4/autoconf/config.rpath +--- bacula-13.0.4.old/autoconf/config.rpath 2024-02-14 09:44:45.114001362 +0100 ++++ bacula-13.0.4/autoconf/config.rpath 2024-02-14 09:44:45.618009925 +0100 @@ -555,7 +555,7 @@ # Flag to hardcode \$libdir into a binary during linking. @@ -10,9 +10,9 @@ diff -Naur bacula-13.0.0.old/autoconf/config.rpath bacula-13.0.0/autoconf/config # Whether we need a single -rpath flag with a separated argument. hardcode_libdir_separator="$hardcode_libdir_separator" -diff -Naur bacula-13.0.0.old/examples/nagios/check_bacula/Makefile.in bacula-13.0.0/examples/nagios/check_bacula/Makefile.in ---- bacula-13.0.0.old/examples/nagios/check_bacula/Makefile.in 2022-07-13 15:03:38.216154467 +0200 -+++ bacula-13.0.0/examples/nagios/check_bacula/Makefile.in 2022-07-20 12:39:13.750123318 +0200 +diff -Naur bacula-13.0.4.old/examples/nagios/check_bacula/Makefile.in bacula-13.0.4/examples/nagios/check_bacula/Makefile.in +--- bacula-13.0.4.old/examples/nagios/check_bacula/Makefile.in 2024-02-14 09:44:45.127001583 +0100 ++++ bacula-13.0.4/examples/nagios/check_bacula/Makefile.in 2024-02-14 09:44:45.618009925 +0100 @@ -72,7 +72,8 @@ (cd $(srcdir); $(RMF) Makefile) @@ -23,17 +23,17 @@ diff -Naur bacula-13.0.0.old/examples/nagios/check_bacula/Makefile.in bacula-13. uninstall: (cd $(DESTDIR)$(sbindir); $(RMF) check_bacula) -diff -Naur bacula-13.0.0.old/scripts/logwatch/logfile.bacula.conf.in bacula-13.0.0/scripts/logwatch/logfile.bacula.conf.in ---- bacula-13.0.0.old/scripts/logwatch/logfile.bacula.conf.in 2022-07-13 15:03:38.130152495 +0200 -+++ bacula-13.0.0/scripts/logwatch/logfile.bacula.conf.in 2022-07-20 12:39:13.751123337 +0200 +diff -Naur bacula-13.0.4.old/scripts/logwatch/logfile.bacula.conf.in bacula-13.0.4/scripts/logwatch/logfile.bacula.conf.in +--- bacula-13.0.4.old/scripts/logwatch/logfile.bacula.conf.in 2024-02-14 09:44:45.049000257 +0100 ++++ bacula-13.0.4/scripts/logwatch/logfile.bacula.conf.in 2024-02-14 09:44:45.619009942 +0100 @@ -1,3 +1,3 @@ # What actual file? Defaults to LogPath if not absolute path.... -LogFile = @logdir@/bacula.log +LogFile = @logdir@/*.log -diff -Naur bacula-13.0.0.old/scripts/Makefile.in bacula-13.0.0/scripts/Makefile.in ---- bacula-13.0.0.old/scripts/Makefile.in 2022-07-13 15:03:38.127152426 +0200 -+++ bacula-13.0.0/scripts/Makefile.in 2022-07-20 12:39:13.752123356 +0200 +diff -Naur bacula-13.0.4.old/scripts/Makefile.in bacula-13.0.4/scripts/Makefile.in +--- bacula-13.0.4.old/scripts/Makefile.in 2024-02-14 09:44:45.049000257 +0100 ++++ bacula-13.0.4/scripts/Makefile.in 2024-02-14 09:44:45.619009942 +0100 @@ -67,7 +67,6 @@ $(MV) -f ${DESTDIR}${scriptdir}/baculabackupreport ${DESTDIR}${scriptdir}/baculabackupreport.old; \ fi @@ -42,18 +42,18 @@ diff -Naur bacula-13.0.0.old/scripts/Makefile.in bacula-13.0.0/scripts/Makefile. chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \ $(DESTDIR)$(scriptdir)/btraceback.dbx \ $(DESTDIR)$(scriptdir)/btraceback.mdb -diff -Naur bacula-13.0.0.old/src/cats/make_sqlite3_tables.in bacula-13.0.0/src/cats/make_sqlite3_tables.in ---- bacula-13.0.0.old/src/cats/make_sqlite3_tables.in 2022-07-13 15:03:38.137152655 +0200 -+++ bacula-13.0.0/src/cats/make_sqlite3_tables.in 2022-07-20 12:39:13.753123374 +0200 +diff -Naur bacula-13.0.4.old/src/cats/make_sqlite3_tables.in bacula-13.0.4/src/cats/make_sqlite3_tables.in +--- bacula-13.0.4.old/src/cats/make_sqlite3_tables.in 2024-02-14 09:44:45.051000291 +0100 ++++ bacula-13.0.4/src/cats/make_sqlite3_tables.in 2024-02-14 09:44:45.619009942 +0100 @@ -560,4 +560,5 @@ echo "" chmod 640 ${db_name}.db +chown bacula:bacula ${db_name}.db exit 0 -diff -Naur bacula-13.0.0.old/src/dird/bacula-dir.conf.in bacula-13.0.0/src/dird/bacula-dir.conf.in ---- bacula-13.0.0.old/src/dird/bacula-dir.conf.in 2022-07-13 15:03:38.185153756 +0200 -+++ bacula-13.0.0/src/dird/bacula-dir.conf.in 2022-07-20 12:39:13.753123374 +0200 +diff -Naur bacula-13.0.4.old/src/dird/bacula-dir.conf.in bacula-13.0.4/src/dird/bacula-dir.conf.in +--- bacula-13.0.4.old/src/dird/bacula-dir.conf.in 2024-02-14 09:44:45.090000954 +0100 ++++ bacula-13.0.4/src/dird/bacula-dir.conf.in 2024-02-14 09:44:45.619009942 +0100 @@ -18,7 +18,7 @@ Director { # define myself Name = @basename@-dir @@ -63,9 +63,9 @@ diff -Naur bacula-13.0.0.old/src/dird/bacula-dir.conf.in bacula-13.0.0/src/dird/ WorkingDirectory = "@working_dir@" PidDirectory = "@piddir@" Maximum Concurrent Jobs = 20 -diff -Naur bacula-13.0.0.old/src/dird/Makefile.in bacula-13.0.0/src/dird/Makefile.in ---- bacula-13.0.0.old/src/dird/Makefile.in 2022-07-13 15:03:38.185153756 +0200 -+++ bacula-13.0.0/src/dird/Makefile.in 2022-07-20 12:39:13.754123393 +0200 +diff -Naur bacula-13.0.4.old/src/dird/Makefile.in bacula-13.0.4/src/dird/Makefile.in +--- bacula-13.0.4.old/src/dird/Makefile.in 2024-02-14 09:44:45.090000954 +0100 ++++ bacula-13.0.4/src/dird/Makefile.in 2024-02-14 09:44:45.620009959 +0100 @@ -126,11 +126,11 @@ @if test "x${dir_group}" != "x"; then \ chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \ @@ -90,9 +90,9 @@ diff -Naur bacula-13.0.0.old/src/dird/Makefile.in bacula-13.0.0/src/dird/Makefil -diff -Naur bacula-13.0.0.old/src/plugins/fd/docker/Makefile bacula-13.0.0/src/plugins/fd/docker/Makefile ---- bacula-13.0.0.old/src/plugins/fd/docker/Makefile 2022-07-13 15:03:38.182153687 +0200 -+++ bacula-13.0.0/src/plugins/fd/docker/Makefile 2022-07-20 12:39:36.651554865 +0200 +diff -Naur bacula-13.0.4.old/src/plugins/fd/docker/Makefile bacula-13.0.4/src/plugins/fd/docker/Makefile +--- bacula-13.0.4.old/src/plugins/fd/docker/Makefile 2024-02-14 09:44:45.087000903 +0100 ++++ bacula-13.0.4/src/plugins/fd/docker/Makefile 2024-02-14 09:44:45.620009959 +0100 @@ -25,11 +25,11 @@ .c.lo: @@ -107,9 +107,9 @@ diff -Naur bacula-13.0.0.old/src/plugins/fd/docker/Makefile bacula-13.0.0/src/pl docker-fd.la: Makefile $(DOCKEROBJ) $(PLUGINLIBDIR)/pluginlib.lo $(DOCKERSRCH) @echo "Linking $(@:.la=.so) ..." -diff -Naur bacula-13.0.0.old/src/qt-console/bat.pro.in bacula-13.0.0/src/qt-console/bat.pro.in ---- bacula-13.0.0.old/src/qt-console/bat.pro.in 2022-07-20 12:39:07.881012727 +0200 -+++ bacula-13.0.0/src/qt-console/bat.pro.in 2022-07-20 12:39:13.755123412 +0200 +diff -Naur bacula-13.0.4.old/src/qt-console/bat.pro.in bacula-13.0.4/src/qt-console/bat.pro.in +--- bacula-13.0.4.old/src/qt-console/bat.pro.in 2024-02-14 09:44:45.616009891 +0100 ++++ bacula-13.0.4/src/qt-console/bat.pro.in 2024-02-14 09:44:45.620009959 +0100 @@ -12,10 +12,10 @@ datarootdir = @datarootdir@ @@ -123,9 +123,9 @@ diff -Naur bacula-13.0.0.old/src/qt-console/bat.pro.in bacula-13.0.0/src/qt-cons help.files = help/*.html images/status.png images/mail-message-new.png TEMPLATE = app -diff -Naur bacula-13.0.0.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-13.0.0/src/qt-console/tray-monitor/tray-monitor.pro.in ---- bacula-13.0.0.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2022-07-20 12:39:08.041015742 +0200 -+++ bacula-13.0.0/src/qt-console/tray-monitor/tray-monitor.pro.in 2022-07-20 12:39:13.756123431 +0200 +diff -Naur bacula-13.0.4.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-13.0.4/src/qt-console/tray-monitor/tray-monitor.pro.in +--- bacula-13.0.4.old/src/qt-console/tray-monitor/tray-monitor.pro.in 2024-02-14 09:44:45.617009908 +0100 ++++ bacula-13.0.4/src/qt-console/tray-monitor/tray-monitor.pro.in 2024-02-14 09:44:45.620009959 +0100 @@ -26,7 +26,7 @@ diff --git a/bacula-non-free-code.patch b/bacula-non-free-code.patch index 3559a81..c4cf243 100644 --- a/bacula-non-free-code.patch +++ b/bacula-non-free-code.patch @@ -1,6 +1,6 @@ -diff -Naur bacula-13.0.0.old/src/lib/lib.h bacula-13.0.0/src/lib/lib.h ---- bacula-13.0.0.old/src/lib/lib.h 2022-07-08 14:50:02.281058244 +0200 -+++ bacula-13.0.0/src/lib/lib.h 2022-07-08 14:52:00.918190647 +0200 +diff -Naur bacula-13.0.4.old/src/lib/lib.h bacula-13.0.4/src/lib/lib.h +--- bacula-13.0.4.old/src/lib/lib.h 2024-02-14 09:44:45.111001311 +0100 ++++ bacula-13.0.4/src/lib/lib.h 2024-02-14 09:44:45.343005253 +0100 @@ -57,7 +57,6 @@ #include "fnmatch.h" #endif @@ -9,9 +9,9 @@ diff -Naur bacula-13.0.0.old/src/lib/lib.h bacula-13.0.0/src/lib/lib.h #include "tree.h" #include "watchdog.h" #include "btimers.h" -diff -Naur bacula-13.0.0.old/src/lib/Makefile.in bacula-13.0.0/src/lib/Makefile.in ---- bacula-13.0.0.old/src/lib/Makefile.in 2022-07-08 14:50:02.285058315 +0200 -+++ bacula-13.0.0/src/lib/Makefile.in 2022-07-08 14:52:00.954191295 +0200 +diff -Naur bacula-13.0.4.old/src/lib/Makefile.in bacula-13.0.4/src/lib/Makefile.in +--- bacula-13.0.4.old/src/lib/Makefile.in 2024-02-14 09:44:45.112001328 +0100 ++++ bacula-13.0.4/src/lib/Makefile.in 2024-02-14 09:44:45.344005269 +0100 @@ -40,7 +40,7 @@ flist.h fnmatch.h guid_to_name.h htable.h lex.h \ lib.h lz4.h md5.h mem_pool.h message.h \ @@ -62,9 +62,9 @@ diff -Naur bacula-13.0.0.old/src/lib/Makefile.in bacula-13.0.0/src/lib/Makefile. realclean: clean @$(RMF) tags -diff -Naur bacula-13.0.0.old/src/lib/sha1.c bacula-13.0.0/src/lib/sha1.c ---- bacula-13.0.0.old/src/lib/sha1.c 2022-07-08 14:50:02.287058351 +0200 -+++ bacula-13.0.0/src/lib/sha1.c 1970-01-01 01:00:00.000000000 +0100 +diff -Naur bacula-13.0.4.old/src/lib/sha1.c bacula-13.0.4/src/lib/sha1.c +--- bacula-13.0.4.old/src/lib/sha1.c 2024-02-14 09:44:45.113001345 +0100 ++++ bacula-13.0.4/src/lib/sha1.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,517 +0,0 @@ -/* - * sha1.c @@ -583,9 +583,9 @@ diff -Naur bacula-13.0.0.old/src/lib/sha1.c bacula-13.0.0/src/lib/sha1.c - fclose(fd); -} -#endif /* SHA1_SUM */ -diff -Naur bacula-13.0.0.old/src/lib/sha1.h bacula-13.0.0/src/lib/sha1.h ---- bacula-13.0.0.old/src/lib/sha1.h 2022-07-08 14:50:02.248057651 +0200 -+++ bacula-13.0.0/src/lib/sha1.h 1970-01-01 01:00:00.000000000 +0100 +diff -Naur bacula-13.0.4.old/src/lib/sha1.h bacula-13.0.4/src/lib/sha1.h +--- bacula-13.0.4.old/src/lib/sha1.h 2024-02-14 09:44:45.109001277 +0100 ++++ bacula-13.0.4/src/lib/sha1.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,107 +0,0 @@ -/* - * sha1.h diff --git a/bacula-openssl.patch b/bacula-openssl.patch index 1d87083..8d75492 100644 --- a/bacula-openssl.patch +++ b/bacula-openssl.patch @@ -1,6 +1,6 @@ -diff -Naur bacula-11.0.1.old/src/lib/crypto.c bacula-11.0.1/src/lib/crypto.c ---- bacula-11.0.1.old/src/lib/crypto.c 2021-02-11 14:08:38.220885976 +0100 -+++ bacula-11.0.1/src/lib/crypto.c 2021-02-11 14:08:42.518956898 +0100 +diff -Naur bacula-13.0.4.old/src/lib/crypto.c bacula-13.0.4/src/lib/crypto.c +--- bacula-13.0.4.old/src/lib/crypto.c 2024-02-14 09:44:45.112001328 +0100 ++++ bacula-13.0.4/src/lib/crypto.c 2024-02-14 09:44:45.131001650 +0100 @@ -42,7 +42,7 @@ * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer * exists. It was not an official API. @@ -10,9 +10,9 @@ diff -Naur bacula-11.0.1.old/src/lib/crypto.c bacula-11.0.1/src/lib/crypto.c #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old #endif -diff -Naur bacula-11.0.1.old/src/lib/tls.c bacula-11.0.1/src/lib/tls.c ---- bacula-11.0.1.old/src/lib/tls.c 2021-02-11 14:08:38.218885943 +0100 -+++ bacula-11.0.1/src/lib/tls.c 2021-02-11 14:08:42.565957674 +0100 +diff -Naur bacula-13.0.4.old/src/lib/tls.c bacula-13.0.4/src/lib/tls.c +--- bacula-13.0.4.old/src/lib/tls.c 2024-02-14 09:44:45.112001328 +0100 ++++ bacula-13.0.4/src/lib/tls.c 2024-02-14 09:44:45.161002160 +0100 @@ -47,9 +47,6 @@ #include "openssl-compat.h" diff --git a/bacula-scripts.patch b/bacula-scripts.patch index e008cf7..65887c8 100644 --- a/bacula-scripts.patch +++ b/bacula-scripts.patch @@ -1,6 +1,6 @@ -diff -Naur bacula-13.0.1.old/scripts/isworm bacula-13.0.1/scripts/isworm ---- bacula-13.0.1.old/scripts/isworm 2022-08-05 17:13:35.000000000 +0200 -+++ bacula-13.0.1/scripts/isworm 2022-11-29 11:04:03.313337376 +0100 +diff -Naur bacula-13.0.4.old/scripts/isworm bacula-13.0.4/scripts/isworm +--- bacula-13.0.4.old/scripts/isworm 2024-02-14 09:44:45.048000240 +0100 ++++ bacula-13.0.4/scripts/isworm 2024-02-14 09:44:45.983016126 +0100 @@ -46,7 +46,7 @@ # but it does not work for mhvtl. Comment out the next 5 lines # and the code that follows will detect correctly on mhtvl. diff --git a/bacula-seg-fault.patch b/bacula-seg-fault.patch index f468cd8..0e63adb 100644 --- a/bacula-seg-fault.patch +++ b/bacula-seg-fault.patch @@ -1,6 +1,6 @@ -diff -Naur bacula-13.0.0.old/src/lib/message.c bacula-13.0.0/src/lib/message.c ---- bacula-13.0.0.old/src/lib/message.c 2022-07-08 14:50:02.247057633 +0200 -+++ bacula-13.0.0/src/lib/message.c 2022-07-08 14:51:05.527195040 +0200 +diff -Naur bacula-13.0.4.old/src/lib/message.c bacula-13.0.4/src/lib/message.c +--- bacula-13.0.4.old/src/lib/message.c 2024-02-14 09:44:45.108001260 +0100 ++++ bacula-13.0.4/src/lib/message.c 2024-02-14 09:44:45.253003723 +0100 @@ -28,6 +28,7 @@ * */ diff --git a/bacula-traceback-man.patch b/bacula-traceback-man.patch index 771098f..1e5b425 100644 --- a/bacula-traceback-man.patch +++ b/bacula-traceback-man.patch @@ -1,9 +1,6 @@ -Description: Fix libexec path in man-pages -Author: Sven Hartge -Forwarded: not-needed - ---- a/manpages/btraceback.8 -+++ b/manpages/btraceback.8 +diff -Naur bacula-13.0.4.old/manpages/btraceback.8 bacula-13.0.4/manpages/btraceback.8 +--- bacula-13.0.4.old/manpages/btraceback.8 2024-02-14 09:44:45.050000274 +0100 ++++ bacula-13.0.4/manpages/btraceback.8 2024-02-14 09:44:45.434006799 +0100 @@ -45,14 +45,14 @@ .SH FILES diff --git a/bacula.spec b/bacula.spec index efcd610..9c14f70 100644 --- a/bacula.spec +++ b/bacula.spec @@ -4,8 +4,8 @@ %bcond qt %[%{undefined rhel} || 0%{?rhel} < 10] Name: bacula -Version: 13.0.3 -Release: 5%{?dist} +Version: 13.0.4 +Release: 1%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -303,9 +303,6 @@ autoconf -I autoconf/ -o configure autoconf/configure.in # Remove execution permissions from files we're packaging as docs later on find updatedb -type f | xargs chmod -x -# Remove dash requirement: -sed -i -e 's|/bin/dash|/bin/sh|g' scripts/baculabackupreport.in - %build export CFLAGS="%{optflags} -I%{_includedir}/ncurses" export CPPFLAGS="%{optflags} -I%{_includedir}/ncurses" @@ -373,6 +370,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # change between upgrades, so the versioned library name can not be used. rm -f %{buildroot}%{_libdir}/libbaccats.so +# Remove placeholder +rm -f %{buildroot}%{_libexecdir}/%{name}/baculabackupreport + %if %{with qt} # Bat install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png @@ -540,7 +540,6 @@ exit 0 %config(noreplace) %{_sysconfdir}/bacula/query.sql %attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/sysconfig/bacula-dir %{_libdir}/%{name}/ldap-dir.so -%{_libexecdir}/%{name}/baculabackupreport %{_libexecdir}/%{name}/create_bacula_database %{_libexecdir}/%{name}/delete_catalog_backup %{_libexecdir}/%{name}/drop_bacula_database @@ -658,6 +657,9 @@ exit 0 %{_libdir}/nagios/plugins/check_bacula %changelog +* Wed Feb 14 2024 Simone Caronni - 13.0.4-1 +- Update to 13.0.4. + * Tue Jan 23 2024 Fedora Release Engineering - 13.0.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild