pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils sysutils/bareos{,-clientonly}: Upgrade to 20....
details: https://anonhg.NetBSD.org/pkgsrc/rev/42e2c034923f
branches: trunk
changeset: 445919:42e2c034923f
user: kardel <kardel%pkgsrc.org@localhost>
date: Mon Feb 01 09:08:43 2021 +0000
description:
sysutils/bareos{,-clientonly}: Upgrade to 20.0.0 (released 2020-12-16)
Frome the release note:
Bareos 20 released
✔ Improved Cloud Storage integration
✔ New and revised plugins
✔ Modernized Python API
✔ New REST API
Cologne, 16th December, 2020 – The Bareos team launches a new version of the Open Source
backup solution of the same name. Bareos 20 includes, among other things,
a new plugin to back up cloud storage objects directly via the S3 interface,
a modernized Python API and
a preview of the new REST API.
New and improved Plugins
Bareos 20 introduces the brand-new libcloud plugin , which uses the Apache Libcloud library to
back up cloud storage objects directly via the S3 interface (Simple Storage Service). The Bareos
plugin can thus create backups of Amazon S3 buckets directly via the S3 interface. Since Apache
Libcloud is a standard library and supports other cloud storage systems as well, Bareos' libcloud
plugin will be ready to back up other cloud storage objects in the future.
The plugin for backups and restores of PostgreSQL databases now supports incremental backups
and point-in-time recovery which makes it possible to restore any transaction state from the past.
For the VMware plugin, which has been able to create (incremental) backups of snapshots
since Bareos 15.2, the developers have upgraded the VDDK (Virtual Disk Development Kit) to the
current version 7.0.1. The plugin now supports VMware versions 6.5, 6.7, 7 and also the
release after that.
The Python API and all Bareos Python plugins have been modernized. The code is now easier to
read, and the included plugins have been adapted to work with both Python 2 and 3; parallel use
of both versions is also possible. Users who have written their own Python plugins can refer to
the porting guide in the manual to adapt the plugins. Among the ported Bareos plugins are the
oVirt plugin, which enables agentless backups of virtual machines running under oVirt or Red Hat
Virtualization, the VMware and PostgreSQL plugins, and the Percona XtraBackup plugin for
backing up MySQL/MariaDB.
Technology Preview: REST API
Bareos 20 includes a technical preview of the new REST API, which will allow access to Bareos via
an HTTP interface in future. Currently listed as experimental, the REST API already supports some
important commands: at the moment, users can configure parts of Bareos as well as start, stop
and monitor backup jobs. Hosting providers and other large environments in particular will benefit
from the new REST API since it makes it possible to include typical Bareos operations in scripts
or other automated procedures.
Improved S3 Storage
The storage backend bareos-storage-droplet has been included in the backup software since
Bareos 17.2. It uses the libdroplet library which communicates with cloud storage systems via the
S3 protocol. The Bareos developers have given it a general overhaul, but the most important new
feature is the OpenSSL 1.1 support which includes support for current encryption technologies.
The package bareos-storage-droplet used to be available for only a few Linux distributions, but
since the upgrade Bareos offers packages for all Linux systems which are supported by the
backup solution itself.
Versioning, Changelog and other Numbers
Bareos 20.0.0 is the first release that uses the so-called semantic versioning. Users can now
recognize straight away if it's a major release (1st position), an update with changed functionality
(2nd position) or a pure bugfix (3rd position). More transparency is provided by the continuously
maintained changelog in the GitHub repository. It replaces the classic release notes, contains
links to the corresponding bugs and pull requests, so that interested users can easily get
information about the current progress at any time.
Over 1,500 commits from a total of 22 contributors have gone into Bareos 20. The developers
offer packages for 22 platforms: CentOS 7/8, Debian 9/10, Fedora 31/32/33, openSUSE 15.2, RHEL
7/8, SLES 12/15, Univention 4.4, Ubuntu 16.04/18.04/20.04, FreeBSD 11.4/12.2, macOS ≥10.13,
Solaris (x86, SPARC) 11.4, Windows 10, and Windows Server ≥2012 .
See https://www.bareos.org and https://www.bareos.com
diffstat:
sysutils/bareos-clientonly/Makefile | 53 +-
sysutils/bareos-clientonly/PLIST | 64 ++
sysutils/bareos-clientonly/PLIST.client | 49 -
sysutils/bareos/Makefile | 33 +-
sysutils/bareos/Makefile.common | 31 +-
sysutils/bareos/PLIST | 252 ++++++++++
sysutils/bareos/PLIST.common | 243 ---------
sysutils/bareos/distinfo | 76 +-
sysutils/bareos/files/bareos-dir.sh | 8 +
sysutils/bareos/files/bareos-fd.sh | 9 +
sysutils/bareos/files/bareos-sd.sh | 9 +
sysutils/bareos/patches/patch-core_CMakeLists.txt | 19 +-
sysutils/bareos/patches/patch-core_cmake_BareosCheckIncludes.cmake | 17 +-
sysutils/bareos/patches/patch-core_cmake_BareosFindAllLibraries.cmake | 35 +-
sysutils/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake | 6 +-
sysutils/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake | 72 +-
sysutils/bareos/patches/patch-core_cmake_BareosSetVariableDefaults.cmake | 17 +-
sysutils/bareos/patches/patch-core_cmake_BareosTimeFunctions.cmake | 20 +-
sysutils/bareos/patches/patch-core_platforms_netbsd_CMakeLists.txt | 6 +-
sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer | 4 +-
sysutils/bareos/patches/patch-core_scripts_CMakeLists.txt | 6 +-
sysutils/bareos/patches/patch-core_scripts_bareos-config-lib.sh.in | 8 +-
sysutils/bareos/patches/patch-core_src_CMakeLists.txt | 15 -
sysutils/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in | 10 +-
sysutils/bareos/patches/patch-core_src_cats_postgresql__queries.inc | 10 +-
sysutils/bareos/patches/patch-core_src_console_CMakeLists.txt | 24 +
sysutils/bareos/patches/patch-core_src_dird_admin.cc | 23 -
sysutils/bareos/patches/patch-core_src_dird_archive.cc | 24 -
sysutils/bareos/patches/patch-core_src_dird_authenticate__console.cc | 19 -
sysutils/bareos/patches/patch-core_src_dird_backup.cc | 26 -
sysutils/bareos/patches/patch-core_src_dird_consolidate.cc | 24 -
sysutils/bareos/patches/patch-core_src_dird_dird__conf.cc | 26 +-
sysutils/bareos/patches/patch-core_src_dird_migrate.cc | 51 --
sysutils/bareos/patches/patch-core_src_dird_restore.cc | 51 --
sysutils/bareos/patches/patch-core_src_dird_verify.cc | 50 -
sysutils/bareos/patches/patch-core_src_filed_accurate__lmdb.cc | 4 +-
sysutils/bareos/patches/patch-core_src_findlib_acl.cc | 76 +-
sysutils/bareos/patches/patch-core_src_findlib_find__one.cc | 12 +-
sysutils/bareos/patches/patch-core_src_lib_mem__pool.cc | 26 -
sysutils/bareos/patches/patch-core_src_lib_scsi__lli.cc | 24 +-
sysutils/bareos/patches/patch-core_src_lib_scsi__tapealert.cc | 4 +-
sysutils/bareos/patches/patch-core_src_lib_version.c | 28 -
sysutils/bareos/patches/patch-core_src_lmdb_mdb.c | 4 +-
sysutils/bareos/patches/patch-core_src_plugins_stored_scsicrypto-sd.cc | 40 -
sysutils/bareos/patches/patch-core_src_plugins_stored_scsicrypto_scsicrypto-sd.cc | 34 +
sysutils/bareos/patches/patch-core_src_plugins_stored_scsitapealert-sd.cc | 27 -
sysutils/bareos/patches/patch-core_src_plugins_stored_scsitapealert_scsitapealert-sd.cc | 27 +
sysutils/bareos/patches/patch-core_src_stored_acquire.cc | 15 -
sysutils/bareos/patches/patch-core_src_stored_bscan.cc | 27 -
sysutils/bareos/patches/patch-core_src_stored_btape.cc | 12 +-
sysutils/bareos/patches/patch-core_src_stored_dev.cc | 39 +
sysutils/bareos/patches/patch-core_src_stored_device.cc | 29 -
sysutils/bareos/patches/patch-core_src_stored_dir__cmd.cc | 24 -
sysutils/bareos/patches/patch-core_src_stored_label.cc | 15 -
sysutils/bareos/patches/patch-core_src_stored_mount.cc | 27 -
sysutils/bareos/patches/patch-systemtests_tests_droplet-s3_testrunner | 15 +
56 files changed, 788 insertions(+), 1111 deletions(-)
diffs (truncated from 2486 to 300 lines):
diff -r db4ad5f06182 -r 42e2c034923f sysutils/bareos-clientonly/Makefile
--- a/sysutils/bareos-clientonly/Makefile Mon Feb 01 09:02:47 2021 +0000
+++ b/sysutils/bareos-clientonly/Makefile Mon Feb 01 09:08:43 2021 +0000
@@ -1,28 +1,26 @@
-# $NetBSD: Makefile,v 1.1 2020/07/28 06:37:25 kardel Exp $
-
-PKGNAME= ${DISTNAME:S/-/-clientonly-/}
+# $NetBSD: Makefile,v 1.2 2021/02/01 09:08:44 kardel Exp $
COMMENT= Backup Archiving REcovery Open Sourced - client
CONFLICTS= bareos-[0-9]* bacula-[0-9]* bacula-clientonly-[0-9]*
-PATCHDIR= ${.CURDIR}/../../sysutils/bareos/patches
-FILESDIR= ${.CURDIR}/../../sysutils/bareos/files
-DISTINFO_FILE= ${.CURDIR}/../../sysutils/bareos/distinfo
-
-PLIST_SRC= PLIST.client
+.include "../../sysutils/bareos/Makefile.common"
CMAKE_ARGS?=
CMAKE_ARGS+= -Dclient-only=true
RCD_SCRIPTS= bareos-fd
-.include "../../sysutils/bareos/Makefile.common"
+PKGNAME= ${DISTNAME:S/-/-clientonly-/}
+
+PATCHDIR= ${.CURDIR}/../../sysutils/bareos/patches
+FILESDIR= ${.CURDIR}/../../sysutils/bareos/files
+DISTINFO_FILE= ${.CURDIR}/../../sysutils/bareos/distinfo
# needs to be here to get ${EGREP} defined
.include "../../mk/bsd.pkg.mk"
-CONFIG_TEMPLATES!= ${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q} PLIST.client 2>/dev/null | sed -e 's/ /\\ /g'
+CONFIG_TEMPLATES!= ${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q} PLIST 2>/dev/null | sed -e 's/ /\\ /g'
CONF_FILES?=
.for l in ${CONFIG_TEMPLATES}
@@ -31,7 +29,34 @@
BUILD_DEFS+= VARBASE # to keep pkglint happy
-MAKE_DIRS?=
-MAKE_DIRS+= ${CONFIG_TEMPLATES:H:O:u:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/}
-MAKE_DIRS+= ${VARBASE}/db/${PKG_SYSCONFSUBDIR}
-MAKE_DIRS+= ${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working
+DIR_PERMS.bareos-fd.d= ${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
+DIR_PERMS= ${REAL_ROOT_USER} ${BAREOS_GROUP} 0775
+
+# spool directory
+MAKE_DIRS_PERMS?=
+MAKE_DIRS_PERMS+= ${VARBASE}/${PKG_SYSCONFSUBDIR} \
+ ${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
+MAKE_DIRS_PERMS+= ${VARBASE}/${PKG_SYSCONFSUBDIR}/db \
+ ${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
+MAKE_DIRS_PERMS+= ${VARBASE}/${PKG_SYSCONFSUBDIR}/db/working \
+ ${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
+
+CONF_FILES_PERMS?=
+.for l in ${CONFIG_TEMPLATES}
+CONF_FILES_PERMS+= ${l} ${PKG_SYSCONFDIR}${l:S/^${CONFIG_TEMPLATE_PATH}//} \
+ ${DIR_PERMS.${l:C,^${CONFIG_TEMPLATE_PATH}/([^/]+).*$,\1,}:U${DIR_PERMS}}
+.endfor
+
+D=
+.for l in ${CONFIG_TEMPLATES:H:O:u}
+. if ${l} != ${CONFIG_TEMPLATE_PATH}
+MAKE_DIRS_PERMS+= ${l:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/} \
+ ${DIR_PERMS.${l:C,^${CONFIG_TEMPLATE_PATH}/([^/]+).*$,\1,}:U${DIR_PERMS}}
+D+= ${l:C,^${CONFIG_TEMPLATE_PATH}/([^/]+).*$,${PKG_SYSCONFDIR}/\1,}
+. endif
+.endfor
+
+.for l in ${D:O:u}
+MAKE_DIRS_PERMS+= ${l} \
+ ${DIR_PERMS.${l:C,^${PKG_SYSCONFDIR}/([^/]+).*$,\1,}:U${DIR_PERMS}}
+.endfor
diff -r db4ad5f06182 -r 42e2c034923f sysutils/bareos-clientonly/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/bareos-clientonly/PLIST Mon Feb 01 09:08:43 2021 +0000
@@ -0,0 +1,64 @@
+@comment $NetBSD: PLIST,v 1.1 2021/02/01 09:08:44 kardel Exp $
+bin/bconsole
+lib/bareos/plugins/BareosFdPluginBaseclass.py
+lib/bareos/plugins/BareosFdPluginLDAP.py
+lib/bareos/plugins/BareosFdPluginLibcloud.py
+lib/bareos/plugins/BareosFdPluginLocalFilesBaseclass.py
+lib/bareos/plugins/BareosFdPluginLocalFileset.py
+lib/bareos/plugins/BareosFdPluginOvirt.py
+lib/bareos/plugins/BareosFdPluginPerconaXtraBackup.py
+lib/bareos/plugins/BareosFdPluginPostgres.py
+lib/bareos/plugins/BareosFdPluginVMware.py
+lib/bareos/plugins/BareosFdWrapper.py
+lib/bareos/plugins/BareosLibcloudApi.py
+lib/bareos/plugins/bareos-fd-ldap.py
+lib/bareos/plugins/bareos-fd-libcloud.py
+lib/bareos/plugins/bareos-fd-local-fileset.py
+lib/bareos/plugins/bareos-fd-ovirt.py
+lib/bareos/plugins/bareos-fd-percona-xtrabackup.py
+lib/bareos/plugins/bareos-fd-postgres.py
+lib/bareos/plugins/bareos-fd-vmware.py
+lib/bareos/plugins/bareos_libcloud_api/__init__.py
+lib/bareos/plugins/bareos_libcloud_api/bucket_explorer.py
+lib/bareos/plugins/bareos_libcloud_api/debug.py
+lib/bareos/plugins/bareos_libcloud_api/get_libcloud_driver.py
+lib/bareos/plugins/bareos_libcloud_api/mtime.py
+lib/bareos/plugins/bareos_libcloud_api/process_base.py
+lib/bareos/plugins/bareos_libcloud_api/queue_message.py
+lib/bareos/plugins/bareos_libcloud_api/utils.py
+lib/bareos/plugins/bareos_libcloud_api/worker.py
+lib/bareos/plugins/bpipe-fd.so
+lib/bareos/plugins/python3-fd.so
+lib/bareos/scripts/bareos
+lib/bareos/scripts/bareos-config
+lib/bareos/scripts/bareos-config-lib.sh
+lib/bareos/scripts/bareos-ctl-fd
+lib/bareos/scripts/bareos-ctl-funcs
+lib/bareos/scripts/btraceback.dbx
+lib/bareos/scripts/btraceback.gdb
+lib/bareos/scripts/btraceback.mdb
+lib/libbareos.so
+lib/libbareos.so.20
+lib/libbareos.so.${PKGVERSION}
+lib/libbareosfastlz.so
+lib/libbareosfastlz.so.20
+lib/libbareosfastlz.so.${PKGVERSION}
+lib/libbareosfind.so
+lib/libbareosfind.so.20
+lib/libbareosfind.so.${PKGVERSION}
+lib/libbareoslmdb.so
+lib/libbareoslmdb.so.20
+lib/libbareoslmdb.so.${PKGVERSION}
+${PYSITELIB}/bareosfd.so
+man/man1/bconsole.1
+man/man8/bareos-fd.8
+man/man8/bareos.8
+sbin/bareos
+sbin/bareos-fd
+sbin/bconsole
+sbin/btraceback
+share/examples/bareos/configtemplates/bareos-fd.d/client/myself.conf
+share/examples/bareos/configtemplates/bareos-fd.d/director/bareos-dir.conf
+share/examples/bareos/configtemplates/bareos-fd.d/director/bareos-mon.conf
+share/examples/bareos/configtemplates/bareos-fd.d/messages/Standard.conf
+share/examples/bareos/configtemplates/bconsole.conf
diff -r db4ad5f06182 -r 42e2c034923f sysutils/bareos-clientonly/PLIST.client
--- a/sysutils/bareos-clientonly/PLIST.client Mon Feb 01 09:02:47 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-@comment $NetBSD: PLIST.client,v 1.1 2020/07/28 06:37:25 kardel Exp $
-bin/bconsole
-lib/bareos/plugins/BareosFdPluginBaseclass.py
-lib/bareos/plugins/BareosFdPluginLDAP.py
-lib/bareos/plugins/BareosFdPluginLocalFileset.py
-lib/bareos/plugins/BareosFdPluginOvirt.py
-lib/bareos/plugins/BareosFdPluginPerconaXtraBackup.py
-lib/bareos/plugins/BareosFdWrapper.py
-lib/bareos/plugins/bareos-fd-ldap.py
-lib/bareos/plugins/bareos-fd-local-fileset.py
-lib/bareos/plugins/bareos-fd-mock-test.py
-lib/bareos/plugins/bareos-fd-ovirt.py
-lib/bareos/plugins/bareos-fd-percona-xtrabackup.py
-lib/bareos/plugins/bareos-fd.py.template
-lib/bareos/plugins/bareos_fd_consts.py
-lib/bareos/plugins/bpipe-fd.so
-lib/bareos/plugins/python-fd.so
-lib/bareos/scripts/bareos
-lib/bareos/scripts/bareos-config
-lib/bareos/scripts/bareos-config-lib.sh
-lib/bareos/scripts/bareos-ctl-fd
-lib/bareos/scripts/bareos-ctl-funcs
-lib/bareos/scripts/btraceback.dbx
-lib/bareos/scripts/btraceback.gdb
-lib/bareos/scripts/btraceback.mdb
-lib/libbareos.so
-lib/libbareos.so.19
-lib/libbareos.so.${PKGVERSION}
-lib/libbareosfastlz.so
-lib/libbareosfastlz.so.19
-lib/libbareosfastlz.so.${PKGVERSION}
-lib/libbareosfind.so
-lib/libbareosfind.so.19
-lib/libbareosfind.so.${PKGVERSION}
-lib/libbareoslmdb.so
-lib/libbareoslmdb.so.19
-lib/libbareoslmdb.so.${PKGVERSION}
-man/man1/bconsole.1
-man/man8/bareos-fd.8
-man/man8/bareos.8
-sbin/bareos
-sbin/bareos-fd
-sbin/bconsole
-sbin/btraceback
-share/examples/bareos/configtemplates/bareos-fd.d/client/myself.conf
-share/examples/bareos/configtemplates/bareos-fd.d/director/bareos-dir.conf
-share/examples/bareos/configtemplates/bareos-fd.d/director/bareos-mon.conf
-share/examples/bareos/configtemplates/bareos-fd.d/messages/Standard.conf
-share/examples/bareos/configtemplates/bconsole.conf
diff -r db4ad5f06182 -r 42e2c034923f sysutils/bareos/Makefile
--- a/sysutils/bareos/Makefile Mon Feb 01 09:02:47 2021 +0000
+++ b/sysutils/bareos/Makefile Mon Feb 01 09:08:43 2021 +0000
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2020/11/05 09:09:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2021/02/01 09:08:43 kardel Exp $
CONFLICTS= bareos-clientonly-[0-9]* bacula-clientonly-[0-9]* bacula-[0-9]*
COMMENT= Backup Archiving REcovery Open Sourced
-PKGREVISION= 2
-
-PLIST_SRC= PLIST.common
RCD_SCRIPTS= bareos bareos-dir bareos-sd bareos-fd
@@ -20,9 +17,13 @@
# needs to be here to get ${EGREP} defined
.include "../../mk/bsd.pkg.mk"
-REPLACE_PERL+= core/src/cats/make_catalog_backup.pl.in
+DIR_PERMS.bareos-dir.d= ${BAREOS_DIR_USER} ${BAREOS_GROUP} 0770
+DIR_PERMS.bareos-sd.d= ${BAREOS_SD_USER} ${BAREOS_GROUP} 0770
+DIR_PERMS.bareos-fd.d= ${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
+DIR_PERMS= ${REAL_ROOT_USER} ${BAREOS_GROUP} 0775
# spool directory
+MAKE_DIRS_PERMS?=
MAKE_DIRS_PERMS+= ${VARBASE}/${PKG_SYSCONFSUBDIR} \
${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
MAKE_DIRS_PERMS+= ${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working \
@@ -37,12 +38,24 @@
post-install:
${LN} -fs ${PKG_SYSCONFSUBDIR}/backends/libbareossd-gentape.so ${DESTDIR:Q}/${BAREOS_LIBDIR:Q}/libbareossd-gentape.so
-CONFIG_TEMPLATES!= ${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q} PLIST.common 2>/dev/null | sed -e 's/ /\\ /g'
-CONF_FILES?=
+CONFIG_TEMPLATES!= ${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q}/ PLIST 2>/dev/null | sed -e 's/ /\\ /g'
+CONF_FILES_PERMS?=
.for l in ${CONFIG_TEMPLATES}
-CONF_FILES+= ${l} ${PKG_SYSCONFDIR}${l:S/^${CONFIG_TEMPLATE_PATH}//}
+CONF_FILES_PERMS+= ${l} ${PKG_SYSCONFDIR}${l:S/^${CONFIG_TEMPLATE_PATH}//} \
+ ${DIR_PERMS.${l:C,^${CONFIG_TEMPLATE_PATH}/([^/]+).*$,\1,}:U${DIR_PERMS}}
.endfor
-MAKE_DIRS?=
-MAKE_DIRS+= ${CONFIG_TEMPLATES:H:O:u:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/}
+D=
+.for l in ${CONFIG_TEMPLATES:H:O:u}
+. if ${l} != ${CONFIG_TEMPLATE_PATH}
+MAKE_DIRS_PERMS+= ${l:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/} \
+ ${DIR_PERMS.${l:C,^${CONFIG_TEMPLATE_PATH}/([^/]+).*$,\1,}:U${DIR_PERMS}}
+D+= ${l:C,^${CONFIG_TEMPLATE_PATH}/([^/]+).*$,${PKG_SYSCONFDIR}/\1,}
+. endif
+.endfor
+
+.for l in ${D:O:u}
+MAKE_DIRS_PERMS+= ${l} \
+ ${DIR_PERMS.${l:C,^${PKG_SYSCONFDIR}/([^/]+).*$,\1,}:U${DIR_PERMS}}
+.endfor
diff -r db4ad5f06182 -r 42e2c034923f sysutils/bareos/Makefile.common
--- a/sysutils/bareos/Makefile.common Mon Feb 01 09:02:47 2021 +0000
+++ b/sysutils/bareos/Makefile.common Mon Feb 01 09:08:43 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.1 2020/07/28 06:36:29 kardel Exp $
+# $NetBSD: Makefile.common,v 1.2 2021/02/01 09:08:43 kardel Exp $
# used by sysutils/bareos-clientonly/Makefile
GITHUB_PROJECT= bareos
-VERSION= 19.2.8
+VERSION= 20.0.0
GITHUB_TAG= Release/${VERSION}
DISTNAME= bareos-${VERSION}
@@ -22,15 +22,14 @@
USE_CMAKE= yes
CMAKE_ARG_PATH= ..
CONFIGURE_DIRS= core/_build
-# needs to be able to do compare-and-swap on time_t (cmpxchg8b)
-.if ${MACHINE_ARCH} == "i386"
-CXXFLAGS+= -march=i586
-.endif
+
+PLIST_SUBST+= PYSITELIB=${PYSITELIB}
+
+REPLACE_PERL+= core/src/cats/make_catalog_backup.pl.in
SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-configure
SUBST_MESSAGE.paths= Fixing absolute paths.
-SUBST_FILES.paths= core/CMakeLists.txt
SUBST_FILES.paths+= core/src/cats/make_catalog_backup.pl.in
SUBST_SED.paths= -e 's,"/usr/local,"${PREFIX},g'
SUBST_SED.paths+= -e 's,"/var/log,"${VARBASE}/log,g'
@@ -43,8 +42,8 @@
# file locations
PKG_SYSCONFSUBDIR?= bareos
-BAREOS_PIDDIR?= ${VARBASE}/run
Home |
Main Index |
Thread Index |
Old Index