From owner-svn-ports-head@freebsd.org Wed Jan 27 04:20:03 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2105A6F22E; Wed, 27 Jan 2016 04:20:03 +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 mx1.freebsd.org (Postfix) with ESMTPS id B2C64160E; Wed, 27 Jan 2016 04:20:03 +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 u0R4K2fn094916; Wed, 27 Jan 2016 04:20:02 GMT (envelope-from acm@FreeBSD.org) Received: (from acm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0R4K1U4094908; Wed, 27 Jan 2016 04:20:01 GMT (envelope-from acm@FreeBSD.org) Message-Id: <201601270420.u0R4K1U4094908@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: acm set sender to acm@FreeBSD.org using -f From: Jose Alonso Cardenas Marquez Date: Wed, 27 Jan 2016 04:20:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407334 - in head/sysutils: bareos-client bareos-client-static bareos-docs bareos-server X-SVN-Group: ports-head 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.20 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: Wed, 27 Jan 2016 04:20:04 -0000 Author: acm Date: Wed Jan 27 04:20:01 2016 New Revision: 407334 URL: https://svnweb.freebsd.org/changeset/ports/407334 Log: - Update to 15.2.2 Modified: 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/distinfo head/sysutils/bareos-server/pkg-plist head/sysutils/bareos-server/pkg-plist.client Modified: head/sysutils/bareos-client-static/Makefile ============================================================================== --- head/sysutils/bareos-client-static/Makefile Wed Jan 27 02:01:46 2016 (r407333) +++ head/sysutils/bareos-client-static/Makefile Wed Jan 27 04:20:01 2016 (r407334) @@ -13,8 +13,9 @@ MASTERDIR= ${.CURDIR}/../../sysutils/bar PLIST_FILES= sbin/bareos-fd-static \ sbin/bconsole-static -OPTIONS_DEFINE= NLS +OPTIONS_DEFINE= NLS LMDB OPTIONS_DEFAULT=# +LMDB_DESC= Enable build of LMDB support CONFIGURE_ARGS+= --enable-client-only \ --enable-static-fd \ Modified: head/sysutils/bareos-client/Makefile ============================================================================== --- head/sysutils/bareos-client/Makefile Wed Jan 27 02:01:46 2016 (r407333) +++ head/sysutils/bareos-client/Makefile Wed Jan 27 04:20:01 2016 (r407334) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bareos -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) @@ -13,7 +13,8 @@ USE_RC_SUBR= bareos-fd PLIST= ${PKGDIR}/pkg-plist.client MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server -OPTIONS_DEFINE= NLS PYTHON +OPTIONS_DEFINE= NLS PYTHON LMDB OPTIONS_DEFAULT=# +LMDB_DESC= Enable build of LMDB support .include "${MASTERDIR}/Makefile" Modified: head/sysutils/bareos-docs/Makefile ============================================================================== --- head/sysutils/bareos-docs/Makefile Wed Jan 27 02:01:46 2016 (r407333) +++ head/sysutils/bareos-docs/Makefile Wed Jan 27 04:20:01 2016 (r407334) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bareos -PORTVERSION= 15.2 +PORTVERSION= 15.2.2 CATEGORIES= sysutils MASTER_SITES= http://doc.bareos.org/master/ PKGNAMESUFFIX= -docs Modified: head/sysutils/bareos-docs/distinfo ============================================================================== --- head/sysutils/bareos-docs/distinfo Wed Jan 27 02:01:46 2016 (r407333) +++ head/sysutils/bareos-docs/distinfo Wed Jan 27 04:20:01 2016 (r407334) @@ -1,2 +1,2 @@ -SHA256 (bareos-manual-main-reference.pdf) = 9382892ccaf6c5db76f354ebd27e649d90d4ffaf58330620a8d2f4ca6d212cb6 -SIZE (bareos-manual-main-reference.pdf) = 2076173 +SHA256 (bareos-manual-main-reference.pdf) = 3e91963872dd18198f4122a73b895a6e0a820cb0942c2a2e108b3434771bd87f +SIZE (bareos-manual-main-reference.pdf) = 2869056 Modified: head/sysutils/bareos-server/Makefile ============================================================================== --- head/sysutils/bareos-server/Makefile Wed Jan 27 02:01:46 2016 (r407333) +++ head/sysutils/bareos-server/Makefile Wed Jan 27 04:20:01 2016 (r407334) @@ -2,14 +2,14 @@ # $FreeBSD$ PORTNAME= bareos -DISTVERSION= 15.2 -PORTREVISION?= 1 +DISTVERSION= 15.2.2 +PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server USE_GITHUB= yes -GH_TAGNAME= bb1529f88585da31a0053f06727c74f2a7cb0dc1 +GH_TAGNAME= fb775025d54ef77abb4d67cc5aa9ecb90bca4839 MAINTAINER= acm@FreeBSD.org COMMENT?= Backup archiving recovery open sourced (server) @@ -23,7 +23,7 @@ LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/arc USERS= bareos GROUPS= ${USERS} -PLIST_SUB+= LIB_VERSION=${PORTVERSION}.0 +PLIST_SUB+= LIB_VERSION=${PORTVERSION} GNU_CONFIGURE= yes USE_LDCONFIG= yes @@ -31,14 +31,19 @@ USE_LDCONFIG= yes CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE?= MTX PYTHON NLS OPENSSL +OPTIONS_DEFINE?= MTX PYTHON NDMP NLS OPENSSL OPTIONS_DEFAULT?= NLS OPENSSL PGSQL +OPTIONS_SUB= yes MTX_DESC= Install mtx for control of autochanger devices +NDMP_DESC= Enable build of NDMP support .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_USE= OPENSSL=yes @@ -46,7 +51,6 @@ OPENSSL_CONFIGURE_ON= --with-openssl=${O OPENSSL_CONFIGURE_OFF= --with-openssl="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 @@ -83,6 +87,10 @@ CONFIGURE_ARGS+=--with-tcp-wrappers=/usr --with-pid-dir=/var/run/bareos .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 @@ -168,7 +176,8 @@ post-patch: @${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|\(.*$${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||' \ @@ -183,6 +192,7 @@ post-patch: 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 .else ${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample Modified: head/sysutils/bareos-server/distinfo ============================================================================== --- head/sysutils/bareos-server/distinfo Wed Jan 27 02:01:46 2016 (r407333) +++ head/sysutils/bareos-server/distinfo Wed Jan 27 04:20:01 2016 (r407334) @@ -1,2 +1,2 @@ -SHA256 (bareos-bareos-15.2-bb1529f88585da31a0053f06727c74f2a7cb0dc1_GH0.tar.gz) = 91341f96f1f1e883a46e74ea91431595943de84dc1482bf4bf463caa0f1d8409 -SIZE (bareos-bareos-15.2-bb1529f88585da31a0053f06727c74f2a7cb0dc1_GH0.tar.gz) = 3878822 +SHA256 (bareos-bareos-15.2.2-fb775025d54ef77abb4d67cc5aa9ecb90bca4839_GH0.tar.gz) = 390be507c686a68d77906e2247a420e30ae5bca2de741effff277b7e936ade96 +SIZE (bareos-bareos-15.2.2-fb775025d54ef77abb4d67cc5aa9ecb90bca4839_GH0.tar.gz) = 3930969 Modified: head/sysutils/bareos-server/pkg-plist ============================================================================== --- head/sysutils/bareos-server/pkg-plist Wed Jan 27 02:01:46 2016 (r407333) +++ head/sysutils/bareos-server/pkg-plist Wed Jan 27 04:20:01 2016 (r407334) @@ -9,9 +9,12 @@ 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.py.template lib/bareos/plugins/bareos_dir_consts.py lib/bareos/plugins/bareos_sd_consts.py @@ -39,6 +42,7 @@ lib/bareos/scripts/ddl/updates/%%DBTYPE% 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/ddl/versions.map lib/bareos/scripts/delete_catalog_backup lib/bareos/scripts/disk-changer @@ -51,7 +55,10 @@ lib/bareos/scripts/make_catalog_backup.p lib/bareos/scripts/mtx-changer lib/bareos/scripts/query.sql lib/bareos/scripts/update_bareos_tables -lib/libbareoscats-%%DBTYPE%%-15.2.0.so +%%NDMP%%lib/libbareosndmp-%%LIB_VERSION%%.so +%%NDMP%%lib/libbareosndmp.la +%%NDMP%%lib/libbareosndmp.so +lib/libbareoscats-%%DBTYPE%%-%%LIB_VERSION%%.so lib/libbareoscats-%%DBTYPE%%.so lib/libbareoscats-%%LIB_VERSION%%.so lib/libbareoscats.la @@ -93,3 +100,5 @@ sbin/btraceback sbin/bwild sbin/chio-bareos @dir(bareos,bareos,) %%BAREOS_DIR%% +@dir /var/log/bareos +@dir /var/run/bareos Modified: head/sysutils/bareos-server/pkg-plist.client ============================================================================== --- head/sysutils/bareos-server/pkg-plist.client Wed Jan 27 02:01:46 2016 (r407333) +++ head/sysutils/bareos-server/pkg-plist.client Wed Jan 27 04:20:01 2016 (r407334) @@ -2,20 +2,26 @@ @group bareos @sample %%ETCDIR%%/bconsole.conf.sample @group wheel +%%LMDB%%@sample %%ETCDIR%%/plugin-python-ldap.conf.sample lib/libbareos.la lib/libbareos.so -lib/libbareos-15.2.0.so +lib/libbareos-15.2.2.so lib/libbareoscfg.la lib/libbareoscfg.so -lib/libbareoscfg-15.2.0.so +lib/libbareoscfg-15.2.2.so lib/libbareosfind.la lib/libbareosfind.so -lib/libbareosfind-15.2.0.so +lib/libbareosfind-15.2.2.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 lib/bareos/plugins/bpipe-fd.so