Date: Wed, 16 Nov 2016 07:11:55 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426215 - in head/sysutils: bareos-bat bareos-client bareos-client-static bareos-docs bareos-server bareos-server/files Message-ID: <201611160711.uAG7Bt7Y004349@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Wed Nov 16 07:11:54 2016 New Revision: 426215 URL: https://svnweb.freebsd.org/changeset/ports/426215 Log: - Update to 16.2.4 - Add SCSICRYPTO option (2) - Fix /var/run/bareos ownership (1) - Add support for bareos-traymonitor PR: 210177(1) 213834(2) Added: head/sysutils/bareos-server/files/patch-autoconf_Make.common.in (contents, props changed) head/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in (contents, props changed) head/sysutils/bareos-server/files/patch-src-stored_Makefile.in (contents, props changed) head/sysutils/bareos-server/files/patch-src-tools_Makefile.in (contents, props changed) Deleted: head/sysutils/bareos-server/files/patch-src-stored-ndmp_tape.c Modified: head/sysutils/bareos-bat/Makefile head/sysutils/bareos-bat/pkg-plist head/sysutils/bareos-client-static/Makefile head/sysutils/bareos-client/Makefile head/sysutils/bareos-docs/Makefile head/sysutils/bareos-docs/distinfo head/sysutils/bareos-server/Makefile head/sysutils/bareos-server/Makefile.common head/sysutils/bareos-server/distinfo head/sysutils/bareos-server/files/bareos-dir.in head/sysutils/bareos-server/files/bareos-fd.in head/sysutils/bareos-server/files/bareos-sd.in head/sysutils/bareos-server/files/patch-src-console-Makefile.in head/sysutils/bareos-server/files/patch-src-dird-Makefile.in head/sysutils/bareos-server/files/patch-src-filed-Makefile.in head/sysutils/bareos-server/files/pkg-message.client.in head/sysutils/bareos-server/files/pkg-message.server.in head/sysutils/bareos-server/pkg-plist head/sysutils/bareos-server/pkg-plist.client Modified: head/sysutils/bareos-bat/Makefile ============================================================================== --- head/sysutils/bareos-bat/Makefile Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-bat/Makefile Wed Nov 16 07:11:54 2016 (r426215) @@ -12,7 +12,7 @@ LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt CONFLICTS= bacula*-bat-* -USES= pkgconfig +USES= pkgconfig desktop-file-utils USE_QT4= qmake_build uic_build moc_build rcc_build WITH_BAT= yes Modified: head/sysutils/bareos-bat/pkg-plist ============================================================================== --- head/sysutils/bareos-bat/pkg-plist Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-bat/pkg-plist Wed Nov 16 07:11:54 2016 (r426215) @@ -1,3 +1,6 @@ @sample %%ETCDIR%%/bat.conf.sample +share/applications/bat.desktop +share/pixmaps/bat.png +share/pixmaps/bat.svg man/man1/bat.1.gz -sbin/bat +bin/bat Modified: head/sysutils/bareos-client-static/Makefile ============================================================================== --- head/sysutils/bareos-client-static/Makefile Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-client-static/Makefile Wed Nov 16 07:11:54 2016 (r426215) @@ -25,6 +25,6 @@ CONFIGURE_ARGS+= --enable-client-only \ --disable-build-stored \ --with-jansson=${LOCALBASE} -BROKEN_aarch64= Fails to link: missing sbrk +BROKEN_aarch64= Fails to link: missing sbrk .include "${MASTERDIR}/Makefile" Modified: head/sysutils/bareos-client/Makefile ============================================================================== --- head/sysutils/bareos-client/Makefile Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-client/Makefile Wed Nov 16 07:11:54 2016 (r426215) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bareos -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) @@ -15,7 +15,7 @@ USE_RC_SUBR= bareos-fd PLIST= ${PKGDIR}/pkg-plist.client MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server -OPTIONS_DEFINE= NLS PYTHON LMDB +OPTIONS_DEFINE= NLS PYTHON LMDB SCSICRYPTO OPTIONS_DEFAULT=# LMDB_DESC= Enable build of LMDB support Modified: head/sysutils/bareos-docs/Makefile ============================================================================== --- head/sysutils/bareos-docs/Makefile Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-docs/Makefile Wed Nov 16 07:11:54 2016 (r426215) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= bareos -PORTVERSION= 15.2.2 -PORTREVISION= 1 +PORTVERSION= 16.2.4 +PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= http://doc.bareos.org/master/ PKGNAMESUFFIX= -docs Modified: head/sysutils/bareos-docs/distinfo ============================================================================== --- head/sysutils/bareos-docs/distinfo Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-docs/distinfo Wed Nov 16 07:11:54 2016 (r426215) @@ -1,2 +1,3 @@ -SHA256 (bareos-manual-main-reference.pdf) = 0bc6e3a5e66433f4550fb40aeb623d9607430909a7b851fd3ce361b44a492868 -SIZE (bareos-manual-main-reference.pdf) = 3093238 +TIMESTAMP = 1478549221 +SHA256 (bareos-manual-main-reference.pdf) = 05e0dfa5b9f56c97a57e0a56ead213c46ce97fe7d48ef382759ebe6550325380 +SIZE (bareos-manual-main-reference.pdf) = 3946128 Modified: head/sysutils/bareos-server/Makefile ============================================================================== --- head/sysutils/bareos-server/Makefile Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-server/Makefile Wed Nov 16 07:11:54 2016 (r426215) @@ -3,8 +3,8 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 15.2.2 -PORTREVISION?= 3 +DISTVERSION= 16.2.4 +#PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server @@ -12,6 +12,9 @@ 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 @@ -32,29 +35,34 @@ USE_LDCONFIG= yes CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE?= MTX PYTHON NDMP NLS OPENSSL -OPTIONS_DEFAULT?= NLS OPENSSL PGSQL +OPTIONS_DEFINE?= MTX PYTHON NDMP NLS OPENSSL SCSICRYPTO +OPTIONS_DEFAULT?= NLS 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 +NDMP_CONFIGURE_ON= --enable-ndmp=yes +NDMP_CONFIGURE_OFF= --enable-ndmp=no .endif -OPENSSL_USE= OPENSSL=yes +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 @@ -173,36 +181,43 @@ 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|./bconsole.conf|${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c @${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 - @${REINPLACE_CMD} -e 's|bareos-dir.d/||g' ${WRKSRC}/src/plugins/filed/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 + @${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) - ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample - ${MV} ${STAGEDIR}${ETCDIR}/plugin-python-ldap.conf ${STAGEDIR}${ETCDIR}/plugin-python-ldap.conf.sample + ${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 .endif - for na in ${CONFFILES}; do \ - ${MV} ${STAGEDIR}${ETCDIR}/bareos-$$na.conf ${STAGEDIR}${ETCDIR}/bareos-$$na.conf.sample; \ - done @${MKDIR} ${STAGEDIR}/var/run/bareos .endif .else Modified: head/sysutils/bareos-server/Makefile.common ============================================================================== --- head/sysutils/bareos-server/Makefile.common Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-server/Makefile.common Wed Nov 16 07:11:54 2016 (r426215) @@ -3,19 +3,31 @@ 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}/sbin + ${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 @@ -26,3 +38,12 @@ do-install: ${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 Modified: head/sysutils/bareos-server/distinfo ============================================================================== --- head/sysutils/bareos-server/distinfo Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-server/distinfo Wed Nov 16 07:11:54 2016 (r426215) @@ -1,3 +1,3 @@ -TIMESTAMP = 1464783943 -SHA256 (bareos-bareos-Release-15.2.2_GH0.tar.gz) = f314e7d3e99e92b4261af97888ddcdaaedf513b638745b07270db3e6930e9008 -SIZE (bareos-bareos-Release-15.2.2_GH0.tar.gz) = 3928036 +TIMESTAMP = 1478549080 +SHA256 (bareos-bareos-Release-16.2.4_GH0.tar.gz) = 9a96d9220150f1db643c932ac529b1e3ad179978ef6b06a2504c06db43b4ff3c +SIZE (bareos-bareos-Release-16.2.4_GH0.tar.gz) = 4275141 Modified: head/sysutils/bareos-server/files/bareos-dir.in ============================================================================== --- head/sysutils/bareos-server/files/bareos-dir.in Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-server/files/bareos-dir.in Wed Nov 16 07:11:54 2016 (r426215) @@ -12,20 +12,31 @@ # 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 -command=%%PREFIX%%/sbin/bareos-dir load_rc_config $name : ${bareos_dir_enable="NO"} -: ${bareos_dir_flags=" -u bareos -g bareos -v -c %%PREFIX%%/etc/bareos/bareos-dir.conf"} +: ${bareos_dir_flags="-u bareos -g bareos -v"} +: ${bareos_dir_config="%%PREFIX%%/etc/bareos/bareos-dir.d"} : ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"} +command=%%PREFIX%%/sbin/bareos-dir +command_args="-c ${bareos_dir_config}" +start_precmd="bareos_dir_testconfig" +restart_precmd="bareos_dir_testconfig" pidfile="${bareos_dir_pidfile}" +bareos_dir_testconfig() +{ + echo Performing sanity check on bareos-dir configuration: + eval ${command} ${bareos_dir_flags} -t +} + run_rc_command "$1" Modified: head/sysutils/bareos-server/files/bareos-fd.in ============================================================================== --- head/sysutils/bareos-server/files/bareos-fd.in Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-server/files/bareos-fd.in Wed Nov 16 07:11:54 2016 (r426215) @@ -12,20 +12,23 @@ # 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 -command=%%PREFIX%%/sbin/bareos-fd load_rc_config $name : ${bareos_fd_enable="NO"} -: ${bareos_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bareos/bareos-fd.conf"} +: ${bareos_fd_flags="-u root -g wheel -v"} +: ${bareos_fd_config="%%PREFIX%%/etc/bareos/bareos-fd.d"} : ${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}" run_rc_command "$1" Modified: head/sysutils/bareos-server/files/bareos-sd.in ============================================================================== --- head/sysutils/bareos-server/files/bareos-sd.in Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-server/files/bareos-sd.in Wed Nov 16 07:11:54 2016 (r426215) @@ -12,20 +12,23 @@ # 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 -command=%%PREFIX%%/sbin/bareos-sd load_rc_config $name : ${bareos_sd_enable="NO"} -: ${bareos_sd_flags=" -u bareos -g bareos -v -c %%PREFIX%%/etc/bareos/bareos-sd.conf"} +: ${bareos_sd_flags="-u bareos -g bareos -v"} +: ${bareos_sd_config="%%PREFIX%%/etc/bareos/bareos-sd.d"} : ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"} +command=%%PREFIX%%/sbin/bareos-sd +command_args="-c ${bareos_sd_config}" pidfile="${bacula_sd_pidfile}" run_rc_command "$1" Added: head/sysutils/bareos-server/files/patch-autoconf_Make.common.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/bareos-server/files/patch-autoconf_Make.common.in Wed Nov 16 07:11:54 2016 (r426215) @@ -0,0 +1,13 @@ +--- autoconf/Make.common.in 2016-11-09 23:17:41.055746000 -0500 ++++ autoconf/Make.common.in 2016-11-09 23:17:59.647897000 -0500 +@@ -62,8 +62,8 @@ + MKDIR = @BUILD_DIR@/autoconf/mkinstalldirs + INSTALL = @INSTALL@ + # add the -s to the following in PRODUCTION mode +-INSTALL_PROGRAM = $(INSTALL) -m @SBINPERM@ +-INSTALL_LIB = $(INSTALL) -m 755 ++INSTALL_PROGRAM = $(INSTALL) -s -m @SBINPERM@ ++INSTALL_LIB = $(INSTALL) -s -m 755 + INSTALL_DATA = $(INSTALL) -m 644 + INSTALL_SCRIPT = $(INSTALL) -m @SBINPERM@ + INSTALL_CONFIG = $(INSTALL) -m 640 Modified: head/sysutils/bareos-server/files/patch-src-console-Makefile.in ============================================================================== --- head/sysutils/bareos-server/files/patch-src-console-Makefile.in Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-server/files/patch-src-console-Makefile.in Wed Nov 16 07:11:54 2016 (r426215) @@ -1,25 +1,35 @@ ---- src/console/Makefile.in 2015-12-03 03:22:54.000000000 -0500 -+++ src/console/Makefile.in 2016-02-01 18:21:25.511282000 -0500 -@@ -29,6 +29,7 @@ - CONS_LDFLAGS = @CONS_LDFLAGS@ +--- src/console/Makefile.in 2016-10-16 10:14:36.000000000 -0500 ++++ src/console/Makefile.in 2016-11-16 01:14:33.054997000 -0500 +@@ -28,6 +28,7 @@ + CONS_LIBS = @CONS_LIBS@ JANSSON_CPPFLAGS = @JANSSON_INC@ +JANSSON_LDFLAGS = @JANSSON_LIBS@ INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include -@@ -52,12 +53,12 @@ +@@ -51,12 +52,12 @@ bconsole: Makefile $(CONSOBJS) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ - $(DLIB) $(CONS_LIBS) -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \ + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ + $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_LIBS) \ - $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) + $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS) static-bconsole: Makefile $(CONSOBJS) ../lib/libbareos.a ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) - $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ - $(DLIB) $(CONS_LIBS) -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \ + $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ +- $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_LIBS) \ - $(OPENSSL_LIBS) $(GNUTLS_LIBS) ++ $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_STATIC_LIBS) \ + $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS) strip $@ +@@ -93,7 +94,7 @@ + $(MKDIR) $(DESTDIR)$(bindir) + $(MKDIR) $(DESTDIR)$(sbindir) + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(bindir)/bconsole; +- @if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) $(bindir)/bconsole $(DESTDIR)$(sbindir)/bconsole; fi ++ @if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) ../bin/bconsole $(DESTDIR)$(sbindir)/bconsole; fi + @srcconf=bconsole.conf; \ + if test -f ${DESTDIR}${confdir}/$$srcconf; then \ + destconf=$$srcconf.new; \ Modified: head/sysutils/bareos-server/files/patch-src-dird-Makefile.in ============================================================================== --- head/sysutils/bareos-server/files/patch-src-dird-Makefile.in Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-server/files/patch-src-dird-Makefile.in Wed Nov 16 07:11:54 2016 (r426215) @@ -1,23 +1,23 @@ ---- src/dird/Makefile.in 2015-12-03 03:22:54.000000000 -0500 -+++ src/dird/Makefile.in 2016-01-29 23:53:16.549306000 -0500 -@@ -50,6 +50,7 @@ - INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include +--- src/dird/Makefile.in 2016-10-16 10:14:36.000000000 -0500 ++++ src/dird/Makefile.in 2016-11-09 15:47:36.135752000 -0500 +@@ -52,6 +52,7 @@ + INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include -I$(basedir)/lmdb -I$(basedir)/ndmp JANSSON_CPPFLAGS = @JANSSON_INC@ +JANSSON_LDFLAGS = @JANSSON_LIBS@ - .SUFFIXES: .c .o - .PHONY: -@@ -79,7 +80,7 @@ + DIRD_RESTYPES = catalog client console counter director fileset job jobdefs messages pool profile schedule storage + +@@ -83,7 +84,7 @@ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ $(NDMP_LIBS) -lbareosfind -lbareossql -lbareoscats -lbareoscfg -lbareos -lm $(DLIB) \ $(DB_LIBS) $(LIBS) $(WRAPLIBS) $(GETTEXT_LIBS) $(CAP_LIBS) \ -- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS) +- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(LMDB_LIBS) ++ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(LMDB_LIBS) $(JANSSON_LDFLAGS) bareos-dbcheck: Makefile $(DBCHKOBJS) \ ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ -@@ -90,7 +91,7 @@ +@@ -94,7 +95,7 @@ @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(DBCHKOBJS) \ -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \ @@ -26,7 +26,7 @@ testfind: Makefile $(TSTFNDOBJS) \ ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ -@@ -101,7 +102,7 @@ +@@ -105,7 +106,7 @@ @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(TSTFNDOBJS) \ -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \ @@ -35,11 +35,26 @@ static-bareos-dir: Makefile $(SVROBJS) \ ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ -@@ -142,7 +143,6 @@ - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bareos-dir $(DESTDIR)$(sbindir)/bareos-dir - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bareos-dbcheck $(DESTDIR)$(sbindir)/bareos-dbcheck - @srcconf=bareos-dir.conf; \ -- $(MKDIR) ${DESTDIR}${confdir}/bareos-dir.d/; \ - if test -f ${DESTDIR}${confdir}/$$srcconf; then \ - destconf=$$srcconf.new; \ - echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ +@@ -160,8 +161,8 @@ + destconf="$$RESDIR/$$RES.new"; \ + echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \ + else \ +- destconf="$$RESDIR/$$RES"; \ +- echo " $$RESTYPE/$$RES as \"$$destconf\""; \ ++ destconf="$$RESDIR/$$RES.sample"; \ ++ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \ + fi; \ + ${INSTALL_CONFIG} "$$f" "$$destconf"; \ + if test "x${dir_group}" != "x"; then \ +@@ -170,11 +171,6 @@ + fi; \ + done; \ + done +- $(MKDIR) ${DESTDIR}${confdir}/bareos-dir-export/client/ +- @if test -f ${DESTDIR}${scriptdir}/query.sql; then \ +- echo " ==> Saving existing query.sql to query.sql.old"; \ +- $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \ +- fi + ${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql + @if test -f static-bareos-dir; then \ + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bareos-dir $(DESTDIR)$(sbindir)/static-bareos-dir; \ Modified: head/sysutils/bareos-server/files/patch-src-filed-Makefile.in ============================================================================== --- head/sysutils/bareos-server/files/patch-src-filed-Makefile.in Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-server/files/patch-src-filed-Makefile.in Wed Nov 16 07:11:54 2016 (r426215) @@ -1,5 +1,5 @@ ---- src/filed/Makefile.in 2015-12-03 03:22:54.000000000 -0500 -+++ src/filed/Makefile.in 2016-02-01 18:17:25.879376000 -0500 +--- src/files/Makefile.in 2016-10-16 10:14:36.000000000 -0500 ++++ src/filed/Makefile.in 2016-11-10 01:33:16.120709000 -0500 @@ -25,6 +25,7 @@ GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@ @@ -8,23 +8,32 @@ COMPRESS_CPPFLAGS += @ZLIB_INC@ @LZO_INC@ @FASTLZ_INC@ first_rule: all -@@ -76,7 +77,7 @@ +@@ -78,7 +79,7 @@ @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ - $(FDLIBS) -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) \ + -lbareosfind -lbareoscfg -lbareos -lm $(FDLIBS) $(LIBS) \ - $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) + $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS) static-bareos-fd: Makefile $(SVROBJS) \ ../findlib/libbareosfind.a \ -@@ -84,8 +85,8 @@ - ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) +@@ -87,7 +88,7 @@ @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ -- $(FDLIBS) -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) \ + -lbareosfind -lbareoscfg -lbareos -lm $(FDLIBS) $(LIBS) \ - $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) -+ -lbareosfind -lbareoscfg -lbareos -lm $(FDLIBS) $(LIBS) \ -+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS) ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_STATIC_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS) strip $@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status +@@ -137,8 +138,8 @@ + destconf="$$RESDIR/$$RES.new"; \ + echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \ + else \ +- destconf="$$RESDIR/$$RES"; \ +- echo " $$RESTYPE/$$RES as \"$$destconf\""; \ ++ destconf="$$RESDIR/$$RES.sample"; \ ++ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \ + fi; \ + ${INSTALL_CONFIG} "$$f" "$$destconf"; \ + if test "x${fd_group}" != "x"; then \ Added: head/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in Wed Nov 16 07:11:54 2016 (r426215) @@ -0,0 +1,28 @@ +--- src/plugins/filed/Makefile.in 2016-10-16 10:14:36.000000000 -0500 ++++ src/plugins/filed/Makefile.in 2016-11-09 16:45:34.113690000 -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 + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir) + $(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la + for plugin in $(BUILD_PLUGINS); do \ +@@ -102,13 +103,13 @@ + CONF=`echo $$plugin | sed 's/\(.*\)-fd.la$$/\1-conf.d/'`; \ + if [ -d "$$CONF" ]; then \ + for i in `find "$$CONF/" \( -name "*.conf" -o -name "*.conf.example" \) -print | cut -d'/' -f2-`; do \ +- $(INSTALL_CONFIG) -D $$CONF/$$i ${DESTDIR}${confdir}/$$i; \ ++ $(INSTALL_CONFIG) $$CONF/$$i ${DESTDIR}${confdir}/$$i; \ + 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 \ +- $(INSTALL_CONFIG) -D python-ldap-conf.d/$$i ${DESTDIR}${confdir}/$$i; \ ++ $(INSTALL_CONFIG) python-ldap-conf.d/$$i ${DESTDIR}${confdir}/`echo $$i | sed -e 's|example|sample|g'`; \ + done; \ + fi; \ + done Added: head/sysutils/bareos-server/files/patch-src-stored_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/bareos-server/files/patch-src-stored_Makefile.in Wed Nov 16 07:11:54 2016 (r426215) @@ -0,0 +1,73 @@ +--- src/stored/Makefile.in 2016-10-16 10:14:36.000000000 -0500 ++++ src/stored/Makefile.in 2016-11-09 15:54:32.944172000 -0500 +@@ -93,6 +93,7 @@ + INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include + + JANSSON_CPPFLAGS = @JANSSON_INC@ ++JANSSON_LDFLAGS = @JANSSON_LIBS@ + + DEBUG = @DEBUG@ + GETTEXT_LIBS = @LIBINTL@ +@@ -170,7 +171,7 @@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(SDOBJS) \ + $(NDMP_LIBS) -lbareossd -lbareoscfg -lbareos -lm $(DLIB) $(LIBS) $(WRAPLIBS) \ +- $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) ++ $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ${JANSSON_LDFLAGS} + + static-bareos-sd: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SDOBJS) \ + ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \ +@@ -192,7 +193,7 @@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(TAPEOBJS) \ + -lbareossd -lbareoscfg -lbareos $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) ++ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) + + bls: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) \ + ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \ +@@ -201,7 +202,7 @@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ + -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) ++ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) + + bextract: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BEXTOBJS) \ + ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \ +@@ -210,7 +211,7 @@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) \ + -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) $(BEXTRACT_LIBS) \ +- $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) ++ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) + + bscan: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SCNOBJS) \ + ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \ +@@ -220,13 +221,13 @@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ + -lbareossql -lbareoscats $(DB_LIBS) -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) \ +- $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) ++ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ${JANSSON_LDFLAGS} + + bcopy: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(COPYOBJS) \ + ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(COPYOBJS) \ +- -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) ++ -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status + cd $(topdir) \ +@@ -259,8 +260,8 @@ + destconf="$$RESDIR/$$RES.new"; \ + echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \ + else \ +- destconf="$$RESDIR/$$RES"; \ +- echo " $$RESTYPE/$$RES as \"$$destconf\""; \ ++ destconf="$$RESDIR/$$RES.sample"; \ ++ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \ + fi; \ + ${INSTALL_CONFIG} "$$f" "$$destconf"; \ + if test "x${sd_group}" != "x"; then \ Added: head/sysutils/bareos-server/files/patch-src-tools_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/bareos-server/files/patch-src-tools_Makefile.in Wed Nov 16 07:11:54 2016 (r426215) @@ -0,0 +1,11 @@ +--- src/tools/Makefile.in 2016-10-16 10:14:36.000000000 -0500 ++++ src/tools/Makefile.in 2016-11-09 22:56:53.069629000 -0500 +@@ -130,7 +130,7 @@ + $(MKDIR) $(DESTDIR)$(sbindir) + @for tool in ${TOOLS_BIN} ; do \ + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $$tool $(DESTDIR)$(bindir)/$$tool ; \ +- if ! [ -r $(DESTDIR)$(sbindir)/$$tool ]; then $(SYMLINK) $(bindir)/$$tool $(DESTDIR)$(sbindir)/$$tool; fi; \ ++ if ! [ -r $(DESTDIR)$(sbindir)/$$tool ]; then $(SYMLINK) ../bin/$$tool $(DESTDIR)$(sbindir)/$$tool; fi; \ + done + # Allow non-root execution of bsmtp for non-root Directors + chmod 755 $(DESTDIR)$(bindir)/bsmtp Modified: head/sysutils/bareos-server/files/pkg-message.client.in ============================================================================== --- head/sysutils/bareos-server/files/pkg-message.client.in Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-server/files/pkg-message.client.in Wed Nov 16 07:11:54 2016 (r426215) @@ -2,7 +2,14 @@ bareos client was installed -1) Sample files are installed in %%PREFIX%%/etc/bareos: -bconsole.conf.sample, bareos-barcodes.sample, bareos-fd.conf.sample +1) Sample files are installed in %%PREFIX%%/etc/bareos/bareos-fd.d/ and + %%PREFIX%%/etc/bareos/bconsole.d/ + +2) Add bareos_fd_enable="YES" to /etc/rc.conf. + +3) If you want to retain old configuration scheme, you must add the following + to /etc/rc.conf + + bareos_fd_config="%%PREFIX%%/etc/bareos/bareos-fd.conf" ################################################################################ Modified: head/sysutils/bareos-server/files/pkg-message.server.in ============================================================================== --- head/sysutils/bareos-server/files/pkg-message.server.in Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-server/files/pkg-message.server.in Wed Nov 16 07:11:54 2016 (r426215) @@ -2,7 +2,18 @@ bareos server was installed -1) Important information about new version of bareos can be found in the +1) Sample files are installed in %%PREFIX%%/etc/bareos/bareos-dir.d/ and + %%PREFIX%%/etc/bareos/bareos-sd.d/ directories + +2) Add bareos_dir_enable="YES" and bareos_sd_enable="YES" to /etc/rc.conf. + +3) If you want to retain old configuration scheme, you must add the following + to /etc/rc.conf + + bareos_dir_config="%%PREFIX%%/etc/bareos/bareos-dir.conf" + bareos_sd_config="%%PREFIX%%/etc/bareos/bareos-sd.conf" + +4) Important information about new version of bareos can be found in the ReleaseNotes. https://github.com/bareos/bareos/blob/master/README.md @@ -17,7 +28,8 @@ chio command is included and installed a Please have a look at it if you want to use an autochanger. You have to configure the usage in - %%PREFIX%%/etc/bareos/bareos-dir.conf + %%PREFIX%%/etc/bareos/bareos-dir.conf or + %%PREFIX%%/etc/bareos/bareos-dir.d/storage/ Take care of correct permissions for changer and tape device (e.g. /dev/ch0 and /dev/n[r]sa0) i.e. @@ -51,7 +63,7 @@ the user bareos. Check your permissions For USB support read the bareos manual. It could be necessary to configure/compile a new kernel. -Look at %%PREFIX%%/lib/bareos/update_bareos_tables for +Look at %%PREFIX%%/lib/bareos/scripts/update_bareos_tables for database update procedure. If you are using sqlite you need to run the make_sqlite_tables script as Modified: head/sysutils/bareos-server/pkg-plist ============================================================================== --- head/sysutils/bareos-server/pkg-plist Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-server/pkg-plist Wed Nov 16 07:11:54 2016 (r426215) @@ -1,37 +1,73 @@ @sample(,bareos,640) %%ETCDIR%%/bareos-barcodes.sample -@group bareos -@sample(,bareos,) %%ETCDIR%%/bareos-dir.conf.sample -@group wheel -@sample(,bareos,) %%ETCDIR%%/bareos-sd.conf.sample +%%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.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 -etc/bareos/mtx-changer.conf -lib/bareos/plugins/BareosDirPluginBaseclass.py -lib/bareos/plugins/BareosDirWrapper.py lib/bareos/plugins/BareosSdPluginBaseclass.py lib/bareos/plugins/BareosSdWrapper.py -lib/bareos/plugins/autoxflate-sd.so -lib/bareos/plugins/bareos-dir-class-plugin.py -lib/bareos/plugins/bareos-dir.py.template 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_sd_consts.py +lib/bareos/plugins/bareos-dir.py.template +%%PYTHON%%lib/bareos/plugins/python-dir.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-config-lib.sh +lib/bareos/scripts/bareos_config +lib/bareos/scripts/bareos-ctl-funcs 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/bareos-explorer -lib/bareos/scripts/bareos_config -lib/bareos/scripts/bconsole -lib/bareos/scripts/btraceback.dbx +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/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 @@ -46,18 +82,10 @@ lib/bareos/scripts/ddl/updates/%%DBTYPE% 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/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/make_catalog_backup +lib/bareos/scripts/delete_catalog_backup lib/bareos/scripts/query.sql -lib/bareos/scripts/update_bareos_tables %%NDMP%%lib/libbareosndmp-%%LIB_VERSION%%.so %%NDMP%%lib/libbareosndmp.la %%NDMP%%lib/libbareosndmp.so @@ -102,6 +130,27 @@ sbin/btape sbin/btraceback sbin/bwild sbin/chio-bareos +@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 /var/log/bareos -@dir /var/run/bareos +@dir(bareos,bareos,) /var/log/bareos +@dir(bareos,bareos,) /var/run/bareos Modified: head/sysutils/bareos-server/pkg-plist.client ============================================================================== --- head/sysutils/bareos-server/pkg-plist.client Wed Nov 16 07:01:25 2016 (r426214) +++ head/sysutils/bareos-server/pkg-plist.client Wed Nov 16 07:11:54 2016 (r426215) @@ -1,30 +1,43 @@ -@sample %%ETCDIR%%/bareos-fd.conf.sample +@sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample @group bareos -@sample %%ETCDIR%%/bconsole.conf.sample +@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-15.2.2.so +lib/libbareos-16.2.4.so lib/libbareoscfg.la lib/libbareoscfg.so -lib/libbareoscfg-15.2.2.so +lib/libbareoscfg-16.2.4.so lib/libbareosfind.la lib/libbareosfind.so -lib/libbareosfind-15.2.2.so +lib/libbareosfind-16.2.4.so %%LMDB%%lib/libbareoslmdb.la %%LMDB%%lib/libbareoslmdb.so -%%LMDB%%lib/libbareoslmdb-15.2.2.so -lib/bareos/plugins/BareosFdPluginBaseclass.py -%%LMDB%%lib/bareos/plugins/BareosFdPluginLDAP.py -lib/bareos/plugins/BareosFdPluginLocalFileset.py -lib/bareos/plugins/BareosFdWrapper.py -lib/bareos/plugins/bareos-fd-local-fileset.py -lib/bareos/plugins/bareos-fd-mock-test.py -%%LMDB%%lib/bareos/plugins/bareos-fd-ldap.py -lib/bareos/plugins/bareos_fd_consts.py -lib/bareos/plugins/bareos-fd.py.template +%%LMDB%%lib/libbareoslmdb-16.2.4.so +%%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-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 lib/bareos/plugins/bpipe-fd.so +%%PYTHON%%lib/bareos/plugins/python-fd.so man/man8/bareos-fd.8.gz man/man1/bconsole.1.gz sbin/bareos-fd @@ -33,7 +46,8 @@ sbin/bconsole bin/bconsole @group wheel @dir(bareos,bareos,) %%BAREOS_DIR%% -@dir(,bareos,) %%ETCDIR%% +%%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611160711.uAG7Bt7Y004349>