-diff -dur -x '*~' bacula-7.0.5.orig/autoconf/configure.in bacula-7.0.5/autoconf/configure.in
---- bacula-7.0.5.orig/autoconf/configure.in 2014-07-29 18:31:22.000000000 +0200
-+++ bacula-7.0.5/autoconf/configure.in 2015-03-22 13:46:06.462795073 +0100
-@@ -3152,6 +3152,14 @@
+diff -ur bacula-11.0.6.orig/autoconf/configure.in bacula-11.0.6/autoconf/configure.in
+--- bacula-11.0.6.orig/autoconf/configure.in 2022-04-03 11:29:43.383049234 +0000
++++ bacula-11.0.6/autoconf/configure.in 2022-04-03 11:30:02.645093123 +0000
+@@ -3642,6 +3642,14 @@
platforms/suse/bacula-sd \
platforms/suse/bacula-dir"
;;
---- bacula-3.0.0/scripts/bat.desktop.in~ 2007-04-29 16:48:18.000000000 +0300
-+++ bacula-3.0.0/scripts/bat.desktop.in 2009-04-15 19:11:45.310914865 +0300
+diff -ur bacula-11.0.6.orig/scripts/bat.desktop.in bacula-11.0.6/scripts/bat.desktop.in
+--- bacula-11.0.6.orig/scripts/bat.desktop.in 2022-04-03 11:30:25.924146163 +0000
++++ bacula-11.0.6/scripts/bat.desktop.in 2022-04-03 11:30:42.205183255 +0000
@@ -1,11 +1,10 @@
[Desktop Entry]
Name=Bacula Administration Tool
Comment=Bacula Director Console
-Icon=/usr/share/pixmaps/bat_icon.png
-+Icon=bacula
-Exec=@sbindir@/bat -c @sysconfdir@/bat.conf
++Icon=bacula
+Exec=@bindir@/bat -c @sysconfdir@/bat.conf
Terminal=false
Type=Application
-diff -urNp -x '*.orig' bacula-9.4.2.org/scripts/mtx-changer.in bacula-9.4.2/scripts/mtx-changer.in
---- bacula-9.4.2.org/scripts/mtx-changer.in 2019-02-04 17:47:31.000000000 +0100
-+++ bacula-9.4.2/scripts/mtx-changer.in 2021-09-26 09:47:51.139744008 +0200
+diff -ur bacula-11.0.6.orig/scripts/mtx-changer.in bacula-11.0.6/scripts/mtx-changer.in
+--- bacula-11.0.6.orig/scripts/mtx-changer.in 2022-03-10 15:57:01.000000000 +0000
++++ bacula-11.0.6/scripts/mtx-changer.in 2022-04-03 11:28:37.710899617 +0000
@@ -65,13 +65,13 @@
myversion=2
-diff -dur bacula-5.2.13.orig/src/version.h bacula-5.2.13/src/version.h
---- bacula-5.2.13.orig/src/version.h 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/version.h 2013-12-04 20:36:09.987318325 +0100
-@@ -77,9 +77,9 @@
+diff -ur bacula-11.0.6.orig/src/version.h bacula-11.0.6/src/version.h
+--- bacula-11.0.6.orig/src/version.h 2022-04-03 11:31:32.929298827 +0000
++++ bacula-11.0.6/src/version.h 2022-04-03 11:32:34.071438141 +0000
+@@ -87,9 +87,9 @@
* it can always be turned on, but we advise to use it only
* for debug
*/
--# ifndef _USE_LOCKMGR
--# define _USE_LOCKMGR
--# endif /* _USE_LOCKMGR */
-+//# ifndef _USE_LOCKMGR
-+//# define _USE_LOCKMGR
-+//# endif /* _USE_LOCKMGR */
+-# ifndef USE_LOCKMGR
+-# define USE_LOCKMGR
+-# endif /* USE_LOCKMGR */
++//# ifndef USE_LOCKMGR
++//# define USE_LOCKMGR
++//# endif /* USE_LOCKMGR */
/*
* Enable priority management with the lock manager
*
+++ /dev/null
-diff -dur -x '*~' bacula-5.2.13.orig/src/baconfig.h bacula-5.2.13/src/baconfig.h
---- bacula-5.2.13.orig/src/baconfig.h 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/baconfig.h 2013-12-04 16:12:31.000000000 +0100
-@@ -473,7 +473,6 @@
- #else
- /* Groan, WxWidgets has its own way of doing NLS so cleanup */
- #ifndef ENABLE_NLS
--#undef _
- #undef setlocale
- #undef textdomain
- #undef bindtextdomain
-diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/authenticate.c bacula-5.2.13/src/wx-console/authenticate.c
---- bacula-5.2.13.orig/src/wx-console/authenticate.c 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/wx-console/authenticate.c 2013-12-04 16:07:18.000000000 +0100
-@@ -48,12 +48,13 @@
-
- #undef _DEBUG
-
-+#include <wx/string.h>
-+#include <wx/thread.h>
-+#include <wx/intl.h>
- #include "bacula.h"
- #include "console_conf.h"
- #include "jcr.h"
-
--#include <wx/intl.h>
--
- #include "csprint.h"
-
- void senditf(char *fmt, ...);
-diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/console_conf.c bacula-5.2.13/src/wx-console/console_conf.c
---- bacula-5.2.13.orig/src/wx-console/console_conf.c 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/wx-console/console_conf.c 2013-12-04 16:07:36.000000000 +0100
-@@ -57,11 +57,12 @@
-
- #undef _DEBUG
-
-+#include <wx/string.h>
-+#include <wx/thread.h>
-+#include <wx/intl.h>
- #include "bacula.h"
- #include "console_conf.h"
-
--#include <wx/intl.h>
--
- /* Define the first and last resource ID record
- * types. Note, these should be unique for each
- * daemon though not a requirement.
-diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/console_thread.cpp bacula-5.2.13/src/wx-console/console_thread.cpp
---- bacula-5.2.13.orig/src/wx-console/console_thread.cpp 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/wx-console/console_thread.cpp 2013-12-04 16:07:54.000000000 +0100
-@@ -46,6 +46,9 @@
-
- #undef _DEBUG
-
-+#include <wx/string.h>
-+#include <wx/thread.h>
-+#include <wx/intl.h>
- #include "bacula.h"
- #include "console_conf.h"
-
-@@ -53,7 +56,6 @@
-
- #include <wx/wxprec.h>
-
--#include <wx/thread.h>
- #include <wx/file.h>
-
- #include "csprint.h"
-diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/console_thread.h bacula-5.2.13/src/wx-console/console_thread.h
---- bacula-5.2.13.orig/src/wx-console/console_thread.h 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/wx-console/console_thread.h 2013-12-04 16:08:10.000000000 +0100
-@@ -37,18 +37,8 @@
- #ifndef CONSOLE_THREAD_H
- #define CONSOLE_THREAD_H
-
--#ifndef ENABLE_NLS
--#undef setlocale
--#undef textdomain
--#undef bindtextdomain
--#endif
--
--
- #include <wx/wxprec.h>
-
--#include <wx/string.h>
--#include <wx/thread.h> // inheriting class's header file
--#include <wx/intl.h> /* We need to have _ and N_ defined by wxWidgets before Bacula tries to redefine them */
- #include "bacula.h"
- #include "jcr.h"
-
-diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/main.cpp bacula-5.2.13/src/wx-console/main.cpp
---- bacula-5.2.13.orig/src/wx-console/main.cpp 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/wx-console/main.cpp 2013-12-04 16:08:36.000000000 +0100
-@@ -50,11 +50,13 @@
-
- #undef _DEBUG
-
-+#include <wx/string.h>
-+#include <wx/thread.h>
-+#include <wx/intl.h>
- #include "bacula.h"
-
- #include <wx/wxprec.h>
- #include <wx/config.h>
--#include <wx/intl.h>
- #include "wxbmainframe.h"
- #include "csprint.h"
-
-diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbconfigfileeditor.cpp bacula-5.2.13/src/wx-console/wxbconfigfileeditor.cpp
---- bacula-5.2.13.orig/src/wx-console/wxbconfigfileeditor.cpp 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/wx-console/wxbconfigfileeditor.cpp 2013-12-04 16:08:55.000000000 +0100
-@@ -41,6 +41,9 @@
-
- #undef _DEBUG
-
-+#include <wx/string.h>
-+#include <wx/thread.h>
-+#include <wx/intl.h>
- #include "bacula.h"
- #include "wxbconfigfileeditor.h"
- #include <wx/file.h>
-diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbconfigpanel.cpp bacula-5.2.13/src/wx-console/wxbconfigpanel.cpp
---- bacula-5.2.13.orig/src/wx-console/wxbconfigpanel.cpp 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/wx-console/wxbconfigpanel.cpp 2013-12-04 16:09:13.000000000 +0100
-@@ -41,6 +41,9 @@
-
- #undef _DEBUG
-
-+#include <wx/string.h>
-+#include <wx/thread.h>
-+#include <wx/intl.h>
- #include "bacula.h"
- #include "wxbconfigpanel.h"
- #include <wx/arrimpl.cpp>
-diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbhistorytextctrl.cpp bacula-5.2.13/src/wx-console/wxbhistorytextctrl.cpp
---- bacula-5.2.13.orig/src/wx-console/wxbhistorytextctrl.cpp 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/wx-console/wxbhistorytextctrl.cpp 2013-12-04 16:09:43.000000000 +0100
-@@ -41,6 +41,9 @@
-
- #undef _DEBUG
-
-+#include <wx/string.h>
-+#include <wx/thread.h>
-+#include <wx/intl.h>
- #include "bacula.h"
- #include "wxbhistorytextctrl.h"
-
-diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxblistctrl.cpp bacula-5.2.13/src/wx-console/wxblistctrl.cpp
---- bacula-5.2.13.orig/src/wx-console/wxblistctrl.cpp 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/wx-console/wxblistctrl.cpp 2013-12-04 16:10:01.000000000 +0100
-@@ -42,6 +42,9 @@
-
- #undef _DEBUG
-
-+#include <wx/string.h>
-+#include <wx/thread.h>
-+#include <wx/intl.h>
- #include "bacula.h"
-
- #include "wxblistctrl.h"
-diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbmainframe.cpp bacula-5.2.13/src/wx-console/wxbmainframe.cpp
---- bacula-5.2.13.orig/src/wx-console/wxbmainframe.cpp 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/wx-console/wxbmainframe.cpp 2013-12-04 16:10:26.000000000 +0100
-@@ -41,6 +41,9 @@
-
- #undef _DEBUG
-
-+#include <wx/string.h>
-+#include <wx/thread.h>
-+#include <wx/intl.h>
- #include "bacula.h"
-
- #include "wxbmainframe.h" // class's header file
-diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbrestorepanel.cpp bacula-5.2.13/src/wx-console/wxbrestorepanel.cpp
---- bacula-5.2.13.orig/src/wx-console/wxbrestorepanel.cpp 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/wx-console/wxbrestorepanel.cpp 2013-12-04 16:10:39.000000000 +0100
-@@ -69,6 +69,9 @@
-
- #undef _DEBUG
-
-+#include <wx/string.h>
-+#include <wx/thread.h>
-+#include <wx/intl.h>
- #include "bacula.h"
-
- #include "wxbrestorepanel.h"
-diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbtableparser.cpp bacula-5.2.13/src/wx-console/wxbtableparser.cpp
---- bacula-5.2.13.orig/src/wx-console/wxbtableparser.cpp 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/wx-console/wxbtableparser.cpp 2013-12-04 16:10:59.000000000 +0100
-@@ -48,6 +48,9 @@
-
- #undef _DEBUG
-
-+#include <wx/string.h>
-+#include <wx/thread.h>
-+#include <wx/intl.h>
- #include "bacula.h"
-
- #include "wxbtableparser.h" // class's header file
-diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbtreectrl.cpp bacula-5.2.13/src/wx-console/wxbtreectrl.cpp
---- bacula-5.2.13.orig/src/wx-console/wxbtreectrl.cpp 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/wx-console/wxbtreectrl.cpp 2013-12-04 16:11:22.000000000 +0100
-@@ -42,6 +42,9 @@
-
- #undef _DEBUG
-
-+#include <wx/string.h>
-+#include <wx/thread.h>
-+#include <wx/intl.h>
- #include "bacula.h"
-
- #include "wxbtreectrl.h"
-diff -dur -x '*~' bacula-5.2.13.orig/src/wx-console/wxbutils.cpp bacula-5.2.13/src/wx-console/wxbutils.cpp
---- bacula-5.2.13.orig/src/wx-console/wxbutils.cpp 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/wx-console/wxbutils.cpp 2013-12-04 16:11:43.000000000 +0100
-@@ -41,6 +41,9 @@
-
- #undef _DEBUG
-
-+#include <wx/string.h>
-+#include <wx/thread.h>
-+#include <wx/intl.h>
- #include "bacula.h"
- #include "wxbutils.h"
- #include "wxbmainframe.h"
---- bacula-5.2.13.orig/src/bacula.h 2013-02-19 20:21:35.000000000 +0100
-+++ bacula-5.2.13/src/bacula.h 2013-12-04 16:29:31.000000000 +0100
-@@ -183,7 +183,6 @@
- */
- #ifdef HAVE_WXCONSOLE
- #undef New
--#undef _
- #undef free
- #undef malloc
- #endif
%endif
# Bacula requires this specific, custom version
-%define libs3_version 20181010
+%define libs3_version 20200523
Summary: Bacula - The Network Backup Solution
Summary(pl.UTF-8): Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
Name: bacula
-Version: 9.4.2
-Release: 5
+Version: 11.0.6
+Release: 1
License: AGPL v3
Group: Networking/Utilities
Source0: http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
-# Source0-md5: 376e67b16cfa7254a5717177770233b6
+# Source0-md5: 0e3cd4e29878b09ae4554bae64785736
Source1: https://www.bacula.org/downloads/libs3-%{libs3_version}.tar.gz
-# Source1-md5: 08fbaea463b12974ebf7f4c2b336c38c
+# Source1-md5: ca97bc4133a21981139181ec8571f202
Source10: %{name}-dir.init
Source11: %{name}-fd.init
Source12: %{name}-sd.init
%if %{with qt}
BuildRequires: Qt5Core-devel
BuildRequires: Qt5Gui-devel
+BuildRequires: Qt5Widgets-devel
BuildRequires: qt5-build
BuildRequires: qt5-qmake
%endif
# do not remove bsmtp from files. Fix build if it is not installed.
%attr(755,root,root) %{_sbindir}/bsmtp
%attr(755,root,root) %{_sbindir}/btraceback
-%attr(755,root,root) %{_libdir}/libbac-9*.so
-%attr(755,root,root) %{_libdir}/libbacsd-9*.so
-%attr(755,root,root) %{_libdir}/libbaccfg-9*.so
-%attr(755,root,root) %{_libdir}/libbacfind-9*.so
-%attr(755,root,root) %{_libdir}/libbacsql-9*.so
+%attr(755,root,root) %{_libdir}/libbac-11*.so
+%attr(755,root,root) %{_libdir}/libbacsd-11*.so
+%attr(755,root,root) %{_libdir}/libbaccfg-11*.so
+%attr(755,root,root) %{_libdir}/libbacfind-11*.so
+%attr(755,root,root) %{_libdir}/libbacsql-11*.so
%{_mandir}/man8/bacula.8*
%{_mandir}/man1/bsmtp.1*
%{_mandir}/man8/btraceback.8*
%attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_tables
%attr(755,root,root) %{_libexecdir}/%{name}/update_postgresql_*
%attr(755,root,root) %{_libexecdir}/%{name}/make_postgresql_catalog_backup
-%attr(755,root,root) %{_libdir}/libbaccats-postgresql-9*.so
+%attr(755,root,root) %{_libdir}/libbaccats-postgresql-11*.so
-%ghost %attr(755,root,root) %{_libdir}/libbaccats-9*.so
+%ghost %attr(755,root,root) %{_libdir}/libbaccats-11*.so
%ghost %{_libexecdir}/%{name}/create_bacula_database
%ghost %{_libexecdir}/%{name}/drop_bacula_tables
%ghost %{_libexecdir}/%{name}/drop_bacula_database
%attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_tables
%attr(755,root,root) %{_libexecdir}/%{name}/update_mysql_*
%attr(755,root,root) %{_libexecdir}/%{name}/make_mysql_catalog_backup
-%attr(755,root,root) %{_libdir}/libbaccats-mysql-9*.so
+%attr(755,root,root) %{_libdir}/libbaccats-mysql-11*.so
-%ghost %attr(755,root,root) %{_libdir}/libbaccats-9*.so
+%ghost %attr(755,root,root) %{_libdir}/libbaccats-11*.so
%ghost %{_libexecdir}/%{name}/create_bacula_database
%ghost %{_libexecdir}/%{name}/drop_bacula_tables
%ghost %{_libexecdir}/%{name}/drop_bacula_database
%attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_tables
%attr(755,root,root) %{_libexecdir}/%{name}/update_sqlite3_*
%attr(755,root,root) %{_libexecdir}/%{name}/make_sqlite3_catalog_backup
-%attr(755,root,root) %{_libdir}/libbaccats-sqlite3-9*.so
+%attr(755,root,root) %{_libdir}/libbaccats-sqlite3-11*.so
-%ghost %attr(755,root,root) %{_libdir}/libbaccats-9*.so
+%ghost %attr(755,root,root) %{_libdir}/libbaccats-11*.so
%ghost %{_libexecdir}/%{name}/create_bacula_database
%ghost %{_libexecdir}/%{name}/drop_bacula_tables
%ghost %{_libexecdir}/%{name}/drop_bacula_database
%attr(755,root,root) %{_libexecdir}/%{name}/isworm
%attr(755,root,root) %{_libexecdir}/%{name}/mtx-changer
%attr(755,root,root) %{_libexecdir}/%{name}/tapealert
-%attr(755,root,root) %{_libdir}/bacula-sd-aligned-driver-9.*.so
+%attr(755,root,root) %{_libdir}/bacula-sd-aligned-driver-11.*.so
%if %{with s3}
-%attr(755,root,root) %{_libdir}/bacula-sd-cloud-driver-9.*.so
+%attr(755,root,root) %{_libdir}/bacula-sd-cloud-driver-11.*.so
%endif
%{_mandir}/man8/bacula-sd.8*
-diff -dur -x '*~' libs3-20181010.orig/src/request.c libs3-20181010/src/request.c
---- libs3-20181010.orig/src/request.c 2016-12-14 19:17:36.000000000 +0100
-+++ libs3-20181010/src/request.c 2019-03-04 13:10:25.000000000 +0100
-@@ -1701,11 +1701,6 @@
- return S3StatusConnectionFailed;
- case CURLE_PARTIAL_FILE:
- return S3StatusOK;
--#if LIBCURL_VERSION_NUM >= 0x071101 /* 7.17.1 */
-- case CURLE_PEER_FAILED_VERIFICATION:
--#else
-- case CURLE_SSL_PEER_CERTIFICATE:
--#endif
+diff -ur libs3-20200523/src/request.c libs3-20200523/src/request.c
+--- libs3-20200523/src/request.c 2020-05-23 16:23:54.000000000 +0000
++++ libs3-20200523/src/request.c 2022-04-03 11:36:49.802020806 +0000
+@@ -1744,11 +1744,6 @@
+ #if LIBCURL_VERSION_NUM >= 0x073E00 /* 7.62.0 */
+ case CURLE_PEER_FAILED_VERIFICATION:
+ #else
+- #if LIBCURL_VERSION_NUM >= 0x071101 /* 7.17.1 */
+- case CURLE_PEER_FAILED_VERIFICATION:
+- #else
+- case CURLE_SSL_PEER_CERTIFICATE:
+- #endif
case CURLE_SSL_CACERT:
+ #endif
return S3StatusServerFailedVerification;
- default:
-diff -urNp -x '*.orig' bacula-9.4.2.org/src/cats/make_catalog_backup.in bacula-9.4.2/src/cats/make_catalog_backup.in
---- bacula-9.4.2.org/src/cats/make_catalog_backup.in 2019-02-04 17:47:31.000000000 +0100
-+++ bacula-9.4.2/src/cats/make_catalog_backup.in 2021-09-26 09:47:52.123078492 +0200
+diff -ur bacula-11.0.6.orig/src/cats/make_catalog_backup.in bacula-11.0.6/src/cats/make_catalog_backup.in
+--- bacula-11.0.6.orig/src/cats/make_catalog_backup.in 2022-04-03 11:30:54.303210821 +0000
++++ bacula-11.0.6/src/cats/make_catalog_backup.in 2022-04-03 11:31:21.121271928 +0000
@@ -16,12 +16,15 @@
# line arguments and the environment using ps. Please consult your
# MySQL or PostgreSQL manual for secure methods of specifying the
+++ /dev/null
-diff -ur bacula-5.2.13/src/wx-console/wxbmainframe.cpp bacula-5.2.13.wx/src/wx-console/wxbmainframe.cpp
---- bacula-5.2.13/src/wx-console/wxbmainframe.cpp 2014-01-18 20:03:40.675365632 +0100
-+++ bacula-5.2.13.wx/src/wx-console/wxbmainframe.cpp 2014-01-18 20:03:00.478699256 +0100
-@@ -100,7 +100,7 @@
-
- DEFINE_EVENT_TYPE(wxbTHREAD_EVENT)
-
--typedef void (wxEvtHandler::*wxThreadEventFunction)(wxbThreadEvent&);
-+//typedef void (wxEvtHandler::*wxThreadEventFunction)(wxbThreadEvent&);
-
- #define EVT_THREAD_EVENT(id, fn) \
- DECLARE_EVENT_TABLE_ENTRY( \
-@@ -850,7 +850,7 @@
- evt.SetEventPrintObject(po);
-
- if (wxbMainFrame::GetInstance()) {
-- wxbMainFrame::GetInstance()->AddPendingEvent(evt);
-+ wxbMainFrame::GetInstance()->GetEventHandler()->AddPendingEvent(evt);
- }
- }
-
-diff -ur bacula-5.2.13/src/wx-console/wxbrestorepanel.cpp bacula-5.2.13.wx/src/wx-console/wxbrestorepanel.cpp
---- bacula-5.2.13/src/wx-console/wxbrestorepanel.cpp 2014-01-18 20:03:40.675365632 +0100
-+++ bacula-5.2.13.wx/src/wx-console/wxbrestorepanel.cpp 2014-01-18 20:00:54.408700169 +0100
-@@ -1276,8 +1276,8 @@
- for (int i = tableparser->GetCount()-1; i > -1; i--) {
- wxString str = (*tableparser)[i][3];
- wxDateTime datetime;
-- const wxChar* chr;
-- if ( ( (chr = datetime.ParseDate(str.GetData()) ) != NULL ) && ( datetime.ParseTime(++chr) != NULL ) && ! lastdatetime.IsEqualTo(datetime) ) {
-+ const wxChar* chr = datetime.ParseDate(str);
-+ if ( (chr != NULL) && ( datetime.ParseTime(++chr) != NULL ) && ! lastdatetime.IsEqualTo(datetime) ) {
- lastdatetime = datetime;
- datetime += wxTimeSpan::Seconds(1);
- configPanel->AddRowChoice(_("Before"),
-@@ -1937,9 +1937,9 @@
- void wxbRestorePanel::SetStatus(status_enum newstatus) {
- switch (newstatus) {
- case disabled:
-- centerSizer->Remove(configPanel);
-- centerSizer->Remove(restorePanel);
-- centerSizer->Remove(treelistPanel);
-+ centerSizer->Detach(configPanel);
-+ centerSizer->Detach(restorePanel);
-+ centerSizer->Detach(treelistPanel);
- treelistPanel->Show(false);
- restorePanel->Show(false);
- centerSizer->Add(configPanel, 1, wxEXPAND);
-@@ -1958,9 +1958,9 @@
- cancelled = 0;
- break;
- case finished:
-- centerSizer->Remove(configPanel);
-- centerSizer->Remove(restorePanel);
-- centerSizer->Remove(treelistPanel);
-+ centerSizer->Detach(configPanel);
-+ centerSizer->Detach(restorePanel);
-+ centerSizer->Detach(treelistPanel);
- treelistPanel->Show(false);
- restorePanel->Show(false);
- centerSizer->Add(configPanel, 1, wxEXPAND);
-@@ -2001,7 +2001,7 @@
- case choosing:
- start->Enable(true);
- start->SetLabel(_("Restore"));
-- centerSizer->Remove(configPanel);
-+ centerSizer->Detach(configPanel);
- configPanel->Show(false);
- centerSizer->Add(treelistPanel, 1, wxEXPAND);
- treelistPanel->Show(true);
-@@ -2017,7 +2017,7 @@
- configPanel->Enable(false);
- tree->Enable(false);
- list->Enable(false);
-- centerSizer->Remove(treelistPanel);
-+ centerSizer->Detach(treelistPanel);
- treelistPanel->Show(false);
- centerSizer->Add(restorePanel, 1, wxEXPAND);
- restorePanel->Show(true);
-diff -durN -x '*~' -x '*.orig' -x '*.rej' bacula-9.4.2.orig/autoconf/bacula-macros/db.m4 bacula-9.4.2/autoconf/bacula-macros/db.m4
---- bacula-9.4.2.orig/autoconf/bacula-macros/db.m4 2019-02-04 17:47:31.000000000 +0100
-+++ bacula-9.4.2/autoconf/bacula-macros/db.m4 2019-03-05 10:55:30.000000000 +0100
+diff -ur bacula-11.0.6.orig/autoconf/bacula-macros/db.m4 bacula-11.0.6/autoconf/bacula-macros/db.m4
+--- bacula-11.0.6.orig/autoconf/bacula-macros/db.m4 2022-04-03 11:32:50.796476244 +0000
++++ bacula-11.0.6/autoconf/bacula-macros/db.m4 2022-04-03 11:33:40.061588489 +0000
@@ -12,24 +12,24 @@
if test "$withval" = "yes"; then
if test -f /usr/local/include/dbi/dbi.h; then
else
POSTGRESQL_LIBDIR=$withval/lib
fi
-diff -durN -x '*~' -x '*.orig' -x '*.rej' bacula-9.4.2.orig/autoconf/configure.in bacula-9.4.2/autoconf/configure.in
---- bacula-9.4.2.orig/autoconf/configure.in 2019-03-05 10:53:03.000000000 +0100
-+++ bacula-9.4.2/autoconf/configure.in 2019-03-05 10:54:27.000000000 +0100
-@@ -299,7 +299,7 @@
+diff -ur bacula-11.0.6.orig/autoconf/configure.in bacula-11.0.6/autoconf/configure.in
+--- bacula-11.0.6.orig/autoconf/configure.in 2022-04-03 11:32:50.796476244 +0000
++++ bacula-11.0.6/autoconf/configure.in 2022-04-03 11:33:40.062588492 +0000
+@@ -301,7 +301,7 @@
os_processor=`uname -p 2>/dev/null`
case ${os_processor} in
x86_64)
;;
*)
libdir=/usr/lib
-@@ -2485,9 +2485,9 @@
+@@ -2669,9 +2669,9 @@
for dir in ${with_afsdir}/lib \
${with_afsdir}/lib/afs \
${with_afsdir}/lib/openafs \
do
for arch_type in .a .so
do
-@@ -2628,8 +2628,8 @@
+@@ -2839,8 +2839,8 @@
dnl
dnl Because of possible naming conflict with AFS libacl make sure we use the one in /usr/lib64 or /usr/lib !!!
dnl
projects / packages / bacula.git / commitdiff