From owner-svn-ports-head@freebsd.org Fri May 18 05:38:41 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 49B79EEAFB8; Fri, 18 May 2018 05:38:41 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EE05887A47; Fri, 18 May 2018 05:38:40 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CF22113EAD; Fri, 18 May 2018 05:38:40 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4I5ceUS027452; Fri, 18 May 2018 05:38:40 GMT (envelope-from acm@FreeBSD.org) Received: (from acm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4I5cdsI027444; Fri, 18 May 2018 05:38:39 GMT (envelope-from acm@FreeBSD.org) Message-Id: <201805180538.w4I5cdsI027444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: acm set sender to acm@FreeBSD.org using -f From: Jose Alonso Cardenas Marquez Date: Fri, 18 May 2018 05:38:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470269 - in head/sysutils: bareos-docs bareos-server bareos-server/files X-SVN-Group: ports-head X-SVN-Commit-Author: acm X-SVN-Commit-Paths: in head/sysutils: bareos-docs bareos-server bareos-server/files X-SVN-Commit-Revision: 470269 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 05:38:41 -0000 Author: acm Date: Fri May 18 05:38:38 2018 New Revision: 470269 URL: https://svnweb.freebsd.org/changeset/ports/470269 Log: - 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. Deleted: head/sysutils/bareos-server/files/patch-src-qt-console-bat.pro.in Modified: 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/patch-src-plugins-filed_Makefile.in head/sysutils/bareos-server/pkg-plist head/sysutils/bareos-server/pkg-plist.client Modified: head/sysutils/bareos-docs/Makefile ============================================================================== --- head/sysutils/bareos-docs/Makefile Fri May 18 05:25:12 2018 (r470268) +++ head/sysutils/bareos-docs/Makefile Fri May 18 05:38:38 2018 (r470269) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bareos -PORTVERSION= 16.2.7 +PORTVERSION= 17.2.5 CATEGORIES= sysutils MASTER_SITES= http://doc.bareos.org/master/ PKGNAMESUFFIX= -docs Modified: head/sysutils/bareos-docs/distinfo ============================================================================== --- head/sysutils/bareos-docs/distinfo Fri May 18 05:25:12 2018 (r470268) +++ head/sysutils/bareos-docs/distinfo Fri May 18 05:38:38 2018 (r470269) @@ -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 Modified: head/sysutils/bareos-server/Makefile ============================================================================== --- head/sysutils/bareos-server/Makefile Fri May 18 05:25:12 2018 (r470268) +++ head/sysutils/bareos-server/Makefile Fri May 18 05:38:38 2018 (r470269) @@ -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 Modified: head/sysutils/bareos-server/Makefile.common ============================================================================== --- head/sysutils/bareos-server/Makefile.common Fri May 18 05:25:12 2018 (r470268) +++ head/sysutils/bareos-server/Makefile.common Fri May 18 05:38:38 2018 (r470269) @@ -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 \ Modified: head/sysutils/bareos-server/distinfo ============================================================================== --- head/sysutils/bareos-server/distinfo Fri May 18 05:25:12 2018 (r470268) +++ head/sysutils/bareos-server/distinfo Fri May 18 05:38:38 2018 (r470269) @@ -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 Modified: head/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in ============================================================================== --- head/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in Fri May 18 05:25:12 2018 (r470268) +++ head/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in Fri May 18 05:38:38 2018 (r470269) @@ -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;\ Modified: head/sysutils/bareos-server/pkg-plist ============================================================================== --- head/sysutils/bareos-server/pkg-plist Fri May 18 05:25:12 2018 (r470268) +++ head/sysutils/bareos-server/pkg-plist Fri May 18 05:38:38 2018 (r470269) @@ -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 Modified: head/sysutils/bareos-server/pkg-plist.client ============================================================================== --- head/sysutils/bareos-server/pkg-plist.client Fri May 18 05:25:12 2018 (r470268) +++ head/sysutils/bareos-server/pkg-plist.client Fri May 18 05:38:38 2018 (r470269) @@ -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