Index: head/sysutils/bareos-client/Makefile =================================================================== --- head/sysutils/bareos-client/Makefile (revision 485487) +++ head/sysutils/bareos-client/Makefile (revision 485488) @@ -1,22 +1,21 @@ # $FreeBSD$ PORTNAME= bareos -PORTREVISION= 1 PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) BROKEN_aarch64= Fails to link: missing sbrk CONFLICTS= bareos16-client-* WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd PLIST= ${PKGDIR}/pkg-plist.client MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server OPTIONS_DEFINE= NLS PYTHON LMDB SCSICRYPTO LMDB_DESC= Enable build of LMDB support .include "${MASTERDIR}/Makefile" Index: head/sysutils/bareos-client-static/Makefile =================================================================== --- head/sysutils/bareos-client-static/Makefile (revision 485487) +++ head/sysutils/bareos-client-static/Makefile (revision 485488) @@ -1,30 +1,29 @@ # $FreeBSD$ PORTNAME= bareos -PORTREVISION= 1 PKGNAMESUFFIX= -client-static COMMENT= Backup archiving recovery open sourced (static client) CONFLICTS= bareos16-client-static-* PLIST= ${.CURDIR}/pkg-plist MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server PLIST_FILES= sbin/bareos-fd-static \ sbin/bconsole-static OPTIONS_DEFINE= NLS LMDB LMDB_DESC= Enable build of LMDB support CONFIGURE_ARGS+= --enable-client-only \ --enable-static-fd \ --enable-static-cons \ --disable-libtool \ --disable-build-dird \ --disable-build-stored \ --with-jansson=${LOCALBASE} BROKEN_aarch64= Fails to link: missing sbrk .include "${MASTERDIR}/Makefile" Index: head/sysutils/bareos-docs/distinfo =================================================================== --- head/sysutils/bareos-docs/distinfo (revision 485487) +++ head/sysutils/bareos-docs/distinfo (revision 485488) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526747394 -SHA256 (bareos-manual-main-reference.pdf) = 417d19e150a1f5f0852b3c98c96b9678b63493bd9a5d75c0895a3f072f4b314f -SIZE (bareos-manual-main-reference.pdf) = 4138277 +TIMESTAMP = 1542749547 +SHA256 (bareos-manual-main-reference.pdf) = 5e23682cae0fa2d3f8d5c6f67d2bc340f5a60b22c48e12b027554ca2df73902a +SIZE (bareos-manual-main-reference.pdf) = 3937438 Index: head/sysutils/bareos-server/Makefile =================================================================== --- head/sysutils/bareos-server/Makefile (revision 485487) +++ head/sysutils/bareos-server/Makefile (revision 485488) @@ -1,236 +1,235 @@ # $FreeBSD$ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 17.2.5 -PORTREVISION?= 1 +DISTVERSION= 17.2.7 +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-* bareos16-server-* LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson + +USES+= libtool:keepla pkgconfig readline:port 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} == "-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 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} == "-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/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 # -client and -server are defined .include Index: head/sysutils/bareos-server/distinfo =================================================================== --- head/sysutils/bareos-server/distinfo (revision 485487) +++ head/sysutils/bareos-server/distinfo (revision 485488) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524284411 -SHA256 (bareos-bareos-Release-17.2.5_GH0.tar.gz) = 720bcfbbb26d2e773088b3044b728b48fea2340b3fb0f622a0e07a88bec35bac -SIZE (bareos-bareos-Release-17.2.5_GH0.tar.gz) = 4181384 +TIMESTAMP = 1535610174 +SHA256 (bareos-bareos-Release-17.2.7_GH0.tar.gz) = 99a5f907e3422532c783ee254dcf5c737d2b1b53522c00924d3e1009289d2fd2 +SIZE (bareos-bareos-Release-17.2.7_GH0.tar.gz) = 4184028 Index: head/sysutils/bareos-server/files/bareos-dir.in =================================================================== --- head/sysutils/bareos-server/files/bareos-dir.in (revision 485487) +++ head/sysutils/bareos-server/files/bareos-dir.in (revision 485488) @@ -1,39 +1,57 @@ #!/bin/sh # # $FreeBSD: head/sysutils/bareos-server/files/bareos-dir.in 323275 2013-07-19 09:44:58Z rm $ # # PROVIDE: bareos_dir # REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%% # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # bareos_dir_enable (bool): Set to NO by default. # Set it to YES to enable bareos_dir. # bareos_dir_flags (params): Set params used to start bareos_dir. # bareos_dir_config (params): Path to the config file/directory # . /etc/rc.subr name="bareos_dir" rcvar=${name}_enable load_rc_config $name : ${bareos_dir_enable="NO"} : ${bareos_dir_flags="-u bareos -g bareos -v"} -: ${bareos_dir_config="%%PREFIX%%/etc/bareos/bareos-dir.conf"} +: ${bareos_dir_config="%%PREFIX%%/etc/bareos/"} : ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"} command=%%PREFIX%%/sbin/bareos-dir command_args="-c ${bareos_dir_config}" pidfile="${bareos_dir_pidfile}" +bconsole_command=/usr/local/bin/bconsole start_precmd="bareos_start_precmd" +restart_precmd="bareos_dir_configtest" +reload_precmd="bareos_dir_configtest" +reload_cmd="bareos_dir_reload" +configtest_cmd="bareos_dir_configtest" bareos_start_precmd() { [ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*} + bareos_dir_configtest } +bareos_dir_configtest() { + echo "Performing sanity check on ${bareos_dir_config} configuration:" + eval ${command} -t +} + +bareos_dir_reload() { + echo "Performing a graceful reload" + # bconsole always exits with 0, so we can't check the return status for success. + echo "reload" | ${bconsole_command} +} + +extra_commands="reload configtest" run_rc_command "$1" Index: head/sysutils/bareos-server/files/bareos-fd.in =================================================================== --- head/sysutils/bareos-server/files/bareos-fd.in (revision 485487) +++ head/sysutils/bareos-server/files/bareos-fd.in (revision 485488) @@ -1,48 +1,48 @@ #!/bin/sh # # $FreeBSD: head/sysutils/bacula5-server/files/bacula-fd.in 323275 2013-07-19 09:44:58Z rm $ # # PROVIDE: bareos_fd # REQUIRE: DAEMON # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # bareos_fd_enable (bool): Set to NO by default. # Set it to YES to enable bareos_fd. # bareos_fd_flags (params): Set params used to start bareos_fd. # bareos_fd_config (params): Path to the config file/directory # . /etc/rc.subr name="bareos_fd" rcvar=${name}_enable load_rc_config $name : ${bareos_fd_enable="NO"} : ${bareos_fd_flags="-u root -g wheel -v"} -: ${bareos_fd_config="%%PREFIX%%/etc/bareos/bareos-fd.conf"} +: ${bareos_fd_config="%%PREFIX%%/etc/bareos/"} : ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"} command=%%PREFIX%%/sbin/bareos-fd command_args="-c ${bareos_fd_config}" pidfile="${bareos_fd_pidfile}" start_precmd="bareos_start_precmd" bareos_start_precmd() { [ -d "${pidfile%/*}" ] || { getent passwd bareos > /dev/null 2&>1 if [ $? -eq 0] ; then # user bareos exists install -d -o bareos -g bareos ${pidfile%/*} else # bareos_fd as solitair service install -d -o root -g wheel ${pidfile%/*} fi } } run_rc_command "$1" Index: head/sysutils/bareos-server/files/bareos-sd.in =================================================================== --- head/sysutils/bareos-server/files/bareos-sd.in (revision 485487) +++ head/sysutils/bareos-server/files/bareos-sd.in (revision 485488) @@ -1,39 +1,39 @@ #!/bin/sh # # $FreeBSD: head/sysutils/bacula5-server/files/bacula-sd.in 323486 2013-07-22 17:51:39Z rm $ # # PROVIDE: bareos_sd # REQUIRE: DAEMON # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # bareos_sd_enable (bool): Set to NO by default. # Set it to YES to enable bareos_sd. # bareos_sd_flags (params): Set params used to start bareos_sd. # bareos_sd_config (params): Path to the config file/directory # . /etc/rc.subr name="bareos_sd" rcvar=${name}_enable load_rc_config $name : ${bareos_sd_enable="NO"} : ${bareos_sd_flags="-u bareos -g bareos -v"} -: ${bareos_sd_config="%%PREFIX%%/etc/bareos/bareos-sd.conf"} +: ${bareos_sd_config="%%PREFIX%%/etc/bareos/"} : ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"} command=%%PREFIX%%/sbin/bareos-sd command_args="-c ${bareos_sd_config}" pidfile="${bareos_sd_pidfile}" start_precmd="bareos_start_precmd" bareos_start_precmd() { [ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*} } run_rc_command "$1" Index: head/sysutils/bareos-traymonitor/Makefile =================================================================== --- head/sysutils/bareos-traymonitor/Makefile (revision 485487) +++ head/sysutils/bareos-traymonitor/Makefile (revision 485488) @@ -1,32 +1,31 @@ # $FreeBSD$ PORTNAME= bareos PKGNAMESUFFIX= -traymonitor -PORTREVISION= 1 COMMENT= Backup archiving recovery open sourced (traymonitor) LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt5 \ libbareos.so:sysutils/bareos-client CONFLICTS= bacula*-bat-* bareos16-traymonitor-* USES= pkgconfig gettext-runtime desktop-file-utils qt:4 USE_QT= qmake_build uic_build moc_build rcc_build gui corelib WITH_BAT= yes PLIST= ${.CURDIR}/pkg-plist MAKE_ENV+= MAKEOBJDIRPREFIX=/ MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server CONFIGURE_ARGS+= --enable-traymonitor=yes \ --with-qwt=${LOCALBASE}/lib \ --disable-build-dird \ --disable-build-stored \ --enable-client-only \ --with-jansson=${LOCALBASE} \ --enable-nls=yes .include "${MASTERDIR}/Makefile"