[pkgsrc/trunk]: pkgsrc/sysutils bacula*: update to 13.0.1

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils bacula*: update to 13.0.1
From: markd <markd%pkgsrc.org@localhost>
Date: Thu, 06 Oct 2022 04:57:01 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/360222dfaa91
branches:  trunk
changeset: 386323:360222dfaa91
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Oct 06 02:58:17 2022 +0000

description:
bacula*: update to 13.0.1

Release 13.0.1 / 05 August 2022

13.0.1 is a minor bug fix release.

 - Fix org#2594 About compilation warning on VolRead/WriteTime
 - Fix org#2644 Add support for binary files to bacula md5sum
 - Fix org#2655 About incorrect definition of MAX_FOPTS
 - Fix org#2656 About incorrect error message on TLS CA Certificate
 - Fix org#2657 About startup problem for bacula-sd
 - Rework MacOS package

Release 13.0.0 04 July 2022

13.0.0 is a major release.

New Features:
-------------
 - Job 'Storage Group' support
 - Kubernetes plugin
 - New Accurate option to save only file's ACL and metadata
 - Windows CSV (Cluster Shared Volumes) support
 - More logging for daemon<->daemon connections in Job log output
 - Tag support on catalog objects
 - Support for SHA256 and SHA512 signatures in FileSet
 - External LDAP Console authentication

Misc Features:
 - Windows installer 'Silent Mode' options
 - Add PriorJob to bconsole 'llist job' output
 - Check for IP SANs when verifying TLS certs
 - Clarify SD vbackup Device error message
 - Remove deprecated sbrk in MacOS and Windows
 - Add bconsole .jlist command to get JSON output from regular list commands
 - Ensure that the Director will reject catalog updates from the FD
 - Add variable for PreviousJobId in mail messages
 - Respect the 'nodump' flag in more OSes than just BSD
 - Add debug/trace/tags information to .status header
 - Handle lin_tape end of device with the new 'Use Lintape=yes' Device directive
 - Add MaximumJobErrorCount FileDaemon directive
 - bsmtp: Add the possibility to add emails separated with a comma as recipient list
 - SDPacketCheck FileDaemon used to control the network flow
 - Add bconsole .bvfs_lsfiles allfiles command

Main Fixes:
 - Fix org#2188 About the presence of FileSet and Pool directives in the Job
 - Fix Director crash for Client Initiated Backup
 - Fix Director crash for Migration Job
 - Fix incorrect output for the .status client command
 - Skip XATTR larger than MaximumNetworkBuffer
 - Fix deadlock when starting the Director with an improperly configured catalog
 - Fix Director crash caused by BAT
 - Fix org#2627 About Director crashing for Copy Jobs and resource rename
 - Move the delete volume event just before the actual deletion
 - Fix mail variables not working after a conf reload
 - Fix OpenBSD chio-changer script
 - Fix SQL query generated with ACLs
 - Fix heartbeat segfault when the Job is terminated very quickly
 - Fix About wrong backup Client displayed to the user when the original Client
   doesn't exist
 - Fix org#2605 About incorrect message in restore command
 - cdp: open the inotify stream using the CLOEXEC (close on exec) flag
 - docker: Check the presence of the docker tools during loadPlugins()
 - Fix reload issue when a Job doesn't have a Pool defined
 - Fix Copy Job with SelectionType=PoolUncopiedJobs selecting Jobs from wrong Pool
 - Fix about checking for Storage being used for Job restart/resume
 - Fix about incorrect variable substitution with the query command
 - Fix org#2579 About incorrect JSON generated from empty Messages resource
 - Fix #9116: copy job missuses the client->FdStorageAddress directive
 - Fix org#2658 About segfault with bsdjson with incorrect parameters
 - Skip storage daemon detection if the information is not available in the BSR

----------------------------------------------------------------

Release 11.0.6 10 March 2022

11.0.6 is an important bug fix and security fix release.
We advise all 11.0.x users to upgrade to this version.

 - Adjust sample-query.sql file for new catalog schema
 - Got regression testing working correctly on FreeBSD

Release 11.0.5 03 June 2021

11.0.5 is a minor bug fix release.

 - Update MySQL update procedure for 5.6

Release 11.0.4 28 May 2021

11.0.4 is a minor bug fix release.

 - Improve MySQL upgrade procedure

Release 11.0.3 21 May 2021

11.0.3 is a minor bug fix release.

 - Check if char **jobid parameter is NULL before modifying it in
   bvfs_parse_arg_version()
 - Enhance the update_mysql_tables script
 - Fix various default permissions

Release 11.0.2 26 March 2021

11.0.2 is a minor bug fix release.

 - Add functions to unittests library
 - Add support for store_alist_str() in plugin configuration items
 - Enhance bdelete_and_free() macro
 - Update baculabackupreport script

Release 11.0.1 04 February 2021

11.0.1 is a minor bug fix release.

 - Add PGSQL detection for macOS and MacPorts.
 - BEE Backport bacula/src/tools/dbcheck.c

----------------------------------------------------------------

Release 11.0.0 12 December 2020

11.0.0 is a major release.

New Features:
-------------
 - New catalog format
 - Automatic TLS PSK encrypted communication
 - Support for Client behind NAT
 - Continious Data Protection (CDP) Plugin
 - Global Director Autoprune flag
 - Events/Audit features
 - New Baculum features
 - Support for GPFS

Misc:
-----
 - New Prune Command Option
 - Dynamic Client Address Directive
 - Ability to disable Volume Retention
 - Ask to mount/create volume when the disk space is low
 - Simplification of the Windows FileSet with File=/
 - Use of QT5 for Bat on Windows
 - Support for Windows files with non-UTF16 names
 - Windows Snapshot management has been improved
 - Support for the system.cifs_acl extended attribute backup with Linux CIFS
 - Built-in Client Scheduler
 - Reload command improvements (Keep IP address, Maximum Concurrent value, ...)
 - Support for GLOB pattern in Console ACL directives
 - Faster CRC32 algorithm

diffstat:

 sysutils/bacula-clientonly/Makefile                                           |   3 +-
 sysutils/bacula-qt-console/Makefile                                           |   4 +-
 sysutils/bacula-qt5-console/Makefile                                          |   4 +-
 sysutils/bacula-tray-monitor-qt5/Makefile                                     |   4 +-
 sysutils/bacula-tray-monitor/Makefile                                         |   4 +-
 sysutils/bacula/Makefile                                                      |   4 +-
 sysutils/bacula/Makefile.common                                               |   6 +-
 sysutils/bacula/distinfo                                                      |  26 +-
 sysutils/bacula/patches/patch-src_dird_Makefile.in                            |  18 +-
 sysutils/bacula/patches/patch-src_dird_dird.c                                 |  75 ----------
 sysutils/bacula/patches/patch-src_filed_Makefile.in                           |  16 +-
 sysutils/bacula/patches/patch-src_findlib_attribs.c                           |  12 +-
 sysutils/bacula/patches/patch-src_findlib_fstype.c                            |  13 +
 sysutils/bacula/patches/patch-src_plugins_fd_Makefile                         |  14 +
 sysutils/bacula/patches/patch-src_plugins_fd_Makefile.in                      |  14 -
 sysutils/bacula/patches/patch-src_qt-console_bat.pro.in                       |  12 +-
 sysutils/bacula/patches/patch-src_qt-console_tray-monitor_tray-monitor.pro.in |   8 +-
 sysutils/bacula/patches/patch-src_stored_Makefile.in                          |  43 +----
 sysutils/bacula/patches/patch-src_tools_Makefile.in                           |  69 +++++---
 19 files changed, 130 insertions(+), 219 deletions(-)

diffs (truncated from 666 to 300 lines):

diff -r d2994f530e8e -r 360222dfaa91 sysutils/bacula-clientonly/Makefile
--- a/sysutils/bacula-clientonly/Makefile       Thu Oct 06 02:20:39 2022 +0000
+++ b/sysutils/bacula-clientonly/Makefile       Thu Oct 06 02:58:17 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2020/07/28 06:42:44 kardel Exp $
+# $NetBSD: Makefile,v 1.31 2022/10/06 02:58:17 markd Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-clientonly-/}
-#PKGREVISION=          1
 COMMENT=               The Network Backup Solution (client only)
 
 CONFLICTS=             bacula-[0-9]* bacula-client-[0-9]* bareos-[0-9]* bareos-clientonly-[0-9]*
diff -r d2994f530e8e -r 360222dfaa91 sysutils/bacula-qt-console/Makefile
--- a/sysutils/bacula-qt-console/Makefile       Thu Oct 06 02:20:39 2022 +0000
+++ b/sysutils/bacula-qt-console/Makefile       Thu Oct 06 02:58:17 2022 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2021/12/08 16:06:25 adam Exp $
+# $NetBSD: Makefile,v 1.44 2022/10/06 02:58:17 markd Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-qt-console-/}
-PKGREVISION=   1
-#PKGREVISION=  1
 COMMENT=       Qt-based console for Bacula - The Network Backup Solution
 
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/bacula/distinfo
diff -r d2994f530e8e -r 360222dfaa91 sysutils/bacula-qt5-console/Makefile
--- a/sysutils/bacula-qt5-console/Makefile      Thu Oct 06 02:20:39 2022 +0000
+++ b/sysutils/bacula-qt5-console/Makefile      Thu Oct 06 02:58:17 2022 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2022/08/09 12:08:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2022/10/06 02:58:17 markd Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-qt5-console-/}
-PKGREVISION=   3
-#PKGREVISION=  2
 COMMENT=       Qt5-based console for Bacula - The Network Backup Solution
 
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/bacula/distinfo
diff -r d2994f530e8e -r 360222dfaa91 sysutils/bacula-tray-monitor-qt5/Makefile
--- a/sysutils/bacula-tray-monitor-qt5/Makefile Thu Oct 06 02:20:39 2022 +0000
+++ b/sysutils/bacula-tray-monitor-qt5/Makefile Thu Oct 06 02:58:17 2022 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2022/08/09 12:08:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2022/10/06 02:58:18 markd Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-tray-monitor-qt5-/}
-PKGREVISION=   3
-#PKGREVISION=  2
 COMMENT=       System tray monitor for Bacula - The Network Backup Solution
 
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/bacula/distinfo
diff -r d2994f530e8e -r 360222dfaa91 sysutils/bacula-tray-monitor/Makefile
--- a/sysutils/bacula-tray-monitor/Makefile     Thu Oct 06 02:20:39 2022 +0000
+++ b/sysutils/bacula-tray-monitor/Makefile     Thu Oct 06 02:58:17 2022 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2021/12/08 16:06:25 adam Exp $
+# $NetBSD: Makefile,v 1.52 2022/10/06 02:58:17 markd Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-tray-monitor-/}
-PKGREVISION=   1
-#PKGREVISION=  1
 COMMENT=       System tray monitor for Bacula - The Network Backup Solution
 
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/bacula/distinfo
diff -r d2994f530e8e -r 360222dfaa91 sysutils/bacula/Makefile
--- a/sysutils/bacula/Makefile  Thu Oct 06 02:20:39 2022 +0000
+++ b/sysutils/bacula/Makefile  Thu Oct 06 02:58:17 2022 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2022/06/28 11:35:53 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2022/10/06 02:58:17 markd Exp $
 
 CONFLICTS+=            bacula-client-[0-9]* bacula-clientonly-[0-9]* bareos-[0-9]* bareos-clientonly-[0-9]*
 
-PKGREVISION=   8
-
 .include "options.mk"
 
 PLIST_SRC=             PLIST.common
diff -r d2994f530e8e -r 360222dfaa91 sysutils/bacula/Makefile.common
--- a/sysutils/bacula/Makefile.common   Thu Oct 06 02:20:39 2022 +0000
+++ b/sysutils/bacula/Makefile.common   Thu Oct 06 02:58:17 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.74 2020/12/12 23:51:19 jnemeth Exp $
+# $NetBSD: Makefile.common,v 1.75 2022/10/06 02:58:17 markd Exp $
 #
 # used by sysutils/bacula-clientonly/Makefile
 # used by sysutils/bacula-tray-monitor/Makefile
@@ -6,7 +6,7 @@
 # used by sysutils/bacula-qt-console/Makefile
 # used by sysutils/bacula-qt5-console/Makefile
 
-DISTNAME=      bacula-9.6.7
+DISTNAME=      bacula-13.0.1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=bacula/}
 
@@ -58,6 +58,8 @@
 SUBST_STAGE.fixwrap=   post-build
 SUBST_FILES.fixwrap=   scripts/bacula_config
 SUBST_SED.fixwrap=     -e "s,${WRAPPER_BINDIR}/[^[:space:]]*,${CXXPATH},g"
+SUBST_SED.fixwrap+=    -e "s,${BUILDLINK_DIR},${PREFIX},g"
+SUBST_SED.fixwrap+=    -e "s,${TOOLS_DIR},${PREFIX},g"
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-scriptdir=${PREFIX}/libexec/bacula
diff -r d2994f530e8e -r 360222dfaa91 sysutils/bacula/distinfo
--- a/sysutils/bacula/distinfo  Thu Oct 06 02:20:39 2022 +0000
+++ b/sysutils/bacula/distinfo  Thu Oct 06 02:58:17 2022 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.60 2021/10/26 11:19:21 nia Exp $
+$NetBSD: distinfo,v 1.61 2022/10/06 02:58:17 markd Exp $
 
-BLAKE2s (bacula-9.6.7.tar.gz) = aac6dacdc80260a610ec51c45ddd0ebca0763b50db45b7a1a946a53e03b32b99
-SHA512 (bacula-9.6.7.tar.gz) = 27551faa2e4b13c6c2b9a2500f1253dfa5ee84929013491a7bf512d965d655c5af78b08201090474bc9b29827ca0a5c1c5a23a55712a1f739f37de75449cfd4d
-Size (bacula-9.6.7.tar.gz) = 4168102 bytes
+BLAKE2s (bacula-13.0.1.tar.gz) = 3989f1eb9b469efba8244d5b3baf64a2ee358c0c72eaf1bbe2837132b1bda559
+SHA512 (bacula-13.0.1.tar.gz) = fd10857d12bb637b9f6e51a03888d8cc93604ba1e793f888304f3c115d48800d7f0d69e30a843355c6760ff8e9b5481c174a24ace1c2adc106cf4ec73646b426
+Size (bacula-13.0.1.tar.gz) = 6224778 bytes
 SHA1 (patch-ad) = ce6bc29858d13dff1a0301db95f9bfedf3e66b01
 SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2
 SHA1 (patch-configure) = fb2c8ec47f0b51f53b61d51df2855d944507bfc7
@@ -10,20 +10,20 @@
 SHA1 (patch-src_bacula.h) = 74fed45f9d441a132f113fdfd783b8f5bb077885
 SHA1 (patch-src_console_Makefile.in) = f997b8f8bc8c7cca5b06a8f046558951caa14094
 SHA1 (patch-src_console_conio.c) = 92445b01e2ad17de5215315df916f1f1bd45108b
-SHA1 (patch-src_dird_Makefile.in) = 0f088f3af4bcacb260fb50124723babd69f5caee
-SHA1 (patch-src_dird_dird.c) = e1c8580399ddfb933ea6727cc541a7bf435eb501
-SHA1 (patch-src_filed_Makefile.in) = 12d7498d65c9f4f0a844a1c4648c782ce1b5ab48
+SHA1 (patch-src_dird_Makefile.in) = da7914d67c8ce979d26b1d827d7ab16fa9c07adf
+SHA1 (patch-src_filed_Makefile.in) = 48561fe00618a17f64cf3b6161e18ccfdafd1f5f
 SHA1 (patch-src_filed_bacl.c) = 6eb8d9e5198d91ea52b8ab4a31bf0cc565f3ee07
 SHA1 (patch-src_filed_bacl__freebsd.c) = 0a90b6621e3b18b43f7f9e0d7af50ba7f17ca708
 SHA1 (patch-src_filed_bacl__freebsd.h) = 44a888985cb7dfde52603e3e19ed117e4b922641
 SHA1 (patch-src_filed_bxattr.c) = 2689b8bb6f5ddf14d7253e45353c5a40e5e9867e
 SHA1 (patch-src_filed_bxattr__netbsd.c) = bc2a0417c852b76ddc4324c39ae5f6ec0387ab30
 SHA1 (patch-src_filed_bxattr__netbsd.h) = 791a2da696da049a6091c4c460aec0bd00dfa5ff
-SHA1 (patch-src_findlib_attribs.c) = f3665a012e3a0cc06ff2c9ab922324b1df3b2819
+SHA1 (patch-src_findlib_attribs.c) = 33f492213557426bc577ea4ac05872e15ebcbcbe
+SHA1 (patch-src_findlib_fstype.c) = 879c6b8627cec251ad4bdca6f2a6c37cff278a22
 SHA1 (patch-src_lib_attr.c) = 287851ff2ce2a0868d597cf1d7471a6766f6f7c1
-SHA1 (patch-src_plugins_fd_Makefile.in) = f1316cdbb66d9bc55d8adbd4b0bbde01443ccd2e
+SHA1 (patch-src_plugins_fd_Makefile) = 7fb44bdf1253e0c0f7bc9d621133fc3ba23617a0
 SHA1 (patch-src_plugins_fd_docker_baculatar_baculatar) = ba5fb5edc8ee98f09d31f36e840d68facfe48233
-SHA1 (patch-src_qt-console_bat.pro.in) = 8df9381c0b35b5a3dcd237f8c017ae21d88c79ad
-SHA1 (patch-src_qt-console_tray-monitor_tray-monitor.pro.in) = 83b48b321de88aa766aa2fc082c95a3a8665981d
-SHA1 (patch-src_stored_Makefile.in) = e5dd859ef083ec11de65667b176c00b68ff7d8a4
-SHA1 (patch-src_tools_Makefile.in) = 3448f4a472c8c339415ac8b3618dd09cb9d3cfd6
+SHA1 (patch-src_qt-console_bat.pro.in) = 2d9ca83fc9c30bb3be92e051e260f992d7c5b049
+SHA1 (patch-src_qt-console_tray-monitor_tray-monitor.pro.in) = eac1fffd0f79328346f5024527fdc452d06062aa
+SHA1 (patch-src_stored_Makefile.in) = 4a00b4da8dfca59c5346968b9e534c15c950449a
+SHA1 (patch-src_tools_Makefile.in) = 11caa8f1b4a1b381613ec1d089523dcf43c4078a
diff -r d2994f530e8e -r 360222dfaa91 sysutils/bacula/patches/patch-src_dird_Makefile.in
--- a/sysutils/bacula/patches/patch-src_dird_Makefile.in        Thu Oct 06 02:20:39 2022 +0000
+++ b/sysutils/bacula/patches/patch-src_dird_Makefile.in        Thu Oct 06 02:58:17 2022 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_dird_Makefile.in,v 1.2 2019/02/07 11:29:31 markd Exp $
+$NetBSD: patch-src_dird_Makefile.in,v 1.3 2022/10/06 02:58:17 markd Exp $
 
 - use %%EXAMPLESDIR%% instead of sysconfdir
 - use the .la files for linking
 
---- src/dird/Makefile.in.orig  2018-12-21 08:40:51.000000000 +0000
+--- src/dird/Makefile.in.orig  2022-08-05 15:13:35.000000000 +0000
 +++ src/dird/Makefile.in
-@@ -70,21 +70,21 @@ bacula-dir: Makefile $(SVROBJS) ../lib/l
+@@ -72,21 +72,21 @@ bacula-dir: Makefile $(SVROBJS) ../lib/l
            ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
        @echo "Linking $@ ..."
        $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) $(ZLIBS) \
@@ -30,12 +30,12 @@
              $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
  
  Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
-@@ -113,16 +113,16 @@ install: all
+@@ -115,16 +115,16 @@ install: all
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bdirjson $(DESTDIR)$(sbindir)/bdirjson
        @srcconf=bacula-dir.conf; \
--         if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+         if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
+-         if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
++         if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
              destconf=$$srcconf.new; \
              echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
           else \
@@ -45,13 +45,13 @@
 -         ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
 +         echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
 +         ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
-          @if test "x${dir_group}" != "x" -a "x${DESTDIR}" = "x" ; then \
+          @if test "x${dir_group}" != "x"; then \
 -            chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
 +            chgrp -f ${dir_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ; \
           fi
-       @if test -f ${DESTDIR}${scriptdir}/query.sql; then \
+       @if  test -f ${DESTDIR}${scriptdir}/query.sql; then \
           echo "  ==> Saving existing query.sql to query.sql.old"; \
-@@ -136,7 +136,7 @@ install: all
+@@ -138,7 +138,7 @@ install: all
  
  uninstall:
        (cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir bdirjson)
diff -r d2994f530e8e -r 360222dfaa91 sysutils/bacula/patches/patch-src_dird_dird.c
--- a/sysutils/bacula/patches/patch-src_dird_dird.c     Thu Oct 06 02:20:39 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-$NetBSD: patch-src_dird_dird.c,v 1.1 2021/05/16 06:56:31 jnemeth Exp $
-
-Upstream bug #2551:
-
-I noticed that the command "show catalog" is truncating the name of db_driver
-
-======================================
-*show catalog
-Catalog: name=MyCatalog address=localhost DBport=5432 db_name=bacula
-      db_driver=PostgreSQ db_user=bacula MutliDBConn=0
-*
-======================================
-
-Turns out that the bug is more than just a display problem
-(from the bacula-devel mailing list):
-
-To: bacula-devel%lists.sourceforge.net@localhost
-Message-ID: <c2515e90-0bf3-bc5e-1908-e7b23867b17a%baculasystems.com@localhost>
-Date: Wed, 20 Jan 2021 13:22:19 +0100
-Subject: Re: [Bacula-devel] Something amiss in bacula-9.6.7: Possible race
- condition
-List-Id: Developer's email list <bacula-devel.lists.sourceforge.net>
-List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=bacula-de
-vel>
-From: Eric Bollengier via Bacula-devel <bacula-devel%lists.sourceforge.net@localhost>
-
-Hello Martin,
-
-Very good detective work, this subtle issue was causing concurrent
-database access even if the batch mode was disabled. I have pushed the
-patch into the Branch-9.6 git repository.
-
-Best Regards,
-Eric
-
-> What is the output of "show catalog" in bconsole?  My guess is that you will
-> see db_driver=MySQ i.e. missing the final "L" of MySQL.  This will prevent it
-> from reusing the BDB object, leading to unexpected concurrency.
->
-> The bug is caused by this change:
->
-> diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
-> index fdb1d97bf9..11c4406ea7 100644
-> --- a/bacula/src/dird/dird.c
-> +++ b/bacula/src/dird/dird.c
-> @@ -1265,7 +1265,7 @@ static bool check_catalog(cat_op mode)
->             /* To copy dbdriver field into "CAT" catalog resource class (local
-)
->              * from dbdriver in "BDB" catalog DB Interface class (global)
->              */
-> -            strncpy(catalog->db_driver, BDB_db_driver, db_driver_len);
-> +            bstrncpy(catalog->db_driver, BDB_db_driver, db_driver_len);
->           }
->        }
->
-> which was part of 9.6.4.
->
-> To fix it, replace db_driver_len with db_driver_len+1 in this call to
-> bstrncpy.  This has been fixed in Bacula 11 because the seemingly minor
-> problem with "status catalog" was reported in
-> https://bugs.bacula.org/view.php?id=2551 but it looks like the significance of
-> it wasn't realized.
-
-
---- src/dird/dird.c.orig       2020-12-10 13:26:39.000000000 +0000
-+++ src/dird/dird.c
-@@ -1265,7 +1265,7 @@ static bool check_catalog(cat_op mode)
-            /* To copy dbdriver field into "CAT" catalog resource class (local)
-             * from dbdriver in "BDB" catalog DB Interface class (global)
-             */
--            bstrncpy(catalog->db_driver, BDB_db_driver, db_driver_len);
-+            bstrncpy(catalog->db_driver, BDB_db_driver, db_driver_len + 1);
-          }
-       }
- 
diff -r d2994f530e8e -r 360222dfaa91 sysutils/bacula/patches/patch-src_filed_Makefile.in
--- a/sysutils/bacula/patches/patch-src_filed_Makefile.in       Thu Oct 06 02:20:39 2022 +0000
+++ b/sysutils/bacula/patches/patch-src_filed_Makefile.in       Thu Oct 06 02:58:17 2022 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_filed_Makefile.in,v 1.3 2020/03/06 19:48:48 jnemeth Exp $
+$NetBSD: patch-src_filed_Makefile.in,v 1.4 2022/10/06 02:58:17 markd Exp $
 
 - use %%EXAMPLESDIR%% instead of sysconfdir
 - use the .la files for linking
 
---- src/filed/Makefile.in.orig 2020-02-26 14:11:43.000000000 +0000
+--- src/filed/Makefile.in.orig 2022-08-05 15:13:35.000000000 +0000
 +++ src/filed/Makefile.in
-@@ -104,18 +104,18 @@ win32:   $(WIN32OBJS)
+@@ -115,13 +115,13 @@ win32:   $(WIN32OBJS)
  bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
        @echo "Linking $@ ..."
        $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
@@ -20,14 +20,8 @@
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc add ktnef
Next by Date: [pkgsrc/trunk]: pkgsrc/multimedia Add t-rec
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc add ktnef
Next by Thread: [pkgsrc/trunk]: pkgsrc/multimedia Add t-rec
Indexes:
Home | Main Index | Thread Index | Old Index