- Update to 17.2.5

ChangeLog:
http://doc.bareos.org/master/html/bareos-manual-main-reference.html#ReleaseNotes

Take care with this version because some changes were done on databases schema.

7 files changed, 70 insertions, 81 deletions

diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index c518d9c34d9a..7d8063872359 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	16.2.7
+DISTVERSION=	17.2.5
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
@@ -193,7 +193,7 @@ post-patch:
 	@${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
@@ -219,6 +219,7 @@ post-install:
 	${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
diff --git a/sysutils/bareos-server/Makefile.common b/sysutils/bareos-server/Makefile.common
index 6963cd937883..5ae778ccc4ae 100644
--- a/sysutils/bareos-server/Makefile.common
+++ b/sysutils/bareos-server/Makefile.common
@@ -19,16 +19,6 @@ pre-install:
 .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 \
diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo
index b00c9ca98757..996ada41d2d9 100644
--- a/sysutils/bareos-server/distinfo
+++ b/sysutils/bareos-server/distinfo
@@ -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
diff --git a/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in b/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in
index 4123527790de..6318ac7a4268 100644
--- a/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in
+++ b/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in
@@ -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;\
diff --git a/sysutils/bareos-server/files/patch-src-qt-console-bat.pro.in b/sysutils/bareos-server/files/patch-src-qt-console-bat.pro.in
deleted file mode 100644
index 71f1a0722c51..000000000000
--- a/sysutils/bareos-server/files/patch-src-qt-console-bat.pro.in
+++ /dev/null
@@ -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)
diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist
index 19d08f4d2dc0..7d3d560f8c74 100644
--- a/sysutils/bareos-server/pkg-plist
+++ b/sysutils/bareos-server/pkg-plist
@@ -1,5 +1,6 @@
 @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
@@ -30,44 +31,36 @@
 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
@@ -75,6 +68,7 @@ lib/bareos/scripts/ddl/creates/%%DBTYPE%%.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
@@ -82,18 +76,28 @@ 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
@@ -118,11 +122,13 @@ 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
@@ -130,6 +136,9 @@ 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
diff --git a/sysutils/bareos-server/pkg-plist.client b/sysutils/bareos-server/pkg-plist.client
index 4731763d4bad..ea910a523b99 100644
--- a/sysutils/bareos-server/pkg-plist.client
+++ b/sysutils/bareos-server/pkg-plist.client
@@ -15,35 +15,35 @@
 @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