CVS commit: pkgsrc/sysutils

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils
From: "Mark Davies" <markd%netbsd.org@localhost>
Date: Tue, 3 Jun 2025 11:36:48 +0000

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Jun  3 11:36:48 UTC 2025

Modified Files:
        pkgsrc/sysutils/bacula: Makefile Makefile.common PLIST.common distinfo
        pkgsrc/sysutils/bacula-clientonly: Makefile
        pkgsrc/sysutils/bacula-qt5-console: Makefile
        pkgsrc/sysutils/bacula-tray-monitor-qt5: Makefile
        pkgsrc/sysutils/bacula/patches: patch-configure
            patch-src_dird_Makefile.in patch-src_filed_Makefile.in
            patch-src_tools_Makefile.in
Removed Files:
        pkgsrc/sysutils/bacula/patches: patch-scripts_baculabackupreport.in

Log Message:
bacula*: update to 15.0.3

This is a major release with many new features and a number of changes.

As always, both the Director and Storage daemon(s) must be upgraded at
the same time. Any File daemon running on the same machine as a Director
or Storage daemon must be of the same version.

Older File Daemons should be compatible with the 15.0 Director and Storage
daemons. There should be no need to upgrade older File Daemons.

In 15.0, we have upgraded the volume format from BB02 to BB03 to support
options such as the Volume encryption. Old volumes can still be used by the
15.0 Storage Daemon, however, new 15.0 BB03 volumes cannot be used by old
Storage Daemons.

New Catalog format in version 15.0.0 and greater


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/sysutils/bacula/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/sysutils/bacula/Makefile.common
cvs rdiff -u -r1.19 -r1.20 pkgsrc/sysutils/bacula/PLIST.common
cvs rdiff -u -r1.63 -r1.64 pkgsrc/sysutils/bacula/distinfo
cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/bacula-clientonly/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/bacula-qt5-console/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/bacula/patches/patch-configure \
    pkgsrc/sysutils/bacula/patches/patch-src_dird_Makefile.in
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/bacula/patches/patch-scripts_baculabackupreport.in
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/sysutils/bacula/patches/patch-src_filed_Makefile.in
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/sysutils/bacula/patches/patch-src_tools_Makefile.in

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.107 pkgsrc/sysutils/bacula/Makefile:1.108
--- pkgsrc/sysutils/bacula/Makefile:1.107       Thu Apr 17 21:52:21 2025
+++ pkgsrc/sysutils/bacula/Makefile     Tue Jun  3 11:36:47 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2025/04/17 21:52:21 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2025/06/03 11:36:47 markd Exp $
 
 CONFLICTS+=            bacula-client-[0-9]* bacula-clientonly-[0-9]* bareos-[0-9]* bareos-clientonly-[0-9]*
 
-PKGREVISION= 10
 .include "options.mk"
 
 PLIST_SRC=             PLIST.common

Index: pkgsrc/sysutils/bacula/Makefile.common
diff -u pkgsrc/sysutils/bacula/Makefile.common:1.76 pkgsrc/sysutils/bacula/Makefile.common:1.77
--- pkgsrc/sysutils/bacula/Makefile.common:1.76 Fri Apr 26 15:34:20 2024
+++ pkgsrc/sysutils/bacula/Makefile.common      Tue Jun  3 11:36:47 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.76 2024/04/26 15:34:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.77 2025/06/03 11:36:47 markd Exp $
 #
 # used by sysutils/bacula-clientonly/Makefile
 # used by sysutils/bacula-tray-monitor-qt5/Makefile
 # used by sysutils/bacula-qt5-console/Makefile
 
-DISTNAME=      bacula-13.0.1
+DISTNAME=      bacula-15.0.3
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=bacula/}
 
@@ -71,12 +71,18 @@ CONFIGURE_ARGS.Linux+=      --enable-smartall
 
 CONFIGURE_ARGS.DragonFly+=     --disable-xattr
 
+REPLACE_PERL+=         scripts/get_malware_abuse.ch
+
+REPLACE_PYTHON+=       scripts/key-manager.py.in
+REPLACE_PYTHON+=       scripts/md5tobase64.py
+
 PTHREAD_OPTS+=         require
 PTHREAD_AUTO_VARS=     yes
 
 EXAMPLESDIR=           ${PREFIX}/share/examples/bacula
 INSTALLATION_DIRS+=    ${EXAMPLESDIR}
 
+.include "../../lang/python/application.mk"
 .include "../../mk/readline.buildlink3.mk"
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/sysutils/bacula/PLIST.common
diff -u pkgsrc/sysutils/bacula/PLIST.common:1.19 pkgsrc/sysutils/bacula/PLIST.common:1.20
--- pkgsrc/sysutils/bacula/PLIST.common:1.19    Thu Feb  7 11:29:31 2019
+++ pkgsrc/sysutils/bacula/PLIST.common Tue Jun  3 11:36:47 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.19 2019/02/07 11:29:31 markd Exp $
+@comment $NetBSD: PLIST.common,v 1.20 2025/06/03 11:36:47 markd Exp $
 lib/bpipe-fd.la
 lib/libbac.la
 lib/libbaccfg.la
@@ -15,7 +15,9 @@ libexec/bacula/btraceback.dbx
 libexec/bacula/btraceback.gdb
 libexec/bacula/btraceback.mdb
 libexec/bacula/disk-changer
+libexec/bacula/install-key-manager.sh
 libexec/bacula/isworm
+libexec/bacula/key-manager.py
 libexec/bacula/mtx-changer
 libexec/bacula/mtx-changer.conf
 libexec/bacula/query.sql
@@ -26,12 +28,16 @@ man/man8/bacula-dir.8
 man/man8/bacula-fd.8
 man/man8/bacula-sd.8
 man/man8/bacula.8
+man/man8/bbconsjson.8
 man/man8/bconsole.8
 man/man8/bcopy.8
+man/man8/bdirjson.8
 man/man8/bextract.8
+man/man8/bfdjson.8
 man/man8/bls.8
 man/man8/bregex.8
 man/man8/bscan.8
+man/man8/bsdjson.8
 man/man8/btape.8
 man/man8/btraceback.8
 man/man8/bwild.8
@@ -42,6 +48,8 @@ sbin/bbconsjson
 sbin/bconsole
 sbin/bfdjson
 sbin/btraceback
+sbin/get_malware_abuse.ch
+sbin/md5tobase64.py
 share/doc/bacula/ChangeLog
 share/doc/bacula/INSTALL
 share/doc/bacula/LICENSE

Index: pkgsrc/sysutils/bacula/distinfo
diff -u pkgsrc/sysutils/bacula/distinfo:1.63 pkgsrc/sysutils/bacula/distinfo:1.64
--- pkgsrc/sysutils/bacula/distinfo:1.63        Sun Mar 26 19:34:11 2023
+++ pkgsrc/sysutils/bacula/distinfo     Tue Jun  3 11:36:47 2025
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.63 2023/03/26 19:34:11 markd Exp $
+$NetBSD: distinfo,v 1.64 2025/06/03 11:36:47 markd Exp $
 
-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
+BLAKE2s (bacula-15.0.3.tar.gz) = 1a87e387aa8952b9a5e4da2f77222c0d531bd54b2ec8ac957a234efe594e2078
+SHA512 (bacula-15.0.3.tar.gz) = 1700ac00b41d9e3426f6b7ead5bf44722e2f36e54ddb26a9ea169f6fbf4a61a7863e2e7b81890911d567d653468675d53eb7fc74e77c93358d6f9a52a73c0af8
+Size (bacula-15.0.3.tar.gz) = 6539212 bytes
 SHA1 (patch-ad) = ce6bc29858d13dff1a0301db95f9bfedf3e66b01
 SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2
-SHA1 (patch-configure) = fb2c8ec47f0b51f53b61d51df2855d944507bfc7
-SHA1 (patch-scripts_baculabackupreport.in) = 58047124ad82dd5d0f2aa786251ba012ae7f07b0
+SHA1 (patch-configure) = 3061094dcda0a5422d70d8e0eb081dfcced0c621
 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) = da7914d67c8ce979d26b1d827d7ab16fa9c07adf
-SHA1 (patch-src_filed_Makefile.in) = 48561fe00618a17f64cf3b6161e18ccfdafd1f5f
+SHA1 (patch-src_dird_Makefile.in) = 2f05c9168e897b92a89c7b29f4208f747ab336d0
+SHA1 (patch-src_filed_Makefile.in) = c06e9d76555eacad2c5e351634fa76a9364ee9e1
 SHA1 (patch-src_filed_bacl.c) = 6eb8d9e5198d91ea52b8ab4a31bf0cc565f3ee07
 SHA1 (patch-src_filed_bacl__freebsd.c) = 0a90b6621e3b18b43f7f9e0d7af50ba7f17ca708
 SHA1 (patch-src_filed_bacl__freebsd.h) = 44a888985cb7dfde52603e3e19ed117e4b922641
@@ -27,4 +26,4 @@ SHA1 (patch-src_qt-console_bat.pro.in) =
 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
+SHA1 (patch-src_tools_Makefile.in) = 80a8a891da980a0517c02edb35cb94a1cd28bab0

Index: pkgsrc/sysutils/bacula-clientonly/Makefile
diff -u pkgsrc/sysutils/bacula-clientonly/Makefile:1.32 pkgsrc/sysutils/bacula-clientonly/Makefile:1.33
--- pkgsrc/sysutils/bacula-clientonly/Makefile:1.32     Tue Oct 24 22:11:03 2023
+++ pkgsrc/sysutils/bacula-clientonly/Makefile  Tue Jun  3 11:36:48 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2023/10/24 22:11:03 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2025/06/03 11:36:48 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]*

Index: pkgsrc/sysutils/bacula-qt5-console/Makefile
diff -u pkgsrc/sysutils/bacula-qt5-console/Makefile:1.34 pkgsrc/sysutils/bacula-qt5-console/Makefile:1.35
--- pkgsrc/sysutils/bacula-qt5-console/Makefile:1.34    Thu Apr 24 14:15:43 2025
+++ pkgsrc/sysutils/bacula-qt5-console/Makefile Tue Jun  3 11:36:48 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2025/04/24 14:15:43 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2025/06/03 11:36:48 markd Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-qt5-console-/}
-PKGREVISION=   15
 COMMENT=       Qt5-based console for Bacula - The Network Backup Solution
 
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/bacula/distinfo

Index: pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile
diff -u pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile:1.35 pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile:1.36
--- pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile:1.35       Thu Apr 24 14:15:43 2025
+++ pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile    Tue Jun  3 11:36:48 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2025/04/24 14:15:43 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2025/06/03 11:36:48 markd Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-tray-monitor-qt5-/}
-PKGREVISION=   15
 COMMENT=       System tray monitor for Bacula - The Network Backup Solution
 
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/bacula/distinfo

Index: pkgsrc/sysutils/bacula/patches/patch-configure
diff -u pkgsrc/sysutils/bacula/patches/patch-configure:1.3 pkgsrc/sysutils/bacula/patches/patch-configure:1.4
--- pkgsrc/sysutils/bacula/patches/patch-configure:1.3  Sun May 24 01:22:16 2020
+++ pkgsrc/sysutils/bacula/patches/patch-configure      Tue Jun  3 11:36:47 2025
@@ -1,10 +1,30 @@
-$NetBSD: patch-configure,v 1.3 2020/05/24 01:22:16 joerg Exp $
+$NetBSD: patch-configure,v 1.4 2025/06/03 11:36:47 markd Exp $
+
+fix test ==
 
 NetBSD has xattr and acl.
 
---- configure.orig     2020-02-26 14:11:43.000000000 +0000
+--- configure.orig     2025-03-26 14:34:35.000000000 +0000
 +++ configure
-@@ -30085,7 +30085,7 @@ $as_echo "no" >&6; }
+@@ -23361,7 +23361,7 @@ else
+ fi
+ 
+ 
+-if test x"${error}" == "x"; then
++if test x"${error}" = "x"; then
+    support_curl=yes
+ fi
+ 
+@@ -23427,7 +23427,7 @@ fi
+ 
+ 
+ 
+-if test x"${error}" == "x"; then
++if test x"${error}" = "x"; then
+     support_zstd=yes
+ else
+     support_zstd=no
+@@ -30899,7 +30899,7 @@ $as_echo "no" >&6; }
     fi
  
              if test $have_acl = yes -a \
@@ -13,7 +33,7 @@ NetBSD has xattr and acl.
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_TYPE_NFS4 in acl.h include file" >&5
  $as_echo_n "checking for ACL_TYPE_NFS4 in acl.h include file... " >&6; }
        grep ACL_TYPE_NFS4 /usr/include/sys/acl.h > /dev/null 2>&1
-@@ -30232,6 +30232,9 @@ $as_echo "#define HAVE_ACL 1" >>confdefs
+@@ -31046,6 +31046,9 @@ $as_echo "#define HAVE_ACL 1" >>confdefs
         if test x${HAVE_FREEBSD_OS_TRUE} = x; then
            ACLOBJS="bacl.c bacl_freebsd.c"
         fi
@@ -23,7 +43,7 @@ NetBSD has xattr and acl.
         if test x${HAVE_DARWIN_OS_TRUE} = x; then
            ACLOBJS="bacl.c bacl_osx.c"
         fi
-@@ -30706,6 +30709,9 @@ $as_echo "#define HAVE_XATTR 1" >>confde
+@@ -31520,6 +31523,9 @@ $as_echo "#define HAVE_XATTR 1" >>confde
         if test x${HAVE_FREEBSD_OS_TRUE} = x; then
            XATTROBJS="bxattr.c bxattr_freebsd.c"
         fi
Index: pkgsrc/sysutils/bacula/patches/patch-src_dird_Makefile.in
diff -u pkgsrc/sysutils/bacula/patches/patch-src_dird_Makefile.in:1.3 pkgsrc/sysutils/bacula/patches/patch-src_dird_Makefile.in:1.4
--- pkgsrc/sysutils/bacula/patches/patch-src_dird_Makefile.in:1.3       Thu Oct  6 02:58:17 2022
+++ pkgsrc/sysutils/bacula/patches/patch-src_dird_Makefile.in   Tue Jun  3 11:36:47 2025
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_dird_Makefile.in,v 1.3 2022/10/06 02:58:17 markd Exp $
+$NetBSD: patch-src_dird_Makefile.in,v 1.4 2025/06/03 11:36:47 markd Exp $
 
 - use %%EXAMPLESDIR%% instead of sysconfdir
 - use the .la files for linking
 
---- src/dird/Makefile.in.orig  2022-08-05 15:13:35.000000000 +0000
+--- src/dird/Makefile.in.orig  2025-03-26 14:34:35.000000000 +0000
 +++ src/dird/Makefile.in
-@@ -72,21 +72,21 @@ bacula-dir: Makefile $(SVROBJS) ../lib/l
+@@ -73,21 +73,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) \
@@ -29,8 +29,8 @@ $NetBSD: patch-src_dird_Makefile.in,v 1.
 +            ../lib/libbaccfg.la ../lib/libbac.la -lm $(DLIB) $(DB_LIBS) $(LIBS) \
              $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
  
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
-@@ -115,16 +115,16 @@ install: all
+ store_mngr_test: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) dird.c store_mngr.c 
+@@ -123,16 +123,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; \
@@ -51,7 +51,7 @@ $NetBSD: patch-src_dird_Makefile.in,v 1.
           fi
        @if  test -f ${DESTDIR}${scriptdir}/query.sql; then \
           echo "  ==> Saving existing query.sql to query.sql.old"; \
-@@ -138,7 +138,7 @@ install: all
+@@ -146,7 +146,7 @@ install: all
  
  uninstall:
        (cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir bdirjson)

Index: pkgsrc/sysutils/bacula/patches/patch-src_filed_Makefile.in
diff -u pkgsrc/sysutils/bacula/patches/patch-src_filed_Makefile.in:1.4 pkgsrc/sysutils/bacula/patches/patch-src_filed_Makefile.in:1.5
--- pkgsrc/sysutils/bacula/patches/patch-src_filed_Makefile.in:1.4      Thu Oct  6 02:58:17 2022
+++ pkgsrc/sysutils/bacula/patches/patch-src_filed_Makefile.in  Tue Jun  3 11:36:47 2025
@@ -1,27 +1,27 @@
-$NetBSD: patch-src_filed_Makefile.in,v 1.4 2022/10/06 02:58:17 markd Exp $
+$NetBSD: patch-src_filed_Makefile.in,v 1.5 2025/06/03 11:36:47 markd Exp $
 
 - use %%EXAMPLESDIR%% instead of sysconfdir
 - use the .la files for linking
 
---- src/filed/Makefile.in.orig 2022-08-05 15:13:35.000000000 +0000
+--- src/filed/Makefile.in.orig 2025-03-26 14:34:35.000000000 +0000
 +++ src/filed/Makefile.in
-@@ -115,13 +115,13 @@ win32:   $(WIN32OBJS)
+@@ -118,13 +118,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) \
 -        $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
 +        $(WIN32LIBS) $(FDLIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) \
-         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS)
+         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(IOKITLIBS)
  
  bfdjson:  Makefile $(JSONOBJS) ../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 $@ $(JSONOBJS) \
 -        $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
 +        $(WIN32LIBS) $(FDLIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) \
-         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(ZSTD_LIBS)
  
  static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
-@@ -165,16 +165,16 @@ install: all
+@@ -168,16 +168,16 @@ install: all
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bfdjson $(DESTDIR)$(sbindir)/bfdjson
        @srcconf=bacula-fd.conf; \

Index: pkgsrc/sysutils/bacula/patches/patch-src_tools_Makefile.in
diff -u pkgsrc/sysutils/bacula/patches/patch-src_tools_Makefile.in:1.5 pkgsrc/sysutils/bacula/patches/patch-src_tools_Makefile.in:1.6
--- pkgsrc/sysutils/bacula/patches/patch-src_tools_Makefile.in:1.5      Thu Oct  6 02:58:17 2022
+++ pkgsrc/sysutils/bacula/patches/patch-src_tools_Makefile.in  Tue Jun  3 11:36:47 2025
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_tools_Makefile.in,v 1.5 2022/10/06 02:58:17 markd Exp $
+$NetBSD: patch-src_tools_Makefile.in,v 1.6 2025/06/03 11:36:47 markd Exp $
 
 - use the .la files for linking
 - remove tests that don't link (using functions not in libraries)
 
---- src/tools/Makefile.in.orig 2022-08-05 15:13:35.000000000 +0000
+--- src/tools/Makefile.in.orig 2025-03-26 14:34:35.000000000 +0000
 +++ src/tools/Makefile.in
-@@ -97,17 +97,17 @@ bsparse: bsparse.c
+@@ -103,17 +103,17 @@ bsparse: bsparse.c
        $(CXX) -Wall -o $@ bsparse.c
  
  bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)      
@@ -27,7 +27,7 @@ $NetBSD: patch-src_tools_Makefile.in,v 1
  
  thread: Makefile thread.o 
        $(CXX) $(LDFLAGS) -o $@ thread.o -lpthread
-@@ -115,14 +115,14 @@ thread: Makefile thread.o 
+@@ -121,14 +121,14 @@ thread: Makefile thread.o 
  dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
         ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS)
        $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ dbcheck.o $(DIRCONFOBJS) \
@@ -41,11 +41,11 @@ $NetBSD: patch-src_tools_Makefile.in,v 1
  
  bnet_test: Makefile bnet_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
 -      $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ bnet_test.o -lbacfind -lbac -lm \
-+      $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ bnet_test.o ../findlib/libbacfind.la ../lib/libbac.la -lbac -lm \
++      $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ bnet_test.o ../findlib/libbacfind.la ../lib/libbac.la -lm \
          $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
  
- tags_test: Makefile test_tags.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/unittests.o
-@@ -131,7 +131,7 @@ tags_test: Makefile test_tags.o ../lib/l
+ block_crypto_test: Makefile block_crypto_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/unittests.o
+@@ -142,7 +142,7 @@ tags_test: Makefile test_tags.o ../lib/l
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $@ $(DESTDIR)$(sbindir)/
  
  drivetype: Makefile drivetype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
@@ -54,7 +54,7 @@ $NetBSD: patch-src_tools_Makefile.in,v 1
          $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
  
  dird_conf.o: ../dird/dird_conf.c
-@@ -150,29 +150,29 @@ timelimit: timelimit.o
+@@ -161,29 +161,29 @@ timelimit: timelimit.o
  testfind: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
          ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(FINDOBJS)
        $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -o $@ $(FINDOBJS) -L. -L../lib -L../findlib \
@@ -90,7 +90,7 @@ $NetBSD: patch-src_tools_Makefile.in,v 1
  
  # Turn on cats_test when it builds correctly
  #cats_test.o: cats_test.c
-@@ -190,13 +190,13 @@ gigaslam: gigaslam.o
+@@ -201,13 +201,13 @@ gigaslam: gigaslam.o
        $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o
  
  grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@@ -106,7 +106,7 @@ $NetBSD: patch-src_tools_Makefile.in,v 1
  
  TESTDEDUPOBJS = ../stored/bitarray.o ../stored/dedupengine.o test-dedup.o
  
-@@ -205,7 +205,7 @@ test-dedup.o: test-dedup.c
+@@ -216,7 +216,7 @@ test-dedup.o: test-dedup.c
  
  test-dedup: Makefile $(TESTDEDUPOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
        $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -static -L../lib -o $@ $(TESTDEDUPOBJS) $(ZLIBS) \

Prev by Date: CVS commit: pkgsrc/devel/glib2
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/devel/glib2
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index