CVS commit: pkgsrc/sysutils/bacula

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Mar 26 19:34:12 UTC 2023

Modified Files:
        pkgsrc/sysutils/bacula: Makefile distinfo
Added Files:
        pkgsrc/sysutils/bacula/patches: patch-src_stored_spool.c

Log Message:
bacula: fix for NetBSD10/current

NetBSD 10 doesn't like using uninitialised mutex's
https://gitlab.bacula.org/bacula-community-edition/bacula-community/-/issues/2678


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 pkgsrc/sysutils/bacula/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/sysutils/bacula/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/bacula/patches/patch-src_stored_spool.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/bacula/Makefile
diff -u pkgsrc/sysutils/bacula/Makefile:1.98 pkgsrc/sysutils/bacula/Makefile:1.99
--- pkgsrc/sysutils/bacula/Makefile:1.98        Wed Nov 23 16:21:03 2022
+++ pkgsrc/sysutils/bacula/Makefile     Sun Mar 26 19:34:11 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.98 2022/11/23 16:21:03 adam Exp $
+# $NetBSD: Makefile,v 1.99 2023/03/26 19:34:11 markd Exp $
 
 CONFLICTS+=            bacula-client-[0-9]* bacula-clientonly-[0-9]* bareos-[0-9]* bareos-clientonly-[0-9]*
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "options.mk"
 
 PLIST_SRC=             PLIST.common

Index: pkgsrc/sysutils/bacula/distinfo
diff -u pkgsrc/sysutils/bacula/distinfo:1.62 pkgsrc/sysutils/bacula/distinfo:1.63
--- pkgsrc/sysutils/bacula/distinfo:1.62        Wed Oct 12 20:59:18 2022
+++ pkgsrc/sysutils/bacula/distinfo     Sun Mar 26 19:34:11 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2022/10/12 20:59:18 markd Exp $
+$NetBSD: distinfo,v 1.63 2023/03/26 19:34:11 markd Exp $
 
 BLAKE2s (bacula-13.0.1.tar.gz) = 3989f1eb9b469efba8244d5b3baf64a2ee358c0c72eaf1bbe2837132b1bda559
 SHA512 (bacula-13.0.1.tar.gz) = fd10857d12bb637b9f6e51a03888d8cc93604ba1e793f888304f3c115d48800d7f0d69e30a843355c6760ff8e9b5481c174a24ace1c2adc106cf4ec73646b426
@@ -26,4 +26,5 @@ SHA1 (patch-src_plugins_fd_docker_bacula
 SHA1 (patch-src_qt-console_bat.pro.in) = 2d9ca83fc9c30bb3be92e051e260f992d7c5b049
 SHA1 (patch-src_qt-console_tray-monitor_tray-monitor.pro.in) = bc6a8694987879bda890102088dcb40f29d994d0
 SHA1 (patch-src_stored_Makefile.in) = 4a00b4da8dfca59c5346968b9e534c15c950449a
+SHA1 (patch-src_stored_spool.c) = fbcbb3a4c858dee31d5d0ea9eec743909d086412
 SHA1 (patch-src_tools_Makefile.in) = 11caa8f1b4a1b381613ec1d089523dcf43c4078a

Added files:

Index: pkgsrc/sysutils/bacula/patches/patch-src_stored_spool.c
diff -u /dev/null pkgsrc/sysutils/bacula/patches/patch-src_stored_spool.c:1.1
--- /dev/null   Sun Mar 26 19:34:12 2023
+++ pkgsrc/sysutils/bacula/patches/patch-src_stored_spool.c     Sun Mar 26 19:34:11 2023
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_stored_spool.c,v 1.1 2023/03/26 19:34:11 markd Exp $
+
+NetBSD 10 doesn't like using uninitialised mutex's
+https://gitlab.bacula.org/bacula-community-edition/bacula-community/-/issues/2678
+
+--- src/stored/spool.c.orig    2022-08-06 03:13:35.000000000 +1200
++++ src/stored/spool.c 2023-03-15 16:44:21.600839247 +1300
+@@ -229,6 +229,21 @@
+     * in rdev and rdcr.
+     */
+    rdev = New(file_dev);
++
++   /*
++    * VUW patch: on NetBSD a mutex needs to be properly initialised otherwise
++    * pthread_mutex_lock() returns an error.  The only one that we *think*
++    * matters here is rdev->dcrs_mutex, but a better fix would be to properly
++    * initialise the rdev object ...
++    */
++   int errstat;
++   if ((errstat = pthread_mutex_init(&rdev->dcrs_mutex, NULL)) != 0) {
++      berrno be;
++      rdev->dev_errno = errstat;
++      Mmsg1(rdev->errmsg, _("Unable to init dcrs mutex: ERR=%s\n"), be.bstrerror(errstat));
++      Jmsg0(jcr, M_ERROR_TERM, 0, rdev->errmsg);
++   }
++
+    rdev->dev_name = get_memory(strlen(spool_name)+1);
+    bstrncpy(rdev->dev_name, spool_name, strlen(spool_name)+1);
+    rdev->errmsg = get_pool_memory(PM_EMSG);