summaryrefslogtreecommitdiff
path: root/sysutils/bacula/patches
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2022-10-06 02:58:17 +0000
committermarkd <markd@pkgsrc.org>2022-10-06 02:58:17 +0000
commitec99bc46211c5a8da25db3ab4a185d66d594c4e5 (patch)
tree05beb7e8949275dd6b0792933fd7d2f41bbe4f35 /sysutils/bacula/patches
parent3ac3b26b9c18539bde06fded5063a6169686210a (diff)
downloadpkgsrc-ec99bc46211c5a8da25db3ab4a185d66d594c4e5.tar.gz
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 (limited to 'sysutils/bacula/patches')
-rw-r--r--sysutils/bacula/patches/patch-src_dird_Makefile.in18
-rw-r--r--sysutils/bacula/patches/patch-src_dird_dird.c75
-rw-r--r--sysutils/bacula/patches/patch-src_filed_Makefile.in16
-rw-r--r--sysutils/bacula/patches/patch-src_findlib_attribs.c12
-rw-r--r--sysutils/bacula/patches/patch-src_findlib_fstype.c13
-rw-r--r--sysutils/bacula/patches/patch-src_plugins_fd_Makefile14
-rw-r--r--sysutils/bacula/patches/patch-src_plugins_fd_Makefile.in14
-rw-r--r--sysutils/bacula/patches/patch-src_qt-console_bat.pro.in12
-rw-r--r--sysutils/bacula/patches/patch-src_qt-console_tray-monitor_tray-monitor.pro.in8
-rw-r--r--sysutils/bacula/patches/patch-src_stored_Makefile.in43
-rw-r--r--sysutils/bacula/patches/patch-src_tools_Makefile.in69
11 files changed, 107 insertions, 187 deletions
diff --git a/sysutils/bacula/patches/patch-src_dird_Makefile.in b/sysutils/bacula/patches/patch-src_dird_Makefile.in
index 0b3dc71bea9..acbecf40ea2 100644
--- a/sysutils/bacula/patches/patch-src_dird_Makefile.in
+++ b/sysutils/bacula/patches/patch-src_dird_Makefile.in
@@ -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 @@ $NetBSD: patch-src_dird_Makefile.in,v 1.2 2019/02/07 11:29:31 markd Exp $
$(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 @@ $NetBSD: patch-src_dird_Makefile.in,v 1.2 2019/02/07 11:29:31 markd Exp $
- ${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 --git a/sysutils/bacula/patches/patch-src_dird_dird.c b/sysutils/bacula/patches/patch-src_dird_dird.c
deleted file mode 100644
index 8582c4ebc4b..00000000000
--- a/sysutils/bacula/patches/patch-src_dird_dird.c
+++ /dev/null
@@ -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
-Message-ID: <c2515e90-0bf3-bc5e-1908-e7b23867b17a@baculasystems.com>
-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>
-
-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 --git a/sysutils/bacula/patches/patch-src_filed_Makefile.in b/sysutils/bacula/patches/patch-src_filed_Makefile.in
index 4d40c285a6e..e3798317f0d 100644
--- a/sysutils/bacula/patches/patch-src_filed_Makefile.in
+++ b/sysutils/bacula/patches/patch-src_filed_Makefile.in
@@ -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 @@ $NetBSD: patch-src_filed_Makefile.in,v 1.3 2020/03/06 19:48:48 jnemeth Exp $
+ $(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)
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -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)
- strip $@
-
-@@ -154,16 +154,16 @@ install: all
+ 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
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bfdjson $(DESTDIR)$(sbindir)/bfdjson
@srcconf=bacula-fd.conf; \
diff --git a/sysutils/bacula/patches/patch-src_findlib_attribs.c b/sysutils/bacula/patches/patch-src_findlib_attribs.c
index 4fb0780ff04..5d8c8f208d6 100644
--- a/sysutils/bacula/patches/patch-src_findlib_attribs.c
+++ b/sysutils/bacula/patches/patch-src_findlib_attribs.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_findlib_attribs.c,v 1.2 2019/02/07 11:29:31 markd Exp $
+$NetBSD: patch-src_findlib_attribs.c,v 1.3 2022/10/06 02:58:17 markd Exp $
use intmax_t instead of int64_t
---- src/findlib/attribs.c.orig 2018-12-21 08:40:51.000000000 +0000
+--- src/findlib/attribs.c.orig 2022-08-05 15:13:35.000000000 +0000
+++ src/findlib/attribs.c
-@@ -410,7 +410,7 @@ void encode_stat(char *buf, struct stat
+@@ -415,7 +415,7 @@ void encode_stat(char *buf, struct stat
int decode_stat(char *buf, struct stat *statp, int stat_size, int32_t *LinkFI)
{
char *p = buf;
@@ -13,7 +13,7 @@ use intmax_t instead of int64_t
int data_stream;
/*
-@@ -514,7 +514,7 @@ int decode_stat(char *buf, struct stat *
+@@ -519,7 +519,7 @@ int decode_stat(char *buf, struct stat *
int32_t decode_LinkFI(char *buf, struct stat *statp, int stat_size)
{
char *p = buf;
@@ -22,7 +22,7 @@ use intmax_t instead of int64_t
/*
* We store into the stat packet so make sure the caller's conception
* is the same as ours. They can be different if LARGEFILE is not
-@@ -822,7 +822,7 @@ int encode_attribsEx(JCR *jcr, char *att
+@@ -824,7 +824,7 @@ int encode_attribsEx(JCR *jcr, char *att
static bool set_win32_attributes(JCR *jcr, ATTR *attr, BFILE *ofd)
{
char *p = attr->attrEx;
@@ -30,4 +30,4 @@ use intmax_t instead of int64_t
+ intmax_t val;
WIN32_FILE_ATTRIBUTE_DATA atts;
ULARGE_INTEGER li;
- POOLMEM *win32_ofile;
+
diff --git a/sysutils/bacula/patches/patch-src_findlib_fstype.c b/sysutils/bacula/patches/patch-src_findlib_fstype.c
new file mode 100644
index 00000000000..21e4126dea5
--- /dev/null
+++ b/sysutils/bacula/patches/patch-src_findlib_fstype.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_findlib_fstype.c,v 1.1 2022/10/06 02:58:17 markd Exp $
+
+--- src/findlib/fstype.c.orig 2022-09-23 04:23:23.100122245 +0000
++++ src/findlib/fstype.c
+@@ -159,7 +159,7 @@ static uint64_t fstypeid(char *fname, FF
+ struct statvfs st;
+
+ if (statvfs(fname, &st) == 0) {
+- return st.f_type;
++ return (((uint64_t)st.f_fsidx.__fsid_val[0])<<32) | st.f_fsidx.__fsid_val[1];
+ }
+ return 0;
+ }
diff --git a/sysutils/bacula/patches/patch-src_plugins_fd_Makefile b/sysutils/bacula/patches/patch-src_plugins_fd_Makefile
new file mode 100644
index 00000000000..bbebe0b0477
--- /dev/null
+++ b/sysutils/bacula/patches/patch-src_plugins_fd_Makefile
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_plugins_fd_Makefile,v 1.1 2022/10/06 02:58:17 markd Exp $
+
+don't remove file we justr installed
+
+--- src/plugins/fd/Makefile.orig 2022-08-05 15:13:35.000000000 +0000
++++ src/plugins/fd/Makefile
+@@ -125,7 +125,6 @@ test_kubernetes_backend: Makefile $(TEST
+ install: all $(EXTRA_INSTALL_TARGET)
+ $(MKDIR) $(DESTDIR)$(plugindir)
+ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir)
+- $(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la
+
+ install-docker:
+ $(MAKE) -C docker install-docker
diff --git a/sysutils/bacula/patches/patch-src_plugins_fd_Makefile.in b/sysutils/bacula/patches/patch-src_plugins_fd_Makefile.in
deleted file mode 100644
index 1edf75cd53a..00000000000
--- a/sysutils/bacula/patches/patch-src_plugins_fd_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_plugins_fd_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $
-
-don't remove file we justr installed
-
---- src/plugins/fd/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400
-+++ src/plugins/fd/Makefile.in 2012-10-05 11:19:22.000000000 -0400
-@@ -45,7 +45,6 @@
- install: all
- $(MKDIR) $(DESTDIR)$(plugindir)
- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir)
-- $(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la
-
- install-test-plugin: all
- $(MKDIR) $(DESTDIR)$(plugindir)
diff --git a/sysutils/bacula/patches/patch-src_qt-console_bat.pro.in b/sysutils/bacula/patches/patch-src_qt-console_bat.pro.in
index 1e6e8dba8c5..b72fdb5e13e 100644
--- a/sysutils/bacula/patches/patch-src_qt-console_bat.pro.in
+++ b/sysutils/bacula/patches/patch-src_qt-console_bat.pro.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_qt-console_bat.pro.in,v 1.1 2012/10/06 17:54:53 christos Exp $
+$NetBSD: patch-src_qt-console_bat.pro.in,v 1.2 2022/10/06 02:58:17 markd Exp $
- comment out the confs paths and command
- use just the compiler not libtool for QMAKE_LINK
---- src/qt-console/bat.pro.in.orig 2012-09-13 04:51:19.000000000 -0400
-+++ src/qt-console/bat.pro.in 2012-10-05 11:17:23.000000000 -0400
-@@ -10,8 +10,8 @@
-
+--- src/qt-console/bat.pro.in.orig 2022-08-05 15:13:35.000000000 +0000
++++ src/qt-console/bat.pro.in
+@@ -13,8 +13,8 @@ greaterThan(QT_MAJOR_VERSION, 4): QT +=
+ datarootdir = @datarootdir@
bins.path = /$(DESTDIR)@sbindir@
bins.files = bat
-confs.path = /$(DESTDIR)@sysconfdir@
@@ -16,7 +16,7 @@ $NetBSD: patch-src_qt-console_bat.pro.in,v 1.1 2012/10/06 17:54:53 christos Exp
help.path = /$(DESTDIR)@docdir@
help.files = help/*.html images/status.png images/mail-message-new.png
-@@ -22,7 +22,7 @@
+@@ -25,7 +25,7 @@ INCLUDEPATH += .. . ./console ./restore
LIBS += -L../lib -lbaccfg -lbac -L../findlib -lbacfind @OPENSSL_LIBS@
LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
diff --git a/sysutils/bacula/patches/patch-src_qt-console_tray-monitor_tray-monitor.pro.in b/sysutils/bacula/patches/patch-src_qt-console_tray-monitor_tray-monitor.pro.in
index ff81dc3068f..a6cfe6ae525 100644
--- a/sysutils/bacula/patches/patch-src_qt-console_tray-monitor_tray-monitor.pro.in
+++ b/sysutils/bacula/patches/patch-src_qt-console_tray-monitor_tray-monitor.pro.in
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_qt-console_tray-monitor_tray-monitor.pro.in,v 1.1 2019/02/07 11:29:31 markd Exp $
+$NetBSD: patch-src_qt-console_tray-monitor_tray-monitor.pro.in,v 1.2 2022/10/06 02:58:17 markd Exp $
- comment out the confs paths and command
- use just the compiler not libtool for QMAKE_LINK
---- src/qt-console/tray-monitor/tray-monitor.pro.in.orig 2018-12-21 08:40:51.000000000 +0000
+--- src/qt-console/tray-monitor/tray-monitor.pro.in.orig 2022-08-05 15:13:35.000000000 +0000
+++ src/qt-console/tray-monitor/tray-monitor.pro.in
@@ -27,8 +27,8 @@ cross-win32 {
@@ -16,8 +16,8 @@ $NetBSD: patch-src_qt-console_tray-monitor_tray-monitor.pro.in,v 1.1 2019/02/07
TEMPLATE = app
TARGET = bacula-tray-monitor
-@@ -37,7 +37,7 @@ DEPENDPATH += .
- INCLUDEPATH += ../.. .
+@@ -38,7 +38,7 @@ INCLUDEPATH += ../.. .
+ QMAKE_CC = $(CXX)
LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
-QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
diff --git a/sysutils/bacula/patches/patch-src_stored_Makefile.in b/sysutils/bacula/patches/patch-src_stored_Makefile.in
index 73855ee71b3..d37f3929b9a 100644
--- a/sysutils/bacula/patches/patch-src_stored_Makefile.in
+++ b/sysutils/bacula/patches/patch-src_stored_Makefile.in
@@ -1,20 +1,11 @@
-$NetBSD: patch-src_stored_Makefile.in,v 1.3 2020/12/02 01:36:49 jnemeth Exp $
+$NetBSD: patch-src_stored_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/stored/Makefile.in.orig 2020-09-21 12:30:41.000000000 +0000
+--- src/stored/Makefile.in.orig 2022-08-05 15:13:35.000000000 +0000
+++ src/stored/Makefile.in
-@@ -97,7 +97,7 @@ ZLIBS=@ZLIBS@
- LZO_LIBS= @LZO_LIBS@
- LZO_INC= @LZO_INC@
-
--SD_LIBS = -lbacsd -lbaccfg -lbac
-+SD_LIBS = libbacsd.la ../lib/libbaccfg.la ../lib/libbac.la
-
-
- .SUFFIXES: .c .o .lo
-@@ -155,7 +155,7 @@ bacula-sd-aligned-driver.la: Makefile $(
+@@ -252,7 +252,7 @@ bacula-sd-aligned-driver.la: Makefile $(
bsdjson: Makefile $(JSONOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(JSONOBJS) $(ZLIBS) \
@@ -23,26 +14,8 @@ $NetBSD: patch-src_stored_Makefile.in,v 1.3 2020/12/02 01:36:49 jnemeth Exp $
$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
static-bacula-sd: Makefile $(SDOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
-@@ -191,7 +191,7 @@ bls.o: bls.c
- bls: Makefile $(BLSOBJS) libbacsd.la $(DRIVERS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- @echo "Linking $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
-- $(SD_LIBS) -lbacfind -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+ $(SD_LIBS) ../findlib/libbacfind.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-
- bextract.o: bextract.c
- @echo "Compiling $<"
-@@ -201,7 +201,7 @@ bextract.o: bextract.c
- bextract: Makefile $(BEXTOBJS) libbacsd.la $(DRIVERS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- @echo "Linking $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \
-- $(SD_LIBS) -lbacfind -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+ $(SD_LIBS) ../findlib/libbacfind.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-
- bscan.o: bscan.c
- @echo "Compiling $<"
-@@ -211,7 +211,7 @@ bscan.o: bscan.c
- bscan: Makefile $(SCNOBJS) libbacsd.la $(DRIVERS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
+@@ -317,7 +317,7 @@ bscan.o: bscan.c
+ bscan: Makefile $(SCNOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
- $(SD_LIBS) -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
@@ -50,7 +23,7 @@ $NetBSD: patch-src_stored_Makefile.in,v 1.3 2020/12/02 01:36:49 jnemeth Exp $
bcopy.o: bcopy.c
@echo "Compiling $<"
-@@ -225,7 +225,7 @@ bcopy: Makefile $(COPYOBJS) libbacsd.la
+@@ -331,7 +331,7 @@ bcopy: Makefile $(COPYOBJS) libbacsd.la
cloud_parts_test: Makefile cloud_parts.c
$(RMF) cloud_parts.o
$(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) cloud_parts.c
@@ -59,7 +32,7 @@ $NetBSD: patch-src_stored_Makefile.in,v 1.3 2020/12/02 01:36:49 jnemeth Exp $
rm -f cloud_parts.o
$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) cloud_parts.c
-@@ -254,16 +254,16 @@ install: all @LIBTOOL_INSTALL_TARGET@
+@@ -382,16 +382,16 @@ install: all @LIBTOOL_INSTALL_TARGET@ $(
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-sd $(DESTDIR)$(sbindir)/static-bacula-sd; \
fi
@srcconf=bacula-sd.conf; \
@@ -79,4 +52,4 @@ $NetBSD: patch-src_stored_Makefile.in,v 1.3 2020/12/02 01:36:49 jnemeth Exp $
+ chgrp -f ${sd_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf; \
fi
- install-cloud: bacula-sd-cloud-driver.la
+ install-acsls-changer: acsls-changer
diff --git a/sysutils/bacula/patches/patch-src_tools_Makefile.in b/sysutils/bacula/patches/patch-src_tools_Makefile.in
index ece975b153b..d98eeaf10bc 100644
--- a/sysutils/bacula/patches/patch-src_tools_Makefile.in
+++ b/sysutils/bacula/patches/patch-src_tools_Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_tools_Makefile.in,v 1.4 2020/03/06 19:48:48 jnemeth Exp $
+$NetBSD: patch-src_tools_Makefile.in,v 1.5 2022/10/06 02:58:17 markd Exp $
- use the .la files for linking
- remove tests that don't link (using functions not in libraries)
---- src/tools/Makefile.in.orig 2020-02-26 14:11:43.000000000 +0000
+--- src/tools/Makefile.in.orig 2022-08-05 15:13:35.000000000 +0000
+++ src/tools/Makefile.in
-@@ -58,27 +58,27 @@ all: Makefile $(TOOLS) gigaslam grow
- @echo " "
+@@ -97,17 +97,17 @@ bsparse: bsparse.c
+ $(CXX) -Wall -o $@ bsparse.c
bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
@@ -21,25 +21,40 @@ $NetBSD: patch-src_tools_Makefile.in,v 1.4 2020/03/06 19:48:48 jnemeth Exp $
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o ../lib/libbac.la -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ hdtest: Makefile hdtest.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ hdtest.o -lbac -lm $(DLIB) $(LIBS)
++ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ hdtest.o ../lib/libbac.la -lm $(DLIB) $(LIBS)
+
+ thread: Makefile thread.o
+ $(CXX) $(LDFLAGS) -o $@ thread.o -lpthread
+@@ -115,14 +115,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) \
- ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L. -L../lib -L../findlib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \
-- $(DLIB) -lbaccats -lbacsql -lbacfind -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+ $(DLIB) ../cats/libbaccats.la ../cats/libbacsql.la ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ ../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) \
+- -lbaccats -lbacsql -lbaccfg -lbac -lbacfind -lm $(ZLIBS) $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++ ../cats/libbaccats.la ../cats/libbacsql.la ../lib/libbaccfg.la ../lib/libbac.la ../findlib/libbacfind.la -lm $(ZLIBS) $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
fstype: Makefile fstype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm \
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o ../findlib/libbacfind.la ../lib/libbac.la -lm \
$(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 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 \
+ $(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
+ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $@ $(DESTDIR)$(sbindir)/
+
drivetype: Makefile drivetype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o -lbacfind -lbac -lm \
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o ../findlib/libbacfind.la ../lib/libbac.la -lm \
$(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
dird_conf.o: ../dird/dird_conf.c
-@@ -97,29 +97,29 @@ timelimit: timelimit.o
+@@ -150,29 +150,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 \
@@ -62,10 +77,10 @@ $NetBSD: patch-src_tools_Makefile.in,v 1.4 2020/03/06 19:48:48 jnemeth Exp $
+ $(DLIB) ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
- ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) bbatch.o
+ ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bbatch.o
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bbatch.o \
-- $(DLIB) -lbaccats -lbacsql -lbacfind -lbac -lm $(ZLIBS) $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+ $(DLIB) ../cats/libbaccats.la ../cats/libbacsql.la ../findlib/libbacfind.la ../lib/libbac.la -lm $(ZLIBS) $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+- -lbaccats -lbacsql -lbac -lbacfind -lm $(ZLIBS) $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++ ../cats/libbaccats.la ../cats/libbacsql.la ../lib/libbac.la ../findlib/libbacfind.la -lm $(ZLIBS) $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \
../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o
@@ -73,18 +88,9 @@ $NetBSD: patch-src_tools_Makefile.in,v 1.4 2020/03/06 19:48:48 jnemeth Exp $
- -lbaccats -lbacsql -lbacfind -lbac -lm $(ZLIBS) $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ ../cats/libbaccats.la ../cats/libbacsql.la ../findlib/libbacfind.la ../lib/libbac.la -lm $(ZLIBS) $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- cats_test.o: cats_test.c
- echo "Compiling $<"
-@@ -127,7 +127,7 @@ cats_test.o: cats_test.c
-
- cats_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) cats_test.o
- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ cats_test.o \
-- -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+ ../cats/libbaccats.la ../cats/libbacsql.la ../findlib/libbacfind.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-
- gigaslam.o: gigaslam.c
- $(CXX) $(CFLAGS) -c $(CPPFLAGS) $<
-@@ -136,13 +136,13 @@ gigaslam: gigaslam.o
+ # Turn on cats_test when it builds correctly
+ #cats_test.o: cats_test.c
+@@ -190,13 +190,13 @@ gigaslam: gigaslam.o
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o
grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@@ -98,5 +104,14 @@ $NetBSD: patch-src_tools_Makefile.in,v 1.4 2020/03/06 19:48:48 jnemeth Exp $
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bpluginfo.o -lbac $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bpluginfo.o ../lib/libbac.la $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- cd $(topdir) \
+ TESTDEDUPOBJS = ../stored/bitarray.o ../stored/dedupengine.o test-dedup.o
+
+@@ -205,7 +205,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) \
+- -lbaccfg -lbac -lm $(TOKYOCABINET_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
++ ../lib/libbaccfg.la ../lib/libbac.la -lm $(TOKYOCABINET_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
+ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
+
+