Index: head/sysutils/bareos-docs/Makefile =================================================================== --- head/sysutils/bareos-docs/Makefile (revision 470268) +++ head/sysutils/bareos-docs/Makefile (revision 470269) @@ -1,26 +1,26 @@ # Created by: Alonso CArdenas # $FreeBSD$ PORTNAME= bareos -PORTVERSION= 16.2.7 +PORTVERSION= 17.2.5 CATEGORIES= sysutils MASTER_SITES= http://doc.bareos.org/master/ PKGNAMESUFFIX= -docs DISTFILES= ${PORTNAME}-manual-main-reference.pdf MAINTAINER= acm@FreeBSD.org COMMENT= Bareos document set (PDF) NO_BUILD= yes PORTDOCS= *.pdf do-extract: ${MKDIR} ${WRKSRC} ${CP} ${DISTDIR}/${PORTNAME}-manual-main-reference.pdf ${WRKSRC} do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-manual-main-reference.pdf ${STAGEDIR}${DOCSDIR} .include Index: head/sysutils/bareos-docs/distinfo =================================================================== --- head/sysutils/bareos-docs/distinfo (revision 470268) +++ head/sysutils/bareos-docs/distinfo (revision 470269) @@ -1,3 +1,3 @@ -TIMESTAMP = 1513195441 -SHA256 (bareos-manual-main-reference.pdf) = f45ef4f6b947fd8c3cbdfa57b462eca06e49c893d726d1db08181435cdb58f4b -SIZE (bareos-manual-main-reference.pdf) = 4130751 +TIMESTAMP = 1526608869 +SHA256 (bareos-manual-main-reference.pdf) = 33afe5ee05ae50585535f841266034e9028f4a75c7f8152a48b7b154e129dd46 +SIZE (bareos-manual-main-reference.pdf) = 4138520 Index: head/sysutils/bareos-server/Makefile =================================================================== --- head/sysutils/bareos-server/Makefile (revision 470268) +++ head/sysutils/bareos-server/Makefile (revision 470269) @@ -1,228 +1,229 @@ # Created by: Alonso Cardenas # $FreeBSD$ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 16.2.7 +DISTVERSION= 17.2.5 PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server MAINTAINER= acm@FreeBSD.org COMMENT?= Backup archiving recovery open sourced (server) LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi USE_GITHUB= yes USES+= libtool:keepla pkgconfig readline:port shebangfix CONFLICTS?= bacula*-server-* LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson 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_DEFINE?= MTX PYTHON NDMP NLS OPENSSL SCSICRYPTO OPTIONS_DEFAULT?= OPENSSL PGSQL SCSICRYPTO OPTIONS_SUB= yes 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} == "-server" OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL OPTIONS_SINGLE= DATABASE DATABASE_DESC= Database support NDMP_CONFIGURE_ON= --enable-ndmp=yes NDMP_CONFIGURE_OFF= --enable-ndmp=no .endif 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} == "-client" || ${PKGNAMESUFFIX} == "-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/bareos-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 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 # 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_USE= MYSQL=yes 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 .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/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 .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 # -client and -server are defined .include Index: head/sysutils/bareos-server/Makefile.common =================================================================== --- head/sysutils/bareos-server/Makefile.common (revision 470268) +++ head/sysutils/bareos-server/Makefile.common (revision 470269) @@ -1,49 +1,39 @@ # Created by: Alonso Cardenas # $FreeBSD$ post-patch: @${REINPLACE_CMD} -e 's|_NONSHARED||g' ${WRKSRC}/src/filed/Makefile.in @${REINPLACE_CMD} -e 's|-lbareoscfg|@JANSSON_LIBS@ @LIBINTL@ -lbareoscfg|g' ${WRKSRC}/src/qt-tray-monitor/tray-monitor.pro.in post-build: .if ${PKGNAMEPREFIX} == "nagios-check_" ${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bareos .endif pre-install: .if ${PKGNAMESUFFIX} == "-traymonitor" . for d in client director monitor storage ${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d} ${FIND} ${WRKSRC}/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \; . endfor .endif do-install: -.if ${PKGNAMESUFFIX} == "-bat" -# Install config files and preserve existing ones - ${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bareos/bat.conf.sample - ${INSTALL_MAN} ${WRKSRC}/manpages/bat.1 ${STAGEDIR}${PREFIX}/man/man1/ - ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/src/images/bat.png ${STAGEDIR}${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/src/images/bat.svg ${STAGEDIR}${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/src/qt-console/bat.desktop ${STAGEDIR}${DESKTOPDIR} -.endif .if ${PKGNAMEPREFIX} == "nagios-check_" @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios ${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bareos/check_bareos \ ${STAGEDIR}${PREFIX}/libexec/nagios .endif .if ${PKGNAMESUFFIX} == "-client-static" ${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bareos-fd ${STAGEDIR}${PREFIX}/sbin/bareos-fd-static ${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static .endif .if ${PKGNAMESUFFIX} == "-traymonitor" # Install config files and preserve existing ones .for d in client director monitor storage ${INSTALL_SCRIPT} ${WRKSRC}/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/ .endfor ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor.xpm ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor.desktop ${STAGEDIR}${DESKTOPDIR} .endif Index: head/sysutils/bareos-server/distinfo =================================================================== --- head/sysutils/bareos-server/distinfo (revision 470268) +++ head/sysutils/bareos-server/distinfo (revision 470269) @@ -1,3 +1,3 @@ -TIMESTAMP = 1510775285 -SHA256 (bareos-bareos-Release-16.2.7_GH0.tar.gz) = 0b8dbe2e17b3eda470c30d4fe6af92e6f7b668fd1cfc1b045becdc8c8b6a767f -SIZE (bareos-bareos-Release-16.2.7_GH0.tar.gz) = 4282998 +TIMESTAMP = 1524284411 +SHA256 (bareos-bareos-Release-17.2.5_GH0.tar.gz) = 720bcfbbb26d2e773088b3044b728b48fea2340b3fb0f622a0e07a88bec35bac +SIZE (bareos-bareos-Release-17.2.5_GH0.tar.gz) = 4181384 Index: head/sysutils/bareos-server/files/patch-src-qt-console-bat.pro.in =================================================================== --- head/sysutils/bareos-server/files/patch-src-qt-console-bat.pro.in (revision 470268) +++ head/sysutils/bareos-server/files/patch-src-qt-console-bat.pro.in (nonexistent) @@ -1,11 +0,0 @@ ---- src/qt-console/bat.pro.in 2015-07-25 17:11:07.807100000 -0500 -+++ src/qt-console/bat.pro.in 2015-07-25 17:11:57.110388000 -0500 -@@ -32,7 +32,7 @@ - DEPENDPATH += . - INCLUDEPATH += .. ../include . - QMAKE_LIBDIR += ../lib --LIBS += -lbareoscfg -lbareos -+LIBS += -lbareoscfg -lbareos -lintl - LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link - LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install - QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) Property changes on: head/sysutils/bareos-server/files/patch-src-qt-console-bat.pro.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in =================================================================== --- head/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in (revision 470268) +++ head/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in (revision 470269) @@ -1,21 +1,21 @@ ---- src/plugins/filed/Makefile.in 2017-03-12 19:49:48.441405000 -0500 -+++ src/plugins/filed/Makefile.in 2017-03-12 19:51:04.400881000 -0500 +--- 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 @@ -93,7 +93,8 @@ install: all $(MKDIR) $(DESTDIR)$(plugindir) -- $(MKDIR) ${DESTDIR}${confdir}/bareos-dir.d/ -+ $(MKDIR) ${DESTDIR}${confdir}/bareos-dir.d/fileset -+ $(MKDIR) ${DESTDIR}${confdir}/bareos-dir.d/job +- $(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 - for plugin in $(BUILD_PLUGINS); do \ -@@ -110,7 +111,7 @@ + if test "x$(BUILD_PLUGINS)" != "x" ; then \ +@@ -111,7 +112,7 @@ $(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}${confdir}/$$i`; \ -- $(INSTALL_CONFIG) python-ldap-conf.d/$$i ${DESTDIR}${confdir}/$$i; \ + $(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 + done;\ Index: head/sysutils/bareos-server/pkg-plist =================================================================== --- head/sysutils/bareos-server/pkg-plist (revision 470268) +++ head/sysutils/bareos-server/pkg-plist (revision 470269) @@ -1,156 +1,165 @@ @sample(,bareos,640) %%ETCDIR%%/bareos-barcodes.sample %%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample +@sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/catalog/MyCatalog.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/client/bareos-fd.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/console/bareos-mon.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/director/bareos-dir.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/Catalog.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/LinuxAll.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/SelfTest.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/WindowsAllDrives.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/jobdefs/DefaultJob.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Standard.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Differential.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Full.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Incremental.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Scratch.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/operator.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycle.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/File.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-dir.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-mon.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/messages/Standard.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/storage/bareos-sd.conf.sample bin/bregex bin/bsmtp bin/bwild +bin/timelimit +lib/bareos/plugins/BareosDirPluginBaseclass.py +lib/bareos/plugins/BareosDirWrapper.py lib/bareos/plugins/BareosSdPluginBaseclass.py lib/bareos/plugins/BareosSdWrapper.py -lib/bareos/plugins/bareos-sd-class-plugin.py -lib/bareos/plugins/bareos_sd_consts.py -lib/bareos/plugins/bareos-sd.py.template -%%PYTHON%%lib/bareos/plugins/python-sd.so lib/bareos/plugins/autoxflate-sd.so -lib/bareos/plugins/BareosDirPluginBaseclass.py -lib/bareos/plugins/BareosDirWrapper.py lib/bareos/plugins/bareos-dir-class-plugin.py -lib/bareos/plugins/bareos_dir_consts.py lib/bareos/plugins/bareos-dir.py.template +lib/bareos/plugins/bareos-sd-class-plugin.py +lib/bareos/plugins/bareos-sd.py.template +lib/bareos/plugins/bareos_dir_consts.py +lib/bareos/plugins/bareos_sd_consts.py %%PYTHON%%lib/bareos/plugins/python-dir.so +%%PYTHON%%lib/bareos/plugins/python-sd.so %%SCSICRYPTO%%lib/bareos/plugins/scsicrypto-sd.so %%SCSICRYPTO%%lib/bareos/plugins/scsitapealert-sd.so -lib/bareos/scripts/bconsole lib/bareos/scripts/bareos -lib/bareos/scripts/bareos_config -lib/bareos/scripts/bareos-ctl-funcs +lib/bareos/scripts/bareos-config +lib/bareos/scripts/bareos-config-lib.sh lib/bareos/scripts/bareos-ctl-dir lib/bareos/scripts/bareos-ctl-fd +lib/bareos/scripts/bareos-ctl-funcs lib/bareos/scripts/bareos-ctl-sd -lib/bareos/scripts/mtx-changer -lib/bareos/scripts/disk-changer -lib/bareos/scripts/btraceback.gdb -lib/bareos/scripts/btraceback.dbx -lib/bareos/scripts/btraceback.mdb -lib/bareos/scripts/bareos-config -lib/bareos/scripts/bareos-config-lib.sh lib/bareos/scripts/bareos-explorer lib/bareos/scripts/bareos-glusterfind-wrapper +lib/bareos/scripts/bareos_config +lib/bareos/scripts/btraceback.dbx +lib/bareos/scripts/btraceback.gdb +lib/bareos/scripts/btraceback.mdb lib/bareos/scripts/create_bareos_database -lib/bareos/scripts/update_bareos_tables -lib/bareos/scripts/make_bareos_tables -lib/bareos/scripts/grant_bareos_privileges -lib/bareos/scripts/drop_bareos_tables -lib/bareos/scripts/drop_bareos_database -lib/bareos/scripts/ddl/versions.map lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql %%MYSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql %%PGSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql %%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql %%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql %%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql %%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql +lib/bareos/scripts/ddl/grants/%%DBTYPE%%-change_owner.dbconfig-template.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.10_11.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.11_12.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.12_14.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.14_2001.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2001_2002.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2002_2003.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2003_2004.sql -lib/bareos/scripts/make_catalog_backup.pl -lib/bareos/scripts/make_catalog_backup +lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2004_2171.sql +lib/bareos/scripts/ddl/updates/%%DBTYPE%%.bee.1017_2004.sql +lib/bareos/scripts/ddl/versions.map lib/bareos/scripts/delete_catalog_backup +lib/bareos/scripts/disk-changer +lib/bareos/scripts/drop_bareos_database +lib/bareos/scripts/drop_bareos_tables +lib/bareos/scripts/grant_bareos_privileges +lib/bareos/scripts/make_bareos_tables +lib/bareos/scripts/make_catalog_backup +lib/bareos/scripts/make_catalog_backup.pl +lib/bareos/scripts/mtx-changer lib/bareos/scripts/query.sql -%%NDMP%%lib/libbareosndmp-%%LIB_VERSION%%.so -%%NDMP%%lib/libbareosndmp.la -%%NDMP%%lib/libbareosndmp.so +lib/bareos/scripts/update_bareos_tables +lib/libbareoscats-%%LIB_VERSION%%.so lib/libbareoscats-%%DBTYPE%%-%%LIB_VERSION%%.so lib/libbareoscats-%%DBTYPE%%.so -lib/libbareoscats-%%LIB_VERSION%%.so lib/libbareoscats.la lib/libbareoscats.so +%%NDMP%%lib/libbareosndmp-%%LIB_VERSION%%.so +%%NDMP%%lib/libbareosndmp.la +%%NDMP%%lib/libbareosndmp.so lib/libbareossd-%%LIB_VERSION%%.so lib/libbareossd.la lib/libbareossd.so lib/libbareossql-%%LIB_VERSION%%.so lib/libbareossql.la lib/libbareossql.so man/man1/bareos-tray-monitor.1.gz man/man1/bregex.1.gz man/man1/bsmtp.1.gz man/man1/bwild.1.gz man/man8/bareos-dbcheck.8.gz man/man8/bareos-dir.8.gz man/man8/bareos-sd.8.gz man/man8/bareos.8.gz man/man8/bcopy.8.gz man/man8/bextract.8.gz man/man8/bls.8.gz man/man8/bscan.8.gz man/man8/btape.8.gz man/man8/btraceback.8.gz sbin/bareos sbin/bareos-dbcheck sbin/bareos-dir sbin/bareos-sd +sbin/bbatch sbin/bcopy sbin/bextract sbin/bls sbin/bpluginfo sbin/bregex +sbin/bregtest sbin/bscan sbin/bscrypto sbin/bsmtp sbin/btape sbin/btraceback sbin/bwild sbin/chio-bareos +sbin/grow +sbin/testls +sbin/timelimit @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/catalog @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/client @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/console @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/counter @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/director @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/fileset @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/job @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/jobdefs @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/messages @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/pool @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/profile @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/schedule @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/storage @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/autochanger @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/device @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/director @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/messages @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/ndmp @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/storage @dir(bareos,bareos,) %%BAREOS_DIR%% @dir(bareos,bareos,) /var/log/bareos @dir(bareos,bareos,) /var/run/bareos Index: head/sysutils/bareos-server/pkg-plist.client =================================================================== --- head/sysutils/bareos-server/pkg-plist.client (revision 470268) +++ head/sysutils/bareos-server/pkg-plist.client (revision 470269) @@ -1,54 +1,54 @@ @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 -lib/libbareos.la -lib/libbareos.so -lib/libbareos-%%LIB_VERSION%%.so -lib/libbareoscfg.la -lib/libbareoscfg.so -lib/libbareoscfg-%%LIB_VERSION%%.so -lib/libbareosfind.la -lib/libbareosfind.so -lib/libbareosfind-%%LIB_VERSION%%.so -%%LMDB%%lib/libbareoslmdb.la -%%LMDB%%lib/libbareoslmdb.so -%%LMDB%%lib/libbareoslmdb-%%LIB_VERSION%%.so +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-ldap.py -%%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py %%PYTHON%%lib/bareos/plugins/bareos-fd.py.template +%%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py lib/bareos/plugins/bpipe-fd.so %%PYTHON%%lib/bareos/plugins/python-fd.so -man/man8/bareos-fd.8.gz +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 -bin/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