From 2bf565f75725481ca045e2f7f869119bc29d7088 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 9 Jun 2024 13:51:19 +0200 Subject: [PATCH] - updated to 15.0.2 --- bacula-branding.patch | 10 +++++----- bacula-conf.patch | 11 +++++----- bacula-mtx-changer.patch | 8 ++++---- bacula.spec | 43 ++++++++++++++++++++++++++-------------- x32.patch | 18 ++++++++--------- 5 files changed, 52 insertions(+), 38 deletions(-) diff --git a/bacula-branding.patch b/bacula-branding.patch index 596160f..53cbdfe 100644 --- a/bacula-branding.patch +++ b/bacula-branding.patch @@ -1,7 +1,7 @@ -diff -ur bacula-7.2.0.orig/autoconf/configure.in bacula-7.2.0/autoconf/configure.in ---- bacula-7.2.0.orig/autoconf/configure.in 2015-08-13 13:52:24.000000000 +0000 -+++ bacula-7.2.0/autoconf/configure.in 2015-10-26 10:29:17.601083332 +0000 -@@ -3188,6 +3188,14 @@ +diff -ur bacula-15.0.2.orig/autoconf/configure.in bacula-15.0.2/autoconf/configure.in +--- bacula-15.0.2.orig/autoconf/configure.in 2024-03-22 10:48:41.000000000 +0100 ++++ bacula-15.0.2/autoconf/configure.in 2024-06-09 12:54:21.005257362 +0200 +@@ -4053,6 +4053,14 @@ platforms/suse/bacula-sd \ platforms/suse/bacula-dir" ;; @@ -14,5 +14,5 @@ diff -ur bacula-7.2.0.orig/autoconf/configure.in bacula-7.2.0/autoconf/configure + platforms/unknown/Makefile" + ;; unknown) - DISTVER=unknown + DISTVER=unknown_distro_ver TAPEDRIVE="/dev/nst0" diff --git a/bacula-conf.patch b/bacula-conf.patch index e640ad9..9844bee 100644 --- a/bacula-conf.patch +++ b/bacula-conf.patch @@ -1,6 +1,7 @@ ---- bacula-7.0.4/src/dird/bacula-dir.conf.in 2014-06-03 08:28:41.000000000 +0000 -+++ bacula-7.0.4/src/dird/bacula-dir.conf.in 2014-06-23 11:46:44.185855989 +0000 -@@ -231,6 +231,7 @@ +diff -ur bacula-15.0.2.orig/src/dird/bacula-dir.conf.in bacula-15.0.2/src/dird/bacula-dir.conf.in +--- bacula-15.0.2.orig/src/dird/bacula-dir.conf.in 2024-03-22 10:48:41.000000000 +0100 ++++ bacula-15.0.2/src/dird/bacula-dir.conf.in 2024-06-09 13:16:22.005004370 +0200 +@@ -239,6 +239,7 @@ # Generic catalog service Catalog { Name = MyCatalog @@ -8,7 +9,7 @@ dbname = "@db_name@"; dbuser = "@db_user@"; dbpassword = "@db_password@" } -@@ -260,7 +261,7 @@ +@@ -268,7 +269,7 @@ # time to time as it will grow indefinitely. However, it will # also keep all your messages if they scroll off the console. # @@ -17,7 +18,7 @@ catalog = all } -@@ -272,7 +273,7 @@ +@@ -280,7 +281,7 @@ mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r" mail = @job_email@ = all, !skipped console = all, !skipped, !saved diff --git a/bacula-mtx-changer.patch b/bacula-mtx-changer.patch index 85bd371..4ab43e8 100644 --- a/bacula-mtx-changer.patch +++ b/bacula-mtx-changer.patch @@ -1,7 +1,7 @@ -diff -ur bacula-7.2.0.orig/scripts/mtx-changer.in bacula-7.2.0/scripts/mtx-changer.in ---- bacula-7.2.0.orig/scripts/mtx-changer.in 2015-08-13 13:52:24.000000000 +0000 -+++ bacula-7.2.0/scripts/mtx-changer.in 2015-10-26 07:07:13.370083332 +0000 -@@ -66,13 +66,13 @@ +diff -ur bacula-15.0.2.orig/scripts/mtx-changer.in bacula-15.0.2/scripts/mtx-changer.in +--- bacula-15.0.2.orig/scripts/mtx-changer.in 2024-03-22 10:48:41.000000000 +0100 ++++ bacula-15.0.2/scripts/mtx-changer.in 2024-06-09 12:52:53.875961510 +0200 +@@ -65,13 +65,13 @@ myversion=2 # source our conf file diff --git a/bacula.spec b/bacula.spec index cffb6ea..49ef46f 100644 --- a/bacula.spec +++ b/bacula.spec @@ -22,12 +22,12 @@ Summary: Bacula - The Network Backup Solution Summary(pl.UTF-8): Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci Name: bacula -Version: 13.0.3 +Version: 15.0.2 Release: 1 License: AGPL v3 Group: Networking/Utilities Source0: http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz -# Source0-md5: e686d4f1864c8c3e5c4ccb48a50db9a7 +# Source0-md5: 258c6fec54b1b559b9b249e55808acb7 Source1: https://www.bacula.org/downloads/libs3-%{libs3_version}.tar.gz # Source1-md5: ca97bc4133a21981139181ec8571f202 Source10: %{name}-dir.init @@ -559,6 +559,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/bacula-sd-*-driver.so %{?with_pgsql:rm $RPM_BUILD_ROOT%{_libdir}/libbaccats-postgresql.{la,so}} %{?with_sqlite3:rm $RPM_BUILD_ROOT%{_libdir}/libbaccats-sqlite3.{la,so}} +# shebang fixes +sed -i -e '1s@#!.*python@#!%{__python3}@' \ + $RPM_BUILD_ROOT%{_libexecdir}/bacula/key-manager.py \ + $RPM_BUILD_ROOT%{_sbindir}/md5tobase64.py + %if %{with nagios} install -d $RPM_BUILD_ROOT%{nagiosplugindir} %{__make} -C examples/nagios/check_bacula install \ @@ -697,11 +702,11 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ # 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-13*.so -%attr(755,root,root) %{_libdir}/libbaccfg-13*.so -%attr(755,root,root) %{_libdir}/libbacsd-13*.so -%attr(755,root,root) %{_libdir}/libbacfind-13*.so -%attr(755,root,root) %{_libdir}/libbacsql-13*.so +%attr(755,root,root) %{_libdir}/libbac-15*.so +%attr(755,root,root) %{_libdir}/libbaccfg-15*.so +%attr(755,root,root) %{_libdir}/libbacsd-15*.so +%attr(755,root,root) %{_libdir}/libbacfind-15*.so +%attr(755,root,root) %{_libdir}/libbacsql-15*.so %{_mandir}/man8/bacula.8* %{_mandir}/man1/bsmtp.1* %{_mandir}/man8/btraceback.8* @@ -727,12 +732,17 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %attr(755,root,root) %{_sbindir}/bregex %attr(755,root,root) %{_sbindir}/bwild %attr(755,root,root) %{_sbindir}/bacula-dbcheck +%attr(755,root,root) %{_sbindir}/get_malware_abuse.ch +%attr(755,root,root) %{_sbindir}/md5tobase64.py %{_mandir}/man8/bacula-dir.8* %{_mandir}/man8/bacula-dbcheck.8* +%{_mandir}/man8/bdirjson.8* %{_mandir}/man8/bregex.8* %{_mandir}/man8/bwild.8* %{_libexecdir}/%{name}/query.sql %attr(755,root,root) %{_libexecdir}/%{name}/delete_catalog_backup +%attr(755,root,root) %{_libexecdir}/%{name}/install-key-manager.sh +%attr(755,root,root) %{_libexecdir}/%{name}/key-manager.py %if %{with pgsql} %files db-postgresql @@ -744,9 +754,9 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %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-13*.so +%attr(755,root,root) %{_libdir}/libbaccats-postgresql-15*.so -%ghost %attr(755,root,root) %{_libdir}/libbaccats-13*.so +%ghost %attr(755,root,root) %{_libdir}/libbaccats-15*.so %ghost %{_libexecdir}/%{name}/create_bacula_database %ghost %{_libexecdir}/%{name}/drop_bacula_tables %ghost %{_libexecdir}/%{name}/drop_bacula_database @@ -766,9 +776,9 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %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-13*.so +%attr(755,root,root) %{_libdir}/libbaccats-mysql-15*.so -%ghost %attr(755,root,root) %{_libdir}/libbaccats-13*.so +%ghost %attr(755,root,root) %{_libdir}/libbaccats-15*.so %ghost %{_libexecdir}/%{name}/create_bacula_database %ghost %{_libexecdir}/%{name}/drop_bacula_tables %ghost %{_libexecdir}/%{name}/drop_bacula_database @@ -788,9 +798,9 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %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-13*.so +%attr(755,root,root) %{_libdir}/libbaccats-sqlite3-15*.so -%ghost %attr(755,root,root) %{_libdir}/libbaccats-13*.so +%ghost %attr(755,root,root) %{_libdir}/libbaccats-15*.so %ghost %{_libexecdir}/%{name}/create_bacula_database %ghost %{_libexecdir}/%{name}/drop_bacula_tables %ghost %{_libexecdir}/%{name}/drop_bacula_database @@ -810,6 +820,7 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %attr(755,root,root) %{_sbindir}/bfdjson %attr(755,root,root) %{_libdir}/bpipe-fd.so %{_mandir}/man8/bacula-fd.8* +%{_mandir}/man8/bfdjson.8* %files sd %defattr(644,root,root,755) @@ -831,9 +842,9 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %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-13.*.so +%attr(755,root,root) %{_libdir}/bacula-sd-aligned-driver-15.*.so %if %{with s3} -%attr(755,root,root) %{_libdir}/bacula-sd-cloud-driver-13.*.so +%attr(755,root,root) %{_libdir}/bacula-sd-cloud-driver-15.*.so %endif %{_mandir}/man8/bacula-sd.8* @@ -841,6 +852,7 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %{_mandir}/man8/bextract.8* %{_mandir}/man8/bls.8* %{_mandir}/man8/bscan.8* +%{_mandir}/man8/bsdjson.8* %{_mandir}/man8/btape.8* %files console @@ -849,6 +861,7 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \ %attr(640,root,bacula) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bconsole.conf %attr(755,root,root) %{_sbindir}/bconsole %attr(755,root,root) %{_sbindir}/bbconsjson +%{_mandir}/man8/bbconsjson.8* %{_mandir}/man8/bconsole.8* %if %{with qt} diff --git a/x32.patch b/x32.patch index 1383aa5..cf7ca8f 100644 --- a/x32.patch +++ b/x32.patch @@ -1,6 +1,6 @@ -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 +diff -ur bacula-15.0.2.orig/autoconf/bacula-macros/db.m4 bacula-15.0.2/autoconf/bacula-macros/db.m4 +--- bacula-15.0.2.orig/autoconf/bacula-macros/db.m4 2024-03-22 10:48:41.000000000 +0100 ++++ bacula-15.0.2/autoconf/bacula-macros/db.m4 2024-06-09 13:18:41.319081552 +0200 @@ -12,24 +12,24 @@ if test "$withval" = "yes"; then if test -f /usr/local/include/dbi/dbi.h; then @@ -491,10 +491,10 @@ diff -ur bacula-11.0.6.orig/autoconf/bacula-macros/db.m4 bacula-11.0.6/autoconf/ else POSTGRESQL_LIBDIR=$withval/lib fi -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 @@ +diff -ur bacula-15.0.2.orig/autoconf/configure.in bacula-15.0.2/autoconf/configure.in +--- bacula-15.0.2.orig/autoconf/configure.in 2024-06-09 13:17:53.922374863 +0200 ++++ bacula-15.0.2/autoconf/configure.in 2024-06-09 13:18:41.319081552 +0200 +@@ -328,7 +328,7 @@ os_processor=`uname -p 2>/dev/null` case ${os_processor} in x86_64) @@ -503,7 +503,7 @@ diff -ur bacula-11.0.6.orig/autoconf/configure.in bacula-11.0.6/autoconf/configu ;; *) libdir=/usr/lib -@@ -2669,9 +2669,9 @@ +@@ -2912,9 +2912,9 @@ for dir in ${with_afsdir}/lib \ ${with_afsdir}/lib/afs \ ${with_afsdir}/lib/openafs \ @@ -516,7 +516,7 @@ diff -ur bacula-11.0.6.orig/autoconf/configure.in bacula-11.0.6/autoconf/configu do for arch_type in .a .so do -@@ -2839,8 +2839,8 @@ +@@ -3082,8 +3082,8 @@ dnl dnl Because of possible naming conflict with AFS libacl make sure we use the one in /usr/lib64 or /usr/lib !!! dnl -- 2.45.2