Date: Tue, 15 Dec 2020 06:49:04 +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: r558143 - in head/sysutils: bareos-client bareos-server bareos-server/files Message-ID: <202012150649.0BF6n4ND082816@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Tue Dec 15 06:49:03 2020 New Revision: 558143 URL: https://svnweb.freebsd.org/changeset/ports/558143 Log: - Update to 19.2.9 - Add CEPHFS option - Add PERL5 like run dependency - Fix pkg-plist PR: 249072 250194 Submitted by: yasu _at_ utahime.org brad _at_ facefault.org Modified: head/sysutils/bareos-client/Makefile head/sysutils/bareos-server/Makefile head/sysutils/bareos-server/distinfo head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake head/sysutils/bareos-server/pkg-plist head/sysutils/bareos-server/pkg-plist.client Modified: head/sysutils/bareos-client/Makefile ============================================================================== --- head/sysutils/bareos-client/Makefile Tue Dec 15 06:42:27 2020 (r558142) +++ head/sysutils/bareos-client/Makefile Tue Dec 15 06:49:03 2020 (r558143) @@ -14,9 +14,10 @@ PLIST= ${PKGDIR}/pkg-plist.client MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server OPTIONS_GROUP= PLUGINS -OPTIONS_GROUP_PLUGINS= GFAPI RADOS +OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS OPTIONS_DEFINE= NLS PYTHON LMDB SCSICRYPTO +CEPHFS_DESC= CEPHFS fd plugin support GFAPI_DESC= GFAPI fd plugin support RADOS_DESC= RADOS fd plugin support LMDB_DESC= Enable build of LMDB support Modified: head/sysutils/bareos-server/Makefile ============================================================================== --- head/sysutils/bareos-server/Makefile Tue Dec 15 06:42:27 2020 (r558142) +++ head/sysutils/bareos-server/Makefile Tue Dec 15 06:49:03 2020 (r558143) @@ -2,7 +2,7 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 19.2.7 +DISTVERSION= 19.2.9 PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # @@ -19,9 +19,10 @@ CONFLICTS?= bacula18*-server bacula17*-server-* bareos LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson -USES+= cmake compiler:c++11-lang localbase pkgconfig readline:port \ +USES+= cmake compiler:c++11-lang localbase perl5 pkgconfig readline:port \ shebangfix USE_GITHUB= yes +USE_PERL5= run USERS= bareos GROUPS= ${USERS} @@ -46,13 +47,14 @@ SCSICRYPTO_DESC= Build LTO AME crypto plugin .if ${PKGNAMESUFFIX} == "-server" OPTIONS_GROUP= BACKENDS -OPTIONS_GROUP_BACKENDS= GFAPI RADOS +OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS OPTIONS_DEFINE= MTX PYTHON NDMP NLS SCSICRYPTO OPTIONS_DEFAULT+= PGSQL SCSICRYPTO OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL OPTIONS_SINGLE+= DATABASE BACKENDS_DESC= Storage backends DATABASE_DESC= Database support +CEPHFS_DESC= CEPHFS backend support GFAPI_DESC= GFAPI backend support RADOS_DESC= RADOS backend support @@ -145,9 +147,11 @@ SUB_LIST= BAREOS_USER=${BAREOS_USER} \ NLS_USES= gettext NLS_CMAKE_ON= -Dnls=ON +CEPHFS_CMAKE_ON= -Dcephfs=ON +CEPHFS_LIB_DEPENDS= libcephfs.so:net/ceph14 GFAPI_CMAKE_ON= -Dgfapi=ON GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs -RADOS_CMAKE_ON= -Drados=ON +RADOS_CMAKE_ON= -Drados=ON -Dcephfs=ON RADOS_LIB_DEPENDS= librados.so:net/ceph14 # Client only or full server version Modified: head/sysutils/bareos-server/distinfo ============================================================================== --- head/sysutils/bareos-server/distinfo Tue Dec 15 06:42:27 2020 (r558142) +++ head/sysutils/bareos-server/distinfo Tue Dec 15 06:49:03 2020 (r558143) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589241929 -SHA256 (bareos-bareos-Release-19.2.7_GH0.tar.gz) = 283c1fa9cb6a96b1f09b402cd507ecd8bf798458bafcbfad867da08d33d12653 -SIZE (bareos-bareos-Release-19.2.7_GH0.tar.gz) = 12602338 +TIMESTAMP = 1607980168 +SHA256 (bareos-bareos-Release-19.2.9_GH0.tar.gz) = ea203d4bdacc8dcc86164a74f628888ce31cc90858398498137bd25900b8f723 +SIZE (bareos-bareos-Release-19.2.9_GH0.tar.gz) = 12886739 Modified: head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake ============================================================================== --- head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake Tue Dec 15 06:42:27 2020 (r558142) +++ head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake Tue Dec 15 06:49:03 2020 (r558143) @@ -1,31 +1,31 @@ ---- core/cmake/BareosCheckIncludes.cmake 2020-02-03 01:03:16.451463000 -0500 -+++ core/cmake/BareosCheckIncludes.cmake 2020-02-03 01:07:12.138547000 -0500 -@@ -98,16 +98,20 @@ - check_include_files(sys/ea.h HAVE_SYS_EA_H) - check_include_files(sys/proplist.h HAVE_SYS_PROPLIST_H) +--- core/cmake/BareosCheckIncludes.cmake 2020-12-11 08:44:43.000000000 -0500 ++++ core/cmake/BareosCheckIncludes.cmake 2020-12-14 19:30:00.380545000 -0500 +@@ -100,21 +100,21 @@ check_include_files(sys/xattr.h HAVE_SYS_XATTR_H) --check_include_files(api/glfs.h HAVE_API_GLFS_H) + check_include_files(api/glfs.h HAVE_API_GLFS_H) + ++if(cephfs) + check_include_files(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H) ++check_include_files("sys/stat.h;cephfs/ceph_ll_client.h" HAVE_CEPH_STATX) ++endif() + +-include(CheckSymbolExists) +-include(CMakePushCheckState) +-cmake_push_check_state() +-set(CMAKE_REQUIRED_LIBRARIES cephfs) +-check_symbol_exists(ceph_statx "sys/stat.h;cephfs/libcephfs.h" HAVE_CEPH_STATX) +-cmake_pop_check_state() - --check_include_files(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H) --check_include_files("sys/stat.h;cephfs/ceph_statx.h" HAVE_CEPHFS_CEPH_STATX_H) --check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H) --check_include_files(radosstriper/libradosstriper.h -- HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H) -- -+if(gfapi) -+ check_include_files(glusterfs/api/glfs.h HAVE_API_GLFS_H) ++if(rados) + check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H) + check_include_files(radosstriper/libradosstriper.h + HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H) ++endif() + # CHECK_INCLUDE_FILES(glusterfs/glusterfs.h HAVE_GLUSTERFS_GLUSTERFS_H) -check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H) ++if(gfapi) + check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H) -+endif() -+if(cephfs) -+ check_include_files(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H) -+ check_include_files("sys/stat.h;cephfs/ceph_statx.h" HAVE_CEPHFS_CEPH_STATX_H) -+endif() -+if(rados) -+ check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H) -+ check_include_files(radosstriper/libradosstriper.h -+ HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H) +endif() check_include_files(elasto/data.h HAVE_ELASTO_DATA_H) Modified: head/sysutils/bareos-server/pkg-plist ============================================================================== --- head/sysutils/bareos-server/pkg-plist Tue Dec 15 06:42:27 2020 (r558142) +++ head/sysutils/bareos-server/pkg-plist Tue Dec 15 06:49:03 2020 (r558143) @@ -11,14 +11,17 @@ bin/timelimit @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 +%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-cephfs.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-gfapi.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ovirt.conf.sample %%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-rados.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample +%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCephfs.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.conf.sample %%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupRados.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample +%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreCephfs.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreGFAPI.conf.sample %%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreRados.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.conf.sample @@ -54,6 +57,7 @@ etc/logrotate.d/bareos-dir lib/bareos/backends/libbareoscats-%%DBTYPE%%.so lib/bareos/backends/libbareossd-fifo.so lib/bareos/backends/libbareossd-gentape.so +%%CEPHFS%%lib/bareos/backends/libbareossd-cephfs.so %%GFAPI%%lib/bareos/backends/libbareossd-gfapi.so %%RADOS%%lib/bareos/backends/libbareossd-rados.so lib/bareos/backends/libbareossd-tape.so @@ -165,6 +169,7 @@ sbin/timelimit @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-dir.d/user @dir(,bareos,750) %%ETCDIR%%/bareos-dir-export @dir(,bareos,750) %%ETCDIR%%/bareos-dir-export/client @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d Modified: head/sysutils/bareos-server/pkg-plist.client ============================================================================== --- head/sysutils/bareos-server/pkg-plist.client Tue Dec 15 06:42:27 2020 (r558142) +++ head/sysutils/bareos-server/pkg-plist.client Tue Dec 15 06:49:03 2020 (r558143) @@ -35,6 +35,7 @@ lib/libbareosfind.so.%%LIB_VERSION%% %%PYTHON%%lib/bareos/plugins/bareos-fd.py.template %%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py lib/bareos/plugins/bpipe-fd.so +%%CEPHFS%%lib/bareos/plugins/cephfs-fd.so %%GFAPI%%lib/bareos/plugins/gfapi-fd.so %%PYTHON%%lib/bareos/plugins/python-fd.so %%RADOS%%lib/bareos/plugins/rados-fd.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012150649.0BF6n4ND082816>