diff --git a/sysutils/bareos17-client/Makefile b/sysutils/bareos17-client/Makefile index 7bd885edfe05..3bc4c169df48 100644 --- a/sysutils/bareos17-client/Makefile +++ b/sysutils/bareos17-client/Makefile @@ -1,20 +1,26 @@ PORTNAME= bareos PKGNAMESUFFIX= 17-client COMMENT= Backup archiving recovery open sourced (client) BROKEN_aarch64= Fails to link: missing sbrk BROKEN_riscv64= Fails to link: missing sbrk CONFLICTS= bareos16-client-* bareos-client-* WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd PLIST= ${PKGDIR}/pkg-plist.client MASTERDIR= ${.CURDIR}/../../sysutils/bareos17-server +OPTIONS_GROUP= PLUGINS +OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS OPTIONS_DEFINE= NLS PYTHON LMDB SCSICRYPTO + +CEPHFS_DESC= CEPHFS fd plugin support +GFAPI_DESC= GFAPI fd plugin support +RADOS_DESC= RADOS fd plugin support LMDB_DESC= Enable build of LMDB support .include "${MASTERDIR}/Makefile" diff --git a/sysutils/bareos17-server/Makefile b/sysutils/bareos17-server/Makefile index 412e279342f9..585e8d8a0e38 100644 --- a/sysutils/bareos17-server/Makefile +++ b/sysutils/bareos17-server/Makefile @@ -1,235 +1,251 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 17.2.9 +DISTVERSION= 17.2.10 PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= 17-server MAINTAINER= acm@FreeBSD.org COMMENT?= Backup archiving recovery open sourced (server) LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi CONFLICTS?= bacula*-server-* bareos16-server-* LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson USES+= libtool:keepla pkgconfig readline shebangfix USE_GITHUB= yes USERS= bareos GROUPS= ${USERS} PLIST_SUB+= LIB_VERSION=${PORTVERSION} GNU_CONFIGURE= yes USE_LDCONFIG= yes SHEBANG_LANG= perl SHEBANG_FILES= ${WRKSRC}/src/cats/make_catalog_backup.pl.in CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFAULT= OPENSSL OPTIONS_SINGLE= CRYPTO OPTIONS_SINGLE_CRYPTO= OPENSSL GNUTLS OPTIONS_SUB= yes CRYPTO_DESC= Cryptographic library MTX_DESC= Install mtx for control of autochanger devices NDMP_DESC= Enable build of NDMP support SCSICRYPTO_DESC= Build LTO AME crypto plugin .if ${PKGNAMESUFFIX} == "17-server" -OPTIONS_DEFINE= MTX PYTHON NDMP NLS SCSICRYPTO -OPTIONS_DEFAULT+= PGSQL SCSICRYPTO -OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL -OPTIONS_SINGLE+= DATABASE -DATABASE_DESC= Database support +OPTIONS_GROUP= BACKENDS +OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS +OPTIONS_DEFINE= MTX PYTHON NDMP NLS SCSICRYPTO +OPTIONS_DEFAULT+= PGSQL SCSICRYPTO +OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL +OPTIONS_SINGLE+= DATABASE +DATABASE_DESC= Database support +CEPHFS_DESC= CEPHFS backend support +GFAPI_DESC= GFAPI backend support +RADOS_DESC= RADOS backend support NDMP_CONFIGURE_ON= --enable-ndmp=yes NDMP_CONFIGURE_OFF= --enable-ndmp=no .endif GNUTLS_CONFIGURE_WITH= gnutls=${LOCALBASE} GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls OPENSSL_USES= ssl OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} OPENSSL_CONFIGURE_OFF= --with-openssl="no" SCSICRYPTO_CONFIGURE_ON= --enable-scsi-crypto=yes SCSICRYPTO_CONFIGURE_OFF= --enable-scsi-crypto=no .if ${PKGNAMESUFFIX} == "17-client" || ${PKGNAMESUFFIX} == "17-server" #Till end of the file PYTHON_USES= python PYTHON_CONFIGURE_ON= --with-python=yes PYTHON_CONFIGURE_OFF= --with-python=no PYTHON_PLUGIN= yes .if !defined(WITH_CLIENT_ONLY) LIB_DEPENDS+= libbareos.so:sysutils/bareos17-client USE_RC_SUBR?= bareos-dir bareos-sd .endif .if defined(WITH_CLIENT_ONLY) SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client .else SUB_FILES+= pkg-message.server .endif CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \ --enable-libtool \ --enable-smartalloc \ --sysconfdir=${PREFIX}/etc \ --with-working-dir=${BAREOS_DIR} \ --with-scriptdir=${PREFIX}/share/${PORTNAME} \ --with-logdir=/var/log/bareos \ --with-readline=${LOCALBASE} \ --disable-conio \ --enable-batch-insert \ --with-plugindir=${PREFIX}/lib/bareos/plugins \ --with-scriptdir=${PREFIX}/lib/bareos/scripts \ --with-dump-email=root@localhost \ --with-job-email=root@localhost \ --with-db-name=bareos \ --with-sbin-perm=755 \ --with-db-user=bareos \ --with-baseport=9101 \ --with-pid-dir=/var/run/bareos \ --with-jansson=${LOCALBASE} .if defined(WITH_CLIENT_ONLY) LMDB_CONFIGURE_ON= --enable-lmdb=yes LMDB_CONFIGURE_OFF= --enable-lmdb=no LMDB_CFLAGS= -DMDB_DSYNC=O_SYNC \ -DMDB_USE_POSIX_MUTEX=1 CONFIGURE_ARGS+=--with-fd-user=root \ --with-fd-group=wheel .else CONFIGURE_ARGS+=--with-dir-user=${BAREOS_USER} \ --with-dir-group=${BAREOS_GROUP} \ --with-sd-user=${BAREOS_USER} \ --with-sd-group=operator .endif # The user/group IDs below are registered, see # http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID # BAREOS_USER?= bareos BAREOS_GROUP?= ${BAREOS_USER} BAREOS_UID?= 997 BAREOS_GID?= ${BAREOS_UID} BAREOS_DIR?= /var/db/bareos PLIST_SUB+= BAREOS_DIR=${BAREOS_DIR} SUB_LIST= BAREOS_USER=${BAREOS_USER} \ BAREOS_GROUP=${BAREOS_GROUP} \ BAREOS_UID=${BAREOS_UID} \ BAREOS_GID=${BAREOS_GID} \ BAREOS_DIR=${BAREOS_DIR} NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls +CEPHFS_CONFIGURE_ON= --with-cephfs=yes +CEPHFS_CONFIGURE_OFF= --with-cephfs=no +CEPHFS_LIB_DEPENDS= libcephfs.so:net/ceph14 +GFAPI_CONFIGURE_ON= --with-glusterfs=${LOCALBASE} +GFAPI_CONFIGURE_OFF= --with-glusterfs=no +GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs +RADOS_CONFIGURE_ON= --with-rados=yes \ + --with-cephfs=yes +RADOS_CONFIGURE_OFF= --with-rados=no \ + --with-cephfs=no +RADOS_LIB_DEPENDS= librados.so:net/ceph14 # Client only or full server version .if defined(WITH_CLIENT_ONLY) CONFFILES= fd CONFIGURE_ARGS+= --enable-client-only PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client PKGINSTALL= ${FILESDIR}/pkg-install.client .else # Server only Options CONFFILES= sd dir # Server default database MYSQL_CONFIGURE_ON= --with-mysql=yes MYSQL_USES= mysql SQLITE3_CONFIGURE_ON= --with-sqlite3=yes SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 PGSQL_CONFIGURE_ON= --with-postgresql=yes PGSQL_USES= pgsql MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx .include .if ${PORT_OPTIONS:MMYSQL} DBTYPE= mysql SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" .elif ${PORT_OPTIONS:MSQLITE3} DBTYPE= sqlite3 .else DBTYPE= postgresql SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql .endif PLIST_SUB+= DBTYPE=${DBTYPE} .endif .if defined(WITH_CLIENT_ONLY) MP1+= bconsole.1 MP8+= bareos-fd.8 .else MP8+= bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \ btape.8 btraceback.8 bareos-dbcheck.8 MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1 .endif MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: # This port does not install docs. See bareos-docs for that ${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in # Default bconsole.conf is in ${ETCDIR} @${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in @${REINPLACE_CMD} -e 's|_NONSHARED||g' ${WRKSRC}/src/filed/Makefile.in @${REINPLACE_CMD} -e 's|/usr/bin/python-config|${PYTHON_CMD}-config|g' ${WRKSRC}/configure .if defined(WITH_CLIENT_ONLY) @${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in .else # In server port don't install filed @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \ -e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|\.\./lib/|$$(LOCALBASE)/lib/|g' -e 's|\.\./findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \ ${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in ${WRKSRC}/src/tests/Makefile.in @${REINPLACE_CMD} -e 's|\.\./\.\./lib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/plugins/dird/Makefile.in ${WRKSRC}/src/plugins/stored/Makefile.in @${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \ ${WRKSRC}/src/tools/bpluginfo.c @${REINPLACE_CMD} -e 's|perl|$(LOCALBASE)/bin/perl|g' ${WRKSRC}/scripts/mtx-changer.in .endif post-extract: .if defined(WITH_CLIENT_ONLY) . if defined(PYTHON_PLUGIN) @${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/fileset @${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/job . endif .endif @${MV} ${WRKSRC}/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \ ${WRKSRC}/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf' .if !target(post-install) post-install: .if defined(WITH_CLIENT_ONLY) ${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/ ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample .else ${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample ${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp ${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample ${MV} ${STAGEDIR}${ETCDIR}/bareos-regress.conf ${STAGEDIR}${ETCDIR}//bareos-regress.conf.sample .endif @${MKDIR} ${STAGEDIR}/var/run/bareos .endif .else .include "${MASTERDIR}/Makefile.common" .endif # 17-client and 17-server are defined .include diff --git a/sysutils/bareos17-server/distinfo b/sysutils/bareos17-server/distinfo index 0a46992e7c74..d6f6c0423ab7 100644 --- a/sysutils/bareos17-server/distinfo +++ b/sysutils/bareos17-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1589322594 -SHA256 (bareos-bareos-Release-17.2.9_GH0.tar.gz) = 617b88902710c2581470df54c45d2411a11f1d63554b935f308877a9510f9347 -SIZE (bareos-bareos-Release-17.2.9_GH0.tar.gz) = 4190637 +TIMESTAMP = 1624924837 +SHA256 (bareos-bareos-Release-17.2.10_GH0.tar.gz) = f6e2526b180e2ef17bcd72f7e27517dbdd0053675b8aef7147e9b24c0b0d7d10 +SIZE (bareos-bareos-Release-17.2.10_GH0.tar.gz) = 4190783 diff --git a/sysutils/bareos17-server/files/patch-configure b/sysutils/bareos17-server/files/patch-configure index 2790798a4180..17a768d4ddf3 100644 --- a/sysutils/bareos17-server/files/patch-configure +++ b/sysutils/bareos17-server/files/patch-configure @@ -1,20 +1,41 @@ ---- configure 2015-08-08 15:47:12.347184000 -0500 -+++ configure 2015-08-08 15:48:11.164437000 -0500 -@@ -18626,7 +18626,7 @@ +--- configure 2020-07-09 12:30:11.000000000 -0500 ++++ configure 2021-08-04 23:04:48.496040000 -0500 +@@ -18642,7 +18642,7 @@ found_so= found_a= if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test "${enable_static_fd+set}" != set; then found_dir="$additional_libdir" found_so="$additional_libdir/lib$name.$shlibext" if test -f "$additional_libdir/lib$name.la"; then -@@ -21466,7 +21466,7 @@ +@@ -22122,7 +22122,7 @@ found_so= found_a= if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test "${enable_static_fd+set}" != set; then found_dir="$additional_libdir" found_so="$additional_libdir/lib$name.$shlibext" if test -f "$additional_libdir/lib$name.la"; then +@@ -23610,7 +23610,7 @@ + done + + +-ac_fn_c_check_header_mongrel "$LINENO" "cephfs/ceph_statx.h" "ac_cv_header_cephfs_ceph_statx_h" "$ac_includes_default" ++ac_fn_c_check_header_mongrel "$LINENO" "cephfs/ceph_ll_client.h" "ac_cv_header_cephfs_ceph_statx_h" "$ac_includes_default" + if test "x$ac_cv_header_cephfs_ceph_statx_h" = xyes; then : + + $as_echo "#define HAVE_CEPHFS_CEPH_STATX_H 1" >>confdefs.h +@@ -32518,9 +32518,9 @@ + # + # Make sure the $with_glusterfs_directory also makes sense + # +- if test -d "${with_glusterfs_directory}/lib" -a -d "${with_glusterfs_directory}/include"; then ++ if test -d "${with_glusterfs_directory}/lib" -a -d "${with_glusterfs_directory}/include/glusterfs"; then + GLUSTER_LIBS="-L${with_glusterfs_directory}/lib ${GLUSTER_LIBS}" +- GLUSTER_INC="-I${with_glusterfs_directory}/include ${GLUSTER_INC}" ++ GLUSTER_INC="-I${with_glusterfs_directory}/include/glusterfs ${GLUSTER_INC}" + fi + else + GLUSTER_INC="-I/usr/include/glusterfs" diff --git a/sysutils/bareos17-server/files/patch-src-lib_bsnprintf.c b/sysutils/bareos17-server/files/patch-src-lib_bsnprintf.c new file mode 100644 index 000000000000..4787e1c416a2 --- /dev/null +++ b/sysutils/bareos17-server/files/patch-src-lib_bsnprintf.c @@ -0,0 +1,18 @@ +--- src/lib/bsnprintf.c 2021-08-04 23:06:43.246164000 -0500 ++++ src/lib/bsnprintf.c 2021-08-04 23:07:16.549429000 -0500 +@@ -618,6 +618,7 @@ + return result; + } + ++#if !defined __FreeBSD__ + static int64_t round(LDOUBLE value) + { + int64_t intpart; +@@ -629,6 +630,7 @@ + + return intpart; + } ++#endif + + static int32_t fmtfp(char *buffer, int32_t currlen, int32_t maxlen, + LDOUBLE fvalue, int min, int max, int flags) diff --git a/sysutils/bareos17-server/files/patch-src-plugins-filed_Makefile.in b/sysutils/bareos17-server/files/patch-src-plugins-filed_Makefile.in index 6318ac7a4268..b19155856db5 100644 --- a/sysutils/bareos17-server/files/patch-src-plugins-filed_Makefile.in +++ b/sysutils/bareos17-server/files/patch-src-plugins-filed_Makefile.in @@ -1,21 +1,29 @@ ---- src/plugins/filed/Makefile.in 2018-05-17 15:34:21.796332000 -0500 -+++ src/plugins/filed/Makefile.in 2018-05-17 15:35:50.843157000 -0500 +--- src/plugins/filed/Makefile.in 2020-07-09 12:30:11.000000000 -0500 ++++ src/plugins/filed/Makefile.in 2021-08-05 02:19:31.479394000 -0500 @@ -93,7 +93,8 @@ install: all $(MKDIR) $(DESTDIR)$(plugindir) - $(MKDIR) ${DESTDIR}${configtemplatedir}/bareos-dir.d/ + $(MKDIR) ${DESTDIR}${configtemplatedir}/bareos-dir.d/fileset + $(MKDIR) ${DESTDIR}${configtemplatedir}/bareos-dir.d/job $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir) $(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la if test "x$(BUILD_PLUGINS)" != "x" ; then \ -@@ -111,7 +112,7 @@ +@@ -104,14 +105,14 @@ + if [ -d "$$CONF" ]; then \ + for i in `find "$$CONF/" \( -name "*.conf" -o -name "*.conf.example" \) -print | cut -d'/' -f2-`; do \ + $(MKDIR) `dirname ${DESTDIR}${configtemplatedir}/$$i`; \ +- $(INSTALL_CONFIG) $$CONF/$$i ${DESTDIR}${configtemplatedir}/$$i; \ ++ $(INSTALL_CONFIG) $$CONF/$$i ${DESTDIR}${configtemplatedir}/`echo $$i | sed -e 's|example|sample|g'`; \ + done; \ + fi; \ + if [ "$$plugin" = "python-fd.la" ]; then \ $(CP) *.py *.py.template $(DESTDIR)$(plugindir); \ for i in `find python-ldap-conf.d/ \( -name "*.conf" -o -name "*.conf.example" \) -print | cut -d'/' -f2-`; do \ $(MKDIR) `dirname ${DESTDIR}${configtemplatedir}/$$i`; \ - $(INSTALL_CONFIG) python-ldap-conf.d/$$i ${DESTDIR}${configtemplatedir}/$$i; \ + $(INSTALL_CONFIG) python-ldap-conf.d/$$i ${DESTDIR}${confdir}/`echo $$i | sed -e 's|example|sample|g'`; \ done; \ fi; \ done;\ diff --git a/sysutils/bareos17-server/files/patch-src-tests_cats_test.c b/sysutils/bareos17-server/files/patch-src-tests_cats_test.c new file mode 100644 index 000000000000..8427f49f0661 --- /dev/null +++ b/sysutils/bareos17-server/files/patch-src-tests_cats_test.c @@ -0,0 +1,62 @@ +--- src/tests/cats_test.c 2020-07-09 12:30:11.000000000 -0500 ++++ src/tests/cats_test.c 2021-08-05 12:45:09.726640000 -0500 +@@ -388,11 +388,11 @@ + ok(db_sql_query(db, "SELECT VersionId FROM Version", + db_int_handler, &j), "SELECT VersionId"); + +- ok(UPDATE_DB(jcr, db, (char*)"UPDATE Version SET VersionId = 1"), ++ ok(UPDATE_DB(jcr, (char*)"UPDATE Version SET VersionId = 1"), + "Update VersionId"); + nok(check_tables_version(jcr, db), "Check table version"); + Mmsg(buf, "UPDATE Version SET VersionId = %d", j); +- ok(UPDATE_DB(jcr, db, buf), "Restore VersionId"); ++ ok(UPDATE_DB(jcr, db), "Restore VersionId"); + + if (dbtype != SQL_TYPE_SQLITE3) { + ok(db_check_max_connections(jcr, db, 1), "Test min Max Connexion"); +@@ -444,34 +444,34 @@ + ok(db_sql_query(db, buf, NULL, NULL), "CREATE query"); + + Mmsg(buf, "INSERT INTO %s (a) VALUES (1)", temp); +- ok(INSERT_DB(jcr, db, buf), "INSERT query"); +- ok(INSERT_DB(jcr, db, buf), "INSERT query"); ++ ok(INSERT_DB(jcr, buf), "INSERT query"); ++ ok(INSERT_DB(jcr, buf), "INSERT query"); + ok(sql_affected_rows(db) == 1, "Check sql_affected_rows"); + + Mmsg(buf, "INSERT INTO aaa%s (a) VALUES (1)", temp); +- nok(INSERT_DB(jcr, db, buf), "Bad INSERT query"); ++ nok(INSERT_DB(jcr, buf), "Bad INSERT query"); + ok(sql_affected_rows(db) == 0, "Check sql_affected_rows"); + + Mmsg(buf, "UPDATE %s SET a = 2", temp); +- ok(UPDATE_DB(jcr, db, buf), "UPDATE query"); ++ ok(UPDATE_DB(jcr, buf), "UPDATE query"); + ok(sql_affected_rows(db) == 2, "Check sql_affected_rows"); + + Mmsg(buf, "UPDATE %s SET a = 2 WHERE a = 1", temp); +- nok(UPDATE_DB(jcr, db, buf), "Empty UPDATE query"); ++ nok(UPDATE_DB(jcr, buf), "Empty UPDATE query"); + + Mmsg(buf, "UPDATE aaa%s SET a = 2", temp); +- nok(UPDATE_DB(jcr, db, buf), "Bad UPDATE query"); ++ nok(UPDATE_DB(jcr, buf), "Bad UPDATE query"); + + Mmsg(buf, "DELETE FROM %s", temp); +- ok(DELETE_DB(jcr, db, buf), "DELETE query"); +- nok(DELETE_DB(jcr, db, buf), "Empty DELETE query"); /* TODO bug ? */ ++ ok(DELETE_DB(jcr, buf), "DELETE query"); ++ nok(DELETE_DB(jcr, buf), "Empty DELETE query"); /* TODO bug ? */ + + Mmsg(buf, "DELETE FROM aaa%s", temp); +- ok(DELETE_DB(jcr, db, buf), "Bad DELETE query"); /* TODO bug ? */ ++ ok(DELETE_DB(jcr, buf), "Bad DELETE query"); /* TODO bug ? */ + + Mmsg(buf, "DROP TABLE %s", temp); +- ok(QUERY_DB(jcr, db, buf), "DROP query"); +- nok(QUERY_DB(jcr, db, buf), "Empty DROP query"); ++ ok(QUERY_DB(jcr, buf), "DROP query"); ++ nok(QUERY_DB(jcr, buf), "Empty DROP query"); + + /* ---------------------------------------------------------------- */ + diff --git a/sysutils/bareos17-server/pkg-plist.client b/sysutils/bareos17-server/pkg-plist.client index ea910a523b99..4aa7eb7d5575 100644 --- a/sysutils/bareos17-server/pkg-plist.client +++ b/sysutils/bareos17-server/pkg-plist.client @@ -1,54 +1,57 @@ -@sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample -@group bareos -@sample %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample -@group bareos -@sample %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample -@group bareos -@sample %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample -@group bareos -%%PYTHON%%@sample %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample -%%PYTHON%%@group bareos -%%PYTHON%%@sample %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample -%%PYTHON%%@group bareos -%%PYTHON%%@sample %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample -%%PYTHON%%@group bareos -@sample %%ETCDIR%%/bconsole.d/bconsole.conf.sample -@group wheel -%%LMDB%%@sample %%ETCDIR%%/plugin-python-ldap.conf.sample +@sample(,bareos,640) %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample +@sample(,bareos,640) %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample +@sample(,bareos,640) %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample +@sample(,bareos,640) %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample +%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-cephfs.conf.sample +%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-gfapi.conf.sample +%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-rados.conf.sample +%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCephfs.conf.sample +%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.conf.sample +%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupRados.conf.sample +%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreCephfs.conf.sample +%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreGFAPI.conf.sample +%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreRados.conf.sample +%%PYTHON%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample +%%PYTHON%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample +%%PYTHON%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample +@sample(,bareos,640) %%ETCDIR%%/bconsole.d/bconsole.conf.sample bin/bconsole %%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.py %%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py %%PYTHON%%lib/bareos/plugins/bareos-fd-ldap.py %%PYTHON%%lib/bareos/plugins/bareos-fd-local-fileset.py %%PYTHON%%lib/bareos/plugins/bareos-fd-mock-test.py %%PYTHON%%lib/bareos/plugins/bareos-fd.py.template %%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py lib/bareos/plugins/bpipe-fd.so +%%CEPHFS%%lib/bareos/plugins/cephfs-fd.so +%%GFAPI%%lib/bareos/plugins/gfapi-fd.so +%%RADOS%%lib/bareos/plugins/rados-fd.so %%PYTHON%%lib/bareos/plugins/python-fd.so lib/libbareos-%%LIB_VERSION%%.so lib/libbareos.la lib/libbareos.so lib/libbareoscfg-%%LIB_VERSION%%.so lib/libbareoscfg.la lib/libbareoscfg.so lib/libbareosfind-%%LIB_VERSION%%.so lib/libbareosfind.la lib/libbareosfind.so %%LMDB%%lib/libbareoslmdb-%%LIB_VERSION%%.so %%LMDB%%lib/libbareoslmdb.la %%LMDB%%lib/libbareoslmdb.so man/man1/bconsole.1.gz man/man8/bareos-fd.8.gz sbin/bareos-fd @group bareos sbin/bconsole @group wheel @dir(bareos,bareos,) %%BAREOS_DIR%% %%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/fileset %%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/job @dir lib/bareos/plugins @dir lib/bareos/scripts @dir(bareos,bareos,) /var/log/bareos @dir(bareos,bareos,) /var/run/bareos