pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils
Module Name: pkgsrc
Committed By: kardel
Date: Mon Feb 1 09:08:44 UTC 2021
Modified Files:
pkgsrc/sysutils/bareos: Makefile Makefile.common distinfo
pkgsrc/sysutils/bareos-clientonly: Makefile
pkgsrc/sysutils/bareos/files: bareos-dir.sh bareos-fd.sh bareos-sd.sh
pkgsrc/sysutils/bareos/patches: patch-core_CMakeLists.txt
patch-core_cmake_BareosCheckIncludes.cmake
patch-core_cmake_BareosFindAllLibraries.cmake
patch-core_cmake_BareosFindPrograms.cmake
patch-core_cmake_BareosInstallConfigFiles.cmake
patch-core_cmake_BareosSetVariableDefaults.cmake
patch-core_cmake_BareosTimeFunctions.cmake
patch-core_platforms_netbsd_CMakeLists.txt
patch-core_platforms_netbsd_chio-changer
patch-core_scripts_CMakeLists.txt
patch-core_scripts_bareos-config-lib.sh.in
patch-core_src_cats_make__catalog__backup.pl.in
patch-core_src_cats_postgresql__queries.inc
patch-core_src_dird_dird__conf.cc
patch-core_src_filed_accurate__lmdb.cc
patch-core_src_findlib_acl.cc patch-core_src_findlib_find__one.cc
patch-core_src_lib_scsi__lli.cc
patch-core_src_lib_scsi__tapealert.cc patch-core_src_lmdb_mdb.c
patch-core_src_stored_btape.cc
Added Files:
pkgsrc/sysutils/bareos: PLIST
pkgsrc/sysutils/bareos-clientonly: PLIST
pkgsrc/sysutils/bareos/patches: patch-core_src_console_CMakeLists.txt
patch-core_src_plugins_stored_scsicrypto_scsicrypto-sd.cc
patch-core_src_plugins_stored_scsitapealert_scsitapealert-sd.cc
patch-core_src_stored_dev.cc
patch-systemtests_tests_droplet-s3_testrunner
Removed Files:
pkgsrc/sysutils/bareos: PLIST.common
pkgsrc/sysutils/bareos-clientonly: PLIST.client
pkgsrc/sysutils/bareos/patches: patch-core_src_CMakeLists.txt
patch-core_src_dird_admin.cc patch-core_src_dird_archive.cc
patch-core_src_dird_authenticate__console.cc
patch-core_src_dird_backup.cc patch-core_src_dird_consolidate.cc
patch-core_src_dird_migrate.cc patch-core_src_dird_restore.cc
patch-core_src_dird_verify.cc patch-core_src_lib_mem__pool.cc
patch-core_src_lib_version.c
patch-core_src_plugins_stored_scsicrypto-sd.cc
patch-core_src_plugins_stored_scsitapealert-sd.cc
patch-core_src_stored_acquire.cc patch-core_src_stored_bscan.cc
patch-core_src_stored_device.cc patch-core_src_stored_dir__cmd.cc
patch-core_src_stored_label.cc patch-core_src_stored_mount.cc
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/bareos/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/bareos/Makefile.common
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/bareos/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/bareos/PLIST.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/bareos/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/bareos-clientonly/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/bareos-clientonly/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/bareos-clientonly/PLIST.client
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/bareos/files/bareos-dir.sh \
pkgsrc/sysutils/bareos/files/bareos-fd.sh \
pkgsrc/sysutils/bareos/files/bareos-sd.sh
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/sysutils/bareos/patches/patch-core_CMakeLists.txt \
pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosCheckIncludes.cmake \
pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosFindAllLibraries.cmake \
pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake \
pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake \
pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosSetVariableDefaults.cmake \
pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosTimeFunctions.cmake \
pkgsrc/sysutils/bareos/patches/patch-core_platforms_netbsd_CMakeLists.txt \
pkgsrc/sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer \
pkgsrc/sysutils/bareos/patches/patch-core_scripts_CMakeLists.txt \
pkgsrc/sysutils/bareos/patches/patch-core_scripts_bareos-config-lib.sh.in \
pkgsrc/sysutils/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in \
pkgsrc/sysutils/bareos/patches/patch-core_src_cats_postgresql__queries.inc \
pkgsrc/sysutils/bareos/patches/patch-core_src_dird_dird__conf.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_filed_accurate__lmdb.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_findlib_acl.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_findlib_find__one.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_lib_scsi__lli.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_lib_scsi__tapealert.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_stored_btape.cc
cvs rdiff -u -r1.1 -r0 \
pkgsrc/sysutils/bareos/patches/patch-core_src_CMakeLists.txt \
pkgsrc/sysutils/bareos/patches/patch-core_src_dird_admin.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_dird_archive.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_dird_authenticate__console.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_dird_backup.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_dird_consolidate.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_dird_migrate.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_dird_restore.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_dird_verify.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_lib_mem__pool.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_lib_version.c \
pkgsrc/sysutils/bareos/patches/patch-core_src_plugins_stored_scsicrypto-sd.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_plugins_stored_scsitapealert-sd.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_stored_acquire.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_stored_bscan.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_stored_device.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_stored_dir__cmd.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_stored_label.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_stored_mount.cc
cvs rdiff -u -r0 -r1.1 \
pkgsrc/sysutils/bareos/patches/patch-core_src_console_CMakeLists.txt \
pkgsrc/sysutils/bareos/patches/patch-core_src_plugins_stored_scsicrypto_scsicrypto-sd.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_plugins_stored_scsitapealert_scsitapealert-sd.cc \
pkgsrc/sysutils/bareos/patches/patch-core_src_stored_dev.cc \
pkgsrc/sysutils/bareos/patches/patch-systemtests_tests_droplet-s3_testrunner
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/bareos/Makefile
diff -u pkgsrc/sysutils/bareos/Makefile:1.3 pkgsrc/sysutils/bareos/Makefile:1.4
--- pkgsrc/sysutils/bareos/Makefile:1.3 Thu Nov 5 09:09:05 2020
+++ pkgsrc/sysutils/bareos/Makefile Mon Feb 1 09:08:43 2021
@@ -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 @@ BUILD_DEFS+= VARBASE
# 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 @@ MAKE_DIRS_PERMS+= ${VARBASE}/db/${PKG_SY
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
+
+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
-MAKE_DIRS?=
-MAKE_DIRS+= ${CONFIG_TEMPLATES:H:O:u:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/}
+.for l in ${D:O:u}
+MAKE_DIRS_PERMS+= ${l} \
+ ${DIR_PERMS.${l:C,^${PKG_SYSCONFDIR}/([^/]+).*$,\1,}:U${DIR_PERMS}}
+.endfor
Index: pkgsrc/sysutils/bareos/Makefile.common
diff -u pkgsrc/sysutils/bareos/Makefile.common:1.1 pkgsrc/sysutils/bareos/Makefile.common:1.2
--- pkgsrc/sysutils/bareos/Makefile.common:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/Makefile.common Mon Feb 1 09:08:43 2021
@@ -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_LANGUAGES+= c c++
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 @@ BUILD_DEFS+= VARBASE
# file locations
PKG_SYSCONFSUBDIR?= bareos
-BAREOS_PIDDIR?= ${VARBASE}/run
-BAREOS_LOGDIR?= ${VARBASE}/log
+BAREOS_PIDDIR?= ${VARBASE}/run/${PKG_SYSCONFSUBDIR}
+BAREOS_LOGDIR?= ${VARBASE}/log/${PKG_SYSCONFSUBDIR}
BAREOS_LIBDIR?= ${PREFIX}/lib
BAREOS_WORKINGDIR?= ${VARBASE}/db/${PKG_SYSCONFSUBDIR}
@@ -76,12 +75,15 @@ FILES_SUBST+= BAREOS_GROUP=${BAREOS_GRO
FILES_SUBST+= BAREOS_DIR_USER=${BAREOS_DIR_USER}
FILES_SUBST+= BAREOS_SD_USER=${BAREOS_SD_USER}
+# additional CXX parameters - document pkgsrc origin
+CXXFLAGS+= -DBAREOS_BINARY_INFO=\\\"pkgsrc-compiled\\\"
+CXXFLAGS+= -DBAREOS_JOBLOG_MESSAGE=\\\"'pkgsrc '"${DISTNAME}"\\\"
+CXXFLAGS+= -DBAREOS_SERVICES_MESSAGE=\\\"'pkgsrc-compiled binaries are UNSUPPORTED by bareos.com (https://www.bareos.com).\\n'\\\"
+
# cmake arguments
CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
CMAKE_ARGS+= -DCMAKE_STAGING_PREFIX=${BUILDLINK_DIR}
-# reduce job log noise: CXXFLAGS+=-DNO_ADV=1
CMAKE_ARGS+= -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-CMAKE_ARGS+= -DSKIP_GTEST=1
CMAKE_ARGS+= -Dconfigtemplatedir=${PREFIX}/${CONFIG_TEMPLATE_PATH}
CMAKE_ARGS+= -Dworkingdir=${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working
CMAKE_ARGS+= -Dsubsysdir=${VARBASE}/db/${PKG_SYSCONFSUBDIR}
@@ -94,15 +96,18 @@ CMAKE_ARGS+= -Ddir-user=${BAREOS_DIR_USE
CMAKE_ARGS+= -Ddir-group=${BAREOS_GROUP}
CMAKE_ARGS+= -Dsd-user=${BAREOS_SD_USER}
CMAKE_ARGS+= -Dsd-group=${BAREOS_GROUP}
-CMAKE_ARGS+= -Dfd-user=root
+CMAKE_ARGS+= -Dfd-user=${REAL_ROOT_USER}
CMAKE_ARGS+= -Dfd-group=${BAREOS_GROUP}
.include "../../mk/bsd.prefs.mk"
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
# dependencies
+.include "../../mk/atomic64.mk"
.include "../../archivers/lzo/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/python27/buildlink3.mk"
+.include "../../lang/python/application.mk"
.include "../../mk/pam.buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
Index: pkgsrc/sysutils/bareos/distinfo
diff -u pkgsrc/sysutils/bareos/distinfo:1.4 pkgsrc/sysutils/bareos/distinfo:1.5
--- pkgsrc/sysutils/bareos/distinfo:1.4 Tue Aug 25 08:32:13 2020
+++ pkgsrc/sysutils/bareos/distinfo Mon Feb 1 09:08:43 2021
@@ -1,46 +1,32 @@
-$NetBSD: distinfo,v 1.4 2020/08/25 08:32:13 kardel Exp $
+$NetBSD: distinfo,v 1.5 2021/02/01 09:08:43 kardel Exp $
-SHA1 (bareos-19.2.8.tar.gz) = b26f7db66e108eed1e20b11c36f994456419748e
-RMD160 (bareos-19.2.8.tar.gz) = 221777925946ab05ddc00063ba51daf4555f16d1
-SHA512 (bareos-19.2.8.tar.gz) = 60bbbbd949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5
-Size (bareos-19.2.8.tar.gz) = 12604929 bytes
-SHA1 (patch-core_CMakeLists.txt) = 17524dd14c665f00a8911589b52f930ec55e1e0e
-SHA1 (patch-core_cmake_BareosCheckIncludes.cmake) = 8f2a88768acdbe9adf94939ae1dabd3edf40144b
-SHA1 (patch-core_cmake_BareosFindAllLibraries.cmake) = eb33f59f616a5d265a6371dcc028a3031b5dbab5
-SHA1 (patch-core_cmake_BareosFindPrograms.cmake) = a3ed507365fb123ea84911451655ced5f07c7f32
-SHA1 (patch-core_cmake_BareosInstallConfigFiles.cmake) = bad0e5c0c87e726aaac49da99857b3699f0d28e2
-SHA1 (patch-core_cmake_BareosSetVariableDefaults.cmake) = a0ff2802d0583fca2685250bd4a5e0c8259837b2
-SHA1 (patch-core_cmake_BareosTimeFunctions.cmake) = aafa1dd9652ae8cc57414a405f03247242100ba9
-SHA1 (patch-core_platforms_netbsd_CMakeLists.txt) = dd6a54bac7e4b51e3f564f83cc7f78a8826a0d8e
-SHA1 (patch-core_platforms_netbsd_chio-changer) = 4bc4d7382db8e41bd1a10852e429e8f4e16e9fe4
-SHA1 (patch-core_scripts_CMakeLists.txt) = b7869d18651e6e6da4ad5f23c8f4c80d0166aa7c
-SHA1 (patch-core_scripts_bareos-config-lib.sh.in) = f9f657406dea5df23c59bceed286ff5f3ae580d0
-SHA1 (patch-core_src_CMakeLists.txt) = 3db708e8ece43b1087773470a19ea3362aec3d79
-SHA1 (patch-core_src_cats_make__catalog__backup.pl.in) = a31110c1219058a03a4f44411a848ff997aca3c1
-SHA1 (patch-core_src_cats_postgresql__queries.inc) = d255a93a039d671d9dad7b7b096dfff97095aa6e
-SHA1 (patch-core_src_dird_admin.cc) = 0e361de94ff0763c8ac17f32ccb0115c998a7ec2
-SHA1 (patch-core_src_dird_archive.cc) = fa383d6edb8aec942b6c44a35acf50d5ebe5c888
-SHA1 (patch-core_src_dird_authenticate__console.cc) = c5339303583edda8fc9d0c7e741aa6e6b8fc4306
-SHA1 (patch-core_src_dird_backup.cc) = a416a9342d695aaaf438af87113e34a1c4016ebd
-SHA1 (patch-core_src_dird_consolidate.cc) = 934a87e8e799585c4a5bf53c30b0e670b01f3372
-SHA1 (patch-core_src_dird_dird__conf.cc) = b2d619d164acfa8949e8d10d45972dbce7f3b258
-SHA1 (patch-core_src_dird_migrate.cc) = 694f86a15f532f9c13c387f1617be79342ba6e84
-SHA1 (patch-core_src_dird_restore.cc) = ab2243457a788b963ab2dfc6b03046539ee5d06a
-SHA1 (patch-core_src_dird_verify.cc) = b4f346a62358bffc09d5247d1636e352a2318eb0
-SHA1 (patch-core_src_filed_accurate__lmdb.cc) = a3436251902b16a2ed4617a750a36a8a70284fee
-SHA1 (patch-core_src_findlib_acl.cc) = 79d47ae5f79e4e2629a0330787cc45b8347a42e2
-SHA1 (patch-core_src_findlib_find__one.cc) = 50eb6d289b7b2a7b33ee5828db31d03169833d9c
-SHA1 (patch-core_src_lib_mem__pool.cc) = 16b5adc4a5b2b4fd542b4d330e03283b8994a4a7
-SHA1 (patch-core_src_lib_scsi__lli.cc) = 09aa887d71009baa2ce2203c46c88a89097d6546
-SHA1 (patch-core_src_lib_scsi__tapealert.cc) = 11feff157ec8abbbbf689eed9aecd15b336fb28e
-SHA1 (patch-core_src_lib_version.c) = edfd88aed983ea3ce1ead6846707b5625ad5fc51
-SHA1 (patch-core_src_lmdb_mdb.c) = 6cb69f975c23ec5ae52eb1daa8f6f73b7cbf71fd
-SHA1 (patch-core_src_plugins_stored_scsicrypto-sd.cc) = d59125fd445536e220140acf16e43605a4a98e9c
-SHA1 (patch-core_src_plugins_stored_scsitapealert-sd.cc) = 92ef75fbddb587957ec972480a87fe0f5b110111
-SHA1 (patch-core_src_stored_acquire.cc) = c239b2a4a3769b3f99315fae5cc5ee564454a1ad
-SHA1 (patch-core_src_stored_bscan.cc) = 5dfcf88e8049c7717f947349fa127495007b65c6
-SHA1 (patch-core_src_stored_btape.cc) = b3e368e049cec3e9a0c86d9ce29489b53592ff33
-SHA1 (patch-core_src_stored_device.cc) = 34b8069d53d67f90dc43ff44893a990aef40e5c5
-SHA1 (patch-core_src_stored_dir__cmd.cc) = 5c4cc412817a8d8d9eb51b563dbd37bc3f7a7aea
-SHA1 (patch-core_src_stored_label.cc) = 669164289bcb7a2d27e8c63db32d6bf84a3be97e
-SHA1 (patch-core_src_stored_mount.cc) = 7d8b822449068b1f6cd3f411535bbbab4fefba0a
+SHA1 (bareos-20.0.0.tar.gz) = e0ad526ec2d740943892b391a2f0286414c678de
+RMD160 (bareos-20.0.0.tar.gz) = 183d779c1b7b7c5146522c67add9d38dea60a520
+SHA512 (bareos-20.0.0.tar.gz) = 14961ed5db7d169e1e529eded47299129cd92fe29974bd457863756cdee47aa0731fe65ece8439e71a7c474b483c2cfc1a95dd6d8419bf9ae3d3690db52bc3cf
+Size (bareos-20.0.0.tar.gz) = 13325939 bytes
+SHA1 (patch-core_CMakeLists.txt) = e59c94620769db0b26d6255830753bdc3b42ad77
+SHA1 (patch-core_cmake_BareosCheckIncludes.cmake) = bb3703ee083b3aa6ea8d5819c0064324037c560a
+SHA1 (patch-core_cmake_BareosFindAllLibraries.cmake) = 35ddd7c2f95f56aa5f65c5f6f2d39700c350e492
+SHA1 (patch-core_cmake_BareosFindPrograms.cmake) = 89172bc64ba28ca901c3fb5f150f814c0e063875
+SHA1 (patch-core_cmake_BareosInstallConfigFiles.cmake) = a0110766eee99c19bda4de506a86b29a74032e8d
+SHA1 (patch-core_cmake_BareosSetVariableDefaults.cmake) = 1dcdfb5a1a3b6494bb101b4b810646d58bfeb662
+SHA1 (patch-core_cmake_BareosTimeFunctions.cmake) = 237c1237712b361135c0f6e6a1c15b9832c105c5
+SHA1 (patch-core_platforms_netbsd_CMakeLists.txt) = c9d656ed5d51dd9a668186ea7c06c7767c732e4f
+SHA1 (patch-core_platforms_netbsd_chio-changer) = 882dbe658f587362fb5616f5d1ad1abec4763871
+SHA1 (patch-core_scripts_CMakeLists.txt) = bb2c8d62d085c22813490137c467443b7c024e70
+SHA1 (patch-core_scripts_bareos-config-lib.sh.in) = 4aa83a53dc9e8383ed79a0258dbaab6d0110366a
+SHA1 (patch-core_src_cats_make__catalog__backup.pl.in) = ac17b314b16dced9be81580af9fa385f99baeebd
+SHA1 (patch-core_src_cats_postgresql__queries.inc) = 495b4cc6c95a4c0708019f5f36eb10e9259e1341
+SHA1 (patch-core_src_console_CMakeLists.txt) = 0c5571696a456d57f8db5d1f17e8300b6177a77b
+SHA1 (patch-core_src_dird_dird__conf.cc) = 8a0be37b36e4cbc2d0369903b5e74c495d364a49
+SHA1 (patch-core_src_filed_accurate__lmdb.cc) = 125f80e40b02ba9e2f07a0c11480131a0d6ee573
+SHA1 (patch-core_src_findlib_acl.cc) = 8a1a5cc8d739160baf39b85052843b703d3acd75
+SHA1 (patch-core_src_findlib_find__one.cc) = aa44a3567cb1cf4948931903b0257ac5fb6ec278
+SHA1 (patch-core_src_lib_scsi__lli.cc) = f064befcf56363e5a43190131a20837691602ab1
+SHA1 (patch-core_src_lib_scsi__tapealert.cc) = d99290311bbe10290e9ca1fe2a97beb5d91d1e93
+SHA1 (patch-core_src_lmdb_mdb.c) = 8f83c89fb7bad04b53ebebd416f6080f650e695e
+SHA1 (patch-core_src_plugins_stored_scsicrypto_scsicrypto-sd.cc) = e934004e0e71ffb7df7c342abd88e927e6e894ca
+SHA1 (patch-core_src_plugins_stored_scsitapealert_scsitapealert-sd.cc) = b43f8ba6152532d11e0154dc74d2df393a98d888
+SHA1 (patch-core_src_stored_btape.cc) = c1f0637e649d3d1220105e36d616850b338fafae
+SHA1 (patch-core_src_stored_dev.cc) = 8ad73c6e3ff923dc56f4b070a904d886af175f8a
+SHA1 (patch-systemtests_tests_droplet-s3_testrunner) = 42f760df63beca850ab7a4b9c2d5995f09299a4e
Index: pkgsrc/sysutils/bareos-clientonly/Makefile
diff -u pkgsrc/sysutils/bareos-clientonly/Makefile:1.1 pkgsrc/sysutils/bareos-clientonly/Makefile:1.2
--- pkgsrc/sysutils/bareos-clientonly/Makefile:1.1 Tue Jul 28 06:37:25 2020
+++ pkgsrc/sysutils/bareos-clientonly/Makefile Mon Feb 1 09:08:44 2021
@@ -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 @@ CONF_FILES+= ${l} ${PKG_SYSCONFDIR}${l:S
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
Index: pkgsrc/sysutils/bareos/files/bareos-dir.sh
diff -u pkgsrc/sysutils/bareos/files/bareos-dir.sh:1.1 pkgsrc/sysutils/bareos/files/bareos-dir.sh:1.2
--- pkgsrc/sysutils/bareos/files/bareos-dir.sh:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/files/bareos-dir.sh Mon Feb 1 09:08:43 2021
@@ -13,6 +13,14 @@ command="@PREFIX@/sbin/bareos-dir"
required_dirs="@BAREOS_ETCDIR@/bareos-dir.d"
pidfile="@BAREOS_PIDDIR@/bareos-dir.9101.pid"
command_args="-u @BAREOS_DIR_USER@ -g @BAREOS_GROUP@"
+start_precmd=make_dirs
+
+make_dirs() {
+ @MKDIR@ -m 0775 -p @BAREOS_PIDDIR@
+ @CHOWN@ @BAREOS_DIR_USER@:@BAREOS_GROUP@ @BAREOS_PIDDIR@
+ @MKDIR@ -m 0775 -p @BAREOS_LOGDIR@
+ @CHOWN@ @BAREOS_DIR_USER@:@BAREOS_GROUP@ @BAREOS_LOGDIR@
+}
if [ -f /etc/rc.subr ]; then
load_rc_config $name
Index: pkgsrc/sysutils/bareos/files/bareos-fd.sh
diff -u pkgsrc/sysutils/bareos/files/bareos-fd.sh:1.1 pkgsrc/sysutils/bareos/files/bareos-fd.sh:1.2
--- pkgsrc/sysutils/bareos/files/bareos-fd.sh:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/files/bareos-fd.sh Mon Feb 1 09:08:43 2021
@@ -13,6 +13,15 @@ command="@PREFIX@/sbin/bareos-fd"
required_dirs="@BAREOS_ETCDIR@/bareos-fd.d"
pidfile="@BAREOS_PIDDIR@/bareos-fd.9102.pid"
command_args="-g @BAREOS_GROUP@"
+start_precmd=make_dirs
+
+make_dirs() {
+ @MKDIR@ -m 0775 -p @BAREOS_PIDDIR@
+ @CHOWN@ @BAREOS_DIR_USER@:@BAREOS_GROUP@ @BAREOS_PIDDIR@
+ @MKDIR@ -m 0775 -p @BAREOS_LOGDIR@
+ @CHOWN@ @BAREOS_DIR_USER@:@BAREOS_GROUP@ @BAREOS_LOGDIR@
+}
+
if [ -f /etc/rc.subr ]; then
load_rc_config $name
Index: pkgsrc/sysutils/bareos/files/bareos-sd.sh
diff -u pkgsrc/sysutils/bareos/files/bareos-sd.sh:1.1 pkgsrc/sysutils/bareos/files/bareos-sd.sh:1.2
--- pkgsrc/sysutils/bareos/files/bareos-sd.sh:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/files/bareos-sd.sh Mon Feb 1 09:08:43 2021
@@ -13,6 +13,15 @@ command="@PREFIX@/sbin/bareos-sd"
required_dirs="@BAREOS_ETCDIR@/bareos-sd.d"
pidfile="@BAREOS_PIDDIR@/bareos-sd.9103.pid"
command_args="-u @BAREOS_SD_USER@ -g @BAREOS_GROUP@"
+start_precmd=make_dirs
+
+make_dirs() {
+ @MKDIR@ -m 0775 -p @BAREOS_PIDDIR@
+ @CHOWN@ @BAREOS_DIR_USER@:@BAREOS_GROUP@ @BAREOS_PIDDIR@
+ @MKDIR@ -m 0775 -p @BAREOS_LOGDIR@
+ @CHOWN@ @BAREOS_DIR_USER@:@BAREOS_GROUP@ @BAREOS_LOGDIR@
+}
+
if [ -f /etc/rc.subr ]; then
load_rc_config $name
Index: pkgsrc/sysutils/bareos/patches/patch-core_CMakeLists.txt
diff -u pkgsrc/sysutils/bareos/patches/patch-core_CMakeLists.txt:1.1 pkgsrc/sysutils/bareos/patches/patch-core_CMakeLists.txt:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_CMakeLists.txt:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_CMakeLists.txt Mon Feb 1 09:08:43 2021
@@ -1,12 +1,12 @@
-$NetBSD: patch-core_CMakeLists.txt,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_CMakeLists.txt,v 1.2 2021/02/01 09:08:43 kardel Exp $
Setup NetBSD parameters
Due to current lack of XDR quad marshalling NDMP
needs to be disabled.
---- core/CMakeLists.txt.orig 2020-04-16 08:31:41.000000000 +0000
+--- core/CMakeLists.txt.orig 2020-12-16 07:46:16.000000000 +0000
+++ core/CMakeLists.txt
-@@ -264,6 +264,15 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD
+@@ -259,10 +259,19 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD
link_libraries(intl)
endif()
@@ -14,15 +14,20 @@ $NetBSD: patch-core_CMakeLists.txt,v 1.1
+ set(HAVE_NETBSD_OS 1)
+ set(ndmp 0)
+ set(PSCMD "ps -ax -o pid,command")
-+ include_directories(@PREFIX@/include)
-+ link_directories(@PREFIX@/lib)
++ include_directories(${PREFIX}/include)
++ link_directories(${PREFIX}/lib)
+ link_libraries(intl)
+endif()
+
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(HAVE_DARWIN_OS 1)
# set(CMAKE_INCLUDE_PATH "${OPENSSL_INCLUDE_DIR}:${CMAKE_INCLUDE_PATH}")
-@@ -652,6 +661,7 @@ try_compile(
+- set(CMAKE_INCLUDE_PATH "/usr/local/opt/:${CMAKE_INCLUDE_PATH}")
++ set(CMAKE_INCLUDE_PATH "${PREFIX}/opt/:${CMAKE_INCLUDE_PATH}")
+ link_directories(/usr/local/lib)
+
+ include_directories(/usr/local/opt/gettext/include)
+@@ -648,6 +657,7 @@ try_compile(
${PROJECT_SOURCE_DIR}/src/compile_tests/trivially_copyable.cc
)
@@ -30,7 +35,7 @@ $NetBSD: patch-core_CMakeLists.txt,v 1.1
set(ndmp "${ndmp}")
set(lmdb "${lmdb}")
set(build_client_only "${client-only}")
-@@ -666,7 +676,8 @@ if(${acl})
+@@ -662,7 +672,8 @@ if(${acl})
set(HAVE_ACL 1)
message(STATUS "acl found, libs: ${ACL_LIBS}")
else()
Index: pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosCheckIncludes.cmake
diff -u pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosCheckIncludes.cmake:1.1 pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosCheckIncludes.cmake:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosCheckIncludes.cmake:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosCheckIncludes.cmake Mon Feb 1 09:08:43 2021
@@ -1,24 +1,23 @@
-$NetBSD: patch-core_cmake_BareosCheckIncludes.cmake,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_cmake_BareosCheckIncludes.cmake,v 1.2 2021/02/01 09:08:43 kardel Exp $
Fix header file checks for NetBSD
---- core/cmake/BareosCheckIncludes.cmake.orig 2020-04-16 08:31:41.000000000 +0000
+--- core/cmake/BareosCheckIncludes.cmake.orig 2020-12-16 07:46:16.000000000 +0000
+++ core/cmake/BareosCheckIncludes.cmake
-@@ -55,7 +55,7 @@ check_include_files(sys/dl.h HAVE_SYS_DL
+@@ -38,7 +38,7 @@ check_include_files(sys/bitypes.h HAVE_S
+ check_include_files(sys/capability.h HAVE_SYS_CAPABILITY_H)
check_include_files(sys/ea.h HAVE_SYS_EA_H)
check_include_files("sys/types.h;sys/extattr.h" HAVE_SYS_EXTATTR_H)
- check_include_files(sys/ioctl.h HAVE_SYS_IOCTL_H)
-check_include_files(sys/mtio.h HAVE_SYS_MTIO_H)
+check_include_files("sys/types.h;sys/mtio.h" HAVE_SYS_MTIO_H)
- check_include_files(sys/ndir.h HAVE_SYS_NDIR_H)
check_include_files(sys/nvpair.h HAVE_SYS_NVPAIR_H)
- check_include_files(sys/select.h HAVE_SYS_SELECT_H)
-@@ -134,7 +134,7 @@ check_include_files("sys/types.h;sys/scs
- HAVE_SYS_SCSI_IMPL_USCSI_H)
+
+ check_include_files("sys/types.h;sys/tape.h" HAVE_SYS_TAPE_H)
+@@ -88,6 +88,6 @@ check_include_files(
+ )
check_include_files("stdio.h;camlib.h" HAVE_CAMLIB_H)
check_include_files(cam/scsi/scsi_message.h HAVE_CAM_SCSI_SCSI_MESSAGE_H)
-check_include_files(dev/scsipi/scsipi_all.h HAVE_DEV_SCSIPI_SCSIPI_ALL_H)
+check_include_files("sys/types.h;dev/scsipi/scsipi_all.h" HAVE_DEV_SCSIPI_SCSIPI_ALL_H)
check_include_files(scsi/uscsi_all.h HAVE_USCSI_ALL_H)
- check_include_files(scsi/uscsi_all.h HAVE_SCSI_USCSI_ALL_H)
Index: pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosFindAllLibraries.cmake
diff -u pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosFindAllLibraries.cmake:1.1 pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosFindAllLibraries.cmake:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosFindAllLibraries.cmake:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosFindAllLibraries.cmake Mon Feb 1 09:08:43 2021
@@ -1,17 +1,24 @@
-$NetBSD: patch-core_cmake_BareosFindAllLibraries.cmake,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_cmake_BareosFindAllLibraries.cmake,v 1.2 2021/02/01 09:08:43 kardel Exp $
-provide a way to disable googletest which may be found by
-cmake but it is not in buildlink. can be optionalized
-later.
+ cmake build gets confused when both versions of python 2 and 3 are
+ availabe. as python 2.7 is eol prefer python 3 in this case.
---- core/cmake/BareosFindAllLibraries.cmake.orig 2020-06-23 13:14:52.254196443 +0000
+--- core/cmake/BareosFindAllLibraries.cmake.orig 2020-12-16 07:46:16.000000000 +0000
+++ core/cmake/BareosFindAllLibraries.cmake
-@@ -82,7 +82,7 @@ bareosfindlibrary("util")
- bareosfindlibrary("dl")
- bareosfindlibrary("acl")
- # BareosFindLibrary("wrap")
--if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES SunPro)
-+if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES SunPro AND NOT SKIP_GTEST)
- bareosfindlibrary("gtest")
- bareosfindlibrary("gtest_main")
- bareosfindlibrary("gmock")
+@@ -44,7 +44,7 @@ else()
+ set(HAVE_PYTHON 1)
+ endif()
+
+- if(${Python2_FOUND})
++ if(${Python2_FOUND} AND NOT ${Python3_FOUND})
+ set(PYTHON_EXECUTABLE
+ ${Python2_EXECUTABLE}
+ PARENT_SCOPE
+@@ -62,6 +62,7 @@ else()
+ endif()
+
+ if(${Python3_FOUND})
++ set(Python2_FOUND 0)
+ set(PYTHON_EXECUTABLE
+ ${Python3_EXECUTABLE}
+ PARENT_SCOPE
Index: pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake
diff -u pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake:1.1 pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake Mon Feb 1 09:08:43 2021
@@ -1,11 +1,11 @@
-$NetBSD: patch-core_cmake_BareosFindPrograms.cmake,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_cmake_BareosFindPrograms.cmake,v 1.2 2021/02/01 09:08:43 kardel Exp $
the pkgsrc build system provides awk on the path.
- The cmake build system uses this build path for
+ the cmake build system uses this build path for
installed scripts - change the way the awk path
is found.
---- core/cmake/BareosFindPrograms.cmake.orig 2020-07-09 17:39:20.000000000 +0000
+--- core/cmake/BareosFindPrograms.cmake.orig 2020-12-16 07:46:16.000000000 +0000
+++ core/cmake/BareosFindPrograms.cmake
@@ -18,10 +18,14 @@
# 02110-1301, USA.
Index: pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake
diff -u pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake:1.1 pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake Mon Feb 1 09:08:43 2021
@@ -1,64 +1,64 @@
-$NetBSD: patch-core_cmake_BareosInstallConfigFiles.cmake,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_cmake_BareosInstallConfigFiles.cmake,v 1.2 2021/02/01 09:08:43 kardel Exp $
- The original build source is lax on the permissions.
- Adjust permission to match pkgsrc expectations.
+ the original build source is lax on the permissions.
+ adjust permissions to match pkgsrc expectations.
---- core/cmake/BareosInstallConfigFiles.cmake.orig 2020-07-09 17:39:20.000000000 +0000
+--- core/cmake/BareosInstallConfigFiles.cmake.orig 2021-01-22 12:52:32.430510739 +0000
+++ core/cmake/BareosInstallConfigFiles.cmake
-@@ -69,6 +69,7 @@ macro(
- file(
- INSTALL "${configfile}.new"
- DESTINATION "${DESTCONFDIR}/${resname}"
-+ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
- )
+@@ -61,13 +61,15 @@ macro(BareosInstallConfigFiles CONFDIR C
+ file(RENAME "${configfile}" "${configfile}.new")
+
+ message(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}")
+- file(COPY "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}")
++ file(COPY "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}"
++ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ)
file(RENAME "${configfile}.new" "${configfile}")
else()
-@@ -76,7 +77,8 @@ macro(
- STATUS
- "${resname}/${fname} as ${resname}/${fname} (new installation)"
+ message(
+ STATUS "${resname}/${fname} as ${resname}/${fname} (new installation)"
)
- file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
-+ file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}"
++ file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}"
+ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ)
endif()
endforeach()
endforeach()
-@@ -121,6 +123,7 @@ macro(
- file(
- COPY "${BackendConfigSrcDir}/${configfile}.new"
- DESTINATION "${DESTCONFDIR}/${dir}"
-+ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
+@@ -111,6 +113,7 @@ macro(BareosInstallConfigFiles CONFDIR C
+ )
+ file(COPY "${BackendConfigSrcDir}/${configfile}.new"
+ DESTINATION "${DESTCONFDIR}/${dir}"
++ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
)
file(RENAME "${BackendConfigSrcDir}/${configfile}.new"
- "${BackendConfigSrcDir}/${configfile}")
-@@ -129,6 +132,7 @@ macro(
- file(
- COPY "${BackendConfigSrcDir}/${configfile}"
- DESTINATION "${DESTCONFDIR}/${dir}"
-+ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
+ "${BackendConfigSrcDir}/${configfile}"
+@@ -119,6 +122,7 @@ macro(BareosInstallConfigFiles CONFDIR C
+ message(STATUS "${configfile} as ${configfile}")
+ file(COPY "${BackendConfigSrcDir}/${configfile}"
+ DESTINATION "${DESTCONFDIR}/${dir}"
++ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
)
endif()
endforeach()
-@@ -151,6 +155,7 @@ macro(
- file(
- COPY "${BackendConfigSrcDir}/${configfile}"
- DESTINATION "${DESTCONFDIR}/${dir}"
-+ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+@@ -140,6 +144,7 @@ macro(BareosInstallConfigFiles CONFDIR C
+
+ file(COPY "${BackendConfigSrcDir}/${configfile}"
+ DESTINATION "${DESTCONFDIR}/${dir}"
++ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
)
endforeach()
-@@ -183,11 +188,14 @@ macro(
- file(
- COPY "${configfile}.new"
- DESTINATION "${DESTCONFDIR}/${resname}"
-+ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+@@ -175,11 +180,14 @@ macro(BareosInstallConfigFiles CONFDIR C
+ file(RENAME "${configfile}" "${configfile}.new")
+ file(COPY "${configfile}.new"
+ DESTINATION "${DESTCONFDIR}/${resname}"
++ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
)
file(RENAME "${configfile}.new" "${configfile}")
else()
message(STATUS "${resname}/${fname} as ${resname}/${fname}")
- file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
+ file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}"
-+ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
++ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
+ )
endif()
else()
Index: pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosSetVariableDefaults.cmake
diff -u pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosSetVariableDefaults.cmake:1.1 pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosSetVariableDefaults.cmake:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosSetVariableDefaults.cmake:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosSetVariableDefaults.cmake Mon Feb 1 09:08:43 2021
@@ -1,19 +1,10 @@
-$NetBSD: patch-core_cmake_BareosSetVariableDefaults.cmake,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_cmake_BareosSetVariableDefaults.cmake,v 1.2 2021/02/01 09:08:43 kardel Exp $
-provide absolute paths
+ disable ndmp due to missing xdr marshalling code
---- core/cmake/BareosSetVariableDefaults.cmake.orig 2020-06-22 13:09:58.135202289 +0000
+--- core/cmake/BareosSetVariableDefaults.cmake.orig 2020-12-16 07:46:16.000000000 +0000
+++ core/cmake/BareosSetVariableDefaults.cmake
-@@ -124,7 +124,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin"
-
- # logdir
- if(NOT DEFINED logdir)
-- set(logdir "${CMAKE_INSTALL_LOCALSTATEDIR}/log/${CMAKE_PROJECT_NAME}")
-+ set(logdir "/${CMAKE_INSTALL_LOCALSTATEDIR}/log/${CMAKE_PROJECT_NAME}")
- endif()
-
- # datarootdir
-@@ -412,6 +412,8 @@ endif()
+@@ -413,6 +413,8 @@ endif()
# ndmp
if(NOT DEFINED ndmp)
set(ndmp ON)
Index: pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosTimeFunctions.cmake
diff -u pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosTimeFunctions.cmake:1.1 pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosTimeFunctions.cmake:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosTimeFunctions.cmake:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_cmake_BareosTimeFunctions.cmake Mon Feb 1 09:08:43 2021
@@ -1,17 +1,15 @@
-$NetBSD: patch-core_cmake_BareosTimeFunctions.cmake,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_cmake_BareosTimeFunctions.cmake,v 1.2 2021/02/01 09:08:43 kardel Exp $
-Use the POSIX compatible way of doing date calculations.
+ use the POSIX compatible way of doing date calculations.
---- core/cmake/BareosTimeFunctions.cmake.orig 2020-04-16 08:31:41.000000000 +0000
+--- core/cmake/BareosTimeFunctions.cmake.orig 2021-01-22 12:44:55.503593980 +0000
+++ core/cmake/BareosTimeFunctions.cmake
-@@ -37,8 +37,8 @@ function(
+@@ -30,7 +30,7 @@ function(timestamp_at at result format)
+ set(old_lang "$ENV{LC_ALL}")
+ set(ENV{LC_ALL} "C")
execute_process(
- COMMAND
- ${DATECMD}
-- --utc
-- "--date=@${at}"
-+ -u
-+ "-d @${at}"
- "+${format}"
+- COMMAND ${DATECMD} --utc "--date=@${at}" "+${format}"
++ COMMAND ${DATECMD} -u "--date=@${at}" "+${format}"
OUTPUT_VARIABLE out
OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
Index: pkgsrc/sysutils/bareos/patches/patch-core_platforms_netbsd_CMakeLists.txt
diff -u pkgsrc/sysutils/bareos/patches/patch-core_platforms_netbsd_CMakeLists.txt:1.1 pkgsrc/sysutils/bareos/patches/patch-core_platforms_netbsd_CMakeLists.txt:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_platforms_netbsd_CMakeLists.txt:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_platforms_netbsd_CMakeLists.txt Mon Feb 1 09:08:43 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-core_platforms_netbsd_CMakeLists.txt,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_platforms_netbsd_CMakeLists.txt,v 1.2 2021/02/01 09:08:43 kardel Exp $
- Add installation of chio-changer script
+ add installation of chio-changer script
---- core/platforms/netbsd/CMakeLists.txt.orig 2019-04-01 11:02:03.728443554 +0000
+--- core/platforms/netbsd/CMakeLists.txt.orig 2021-01-21 10:16:11.935292480 +0000
+++ core/platforms/netbsd/CMakeLists.txt
@@ -0,0 +1,11 @@
+# NetBSD specifics
Index: pkgsrc/sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer
diff -u pkgsrc/sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer:1.1 pkgsrc/sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer Mon Feb 1 09:08:43 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-core_platforms_netbsd_chio-changer,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_platforms_netbsd_chio-changer,v 1.2 2021/02/01 09:08:43 kardel Exp $
NetBSD changer script using NetBSD chio command
---- core/platforms/netbsd/chio-changer.orig 2020-07-22 11:05:39.078612642 +0000
+--- core/platforms/netbsd/chio-changer.orig 2021-01-21 10:16:11.945124363 +0000
+++ core/platforms/netbsd/chio-changer
@@ -0,0 +1,134 @@
+#!/bin/sh
Index: pkgsrc/sysutils/bareos/patches/patch-core_scripts_CMakeLists.txt
diff -u pkgsrc/sysutils/bareos/patches/patch-core_scripts_CMakeLists.txt:1.1 pkgsrc/sysutils/bareos/patches/patch-core_scripts_CMakeLists.txt:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_scripts_CMakeLists.txt:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_scripts_CMakeLists.txt Mon Feb 1 09:08:43 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-core_scripts_CMakeLists.txt,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_scripts_CMakeLists.txt,v 1.2 2021/02/01 09:08:43 kardel Exp $
suppress mtx-changer installation if not found
---- core/scripts/CMakeLists.txt.orig 2020-07-09 17:39:20.000000000 +0000
+--- core/scripts/CMakeLists.txt.orig 2020-12-16 07:46:16.000000000 +0000
+++ core/scripts/CMakeLists.txt
-@@ -35,25 +35,37 @@ install(
+@@ -36,25 +36,37 @@ install(
install(
FILES bareos btraceback.gdb btraceback.dbx btraceback.mdb bareos-config
bareos-config-lib.sh bareos-ctl-funcs
Index: pkgsrc/sysutils/bareos/patches/patch-core_scripts_bareos-config-lib.sh.in
diff -u pkgsrc/sysutils/bareos/patches/patch-core_scripts_bareos-config-lib.sh.in:1.1 pkgsrc/sysutils/bareos/patches/patch-core_scripts_bareos-config-lib.sh.in:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_scripts_bareos-config-lib.sh.in:1.1 Tue Aug 25 08:32:14 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_scripts_bareos-config-lib.sh.in Mon Feb 1 09:08:43 2021
@@ -1,15 +1,15 @@
-$NetBSD: patch-core_scripts_bareos-config-lib.sh.in,v 1.1 2020/08/25 08:32:14 kardel Exp $
+$NetBSD: patch-core_scripts_bareos-config-lib.sh.in,v 1.2 2021/02/01 09:08:43 kardel Exp $
add $PREFIX/{bin,sbin} to PATH to avoid tripping over
missing commands (like db programs)
---- core/scripts/bareos-config-lib.sh.in.orig 2020-08-25 07:03:03.539870629 +0000
+--- core/scripts/bareos-config-lib.sh.in.orig 2020-12-16 07:46:16.000000000 +0000
+++ core/scripts/bareos-config-lib.sh.in
-@@ -4,6 +4,7 @@ BAREOS_CONFIG_DIR=${BAREOS_CONFIG_DIR:-@
+@@ -23,6 +23,7 @@ BAREOS_CONFIG_DIR=${BAREOS_CONFIG_DIR:-@
BAREOS_SBIN_DIR=${BAREOS_SBIN_DIR:-@sbindir@}
DBCHECK="${BAREOS_SBIN_DIR}/bareos-dbcheck -c ${BAREOS_CONFIG_DIR} -B"
AWK="@AWK@"
-+PATH=${PATH}:@bindir@:@sbindir@
++PATH=@PREFIX@/bin:@PREFIX@/sbin:${PATH}
SEC_GROUPS="tape disk"
Index: pkgsrc/sysutils/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in
diff -u pkgsrc/sysutils/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in:1.1 pkgsrc/sysutils/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in Mon Feb 1 09:08:43 2021
@@ -1,15 +1,9 @@
-$NetBSD: patch-core_src_cats_make__catalog__backup.pl.in,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_cats_make__catalog__backup.pl.in,v 1.2 2021/02/01 09:08:43 kardel Exp $
- XXX sort of works, but should ge generalized
+ include ${PREFIX}/{bin,sbin} in path to find db programs/tools
--- core/src/cats/make_catalog_backup.pl.in.orig 2020-07-09 17:39:20.000000000 +0000
+++ core/src/cats/make_catalog_backup.pl.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!@PREFIX@/bin/perl
- use strict;
-
- =head1 SCRIPT
@@ -36,6 +36,7 @@ use strict;
my $cat = shift or die "Usage: $0 catalogname";
my $dir_conf='@sbindir@/bareos-dbcheck -B -c @confdir@';
Index: pkgsrc/sysutils/bareos/patches/patch-core_src_cats_postgresql__queries.inc
diff -u pkgsrc/sysutils/bareos/patches/patch-core_src_cats_postgresql__queries.inc:1.1 pkgsrc/sysutils/bareos/patches/patch-core_src_cats_postgresql__queries.inc:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_src_cats_postgresql__queries.inc:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_cats_postgresql__queries.inc Mon Feb 1 09:08:43 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-core_src_cats_postgresql__queries.inc,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_cats_postgresql__queries.inc,v 1.2 2021/02/01 09:08:43 kardel Exp $
- Disambuguate reference columns
+ disambiguate reference columns
---- core/src/cats/postgresql_queries.inc.orig 2019-01-31 11:53:07.846130361 +0000
+--- core/src/cats/postgresql_queries.inc.orig 2020-12-16 07:46:16.000000000 +0000
+++ core/src/cats/postgresql_queries.inc
-@@ -170,7 +170,7 @@ const char *BareosDbPostgresql::query_de
+@@ -171,7 +171,7 @@ const char *BareosDbPostgresql::query_de
,
/* 0016_uar_list_jobs */
@@ -13,7 +13,7 @@ $NetBSD: patch-core_src_cats_postgresql_
"FROM Client, Job "
"WHERE Client.ClientId = Job.ClientId "
"AND JobStatus IN ('T','W') "
-@@ -179,7 +179,7 @@ const char *BareosDbPostgresql::query_de
+@@ -180,7 +180,7 @@ const char *BareosDbPostgresql::query_de
,
/* 0017_uar_print_jobs */
Index: pkgsrc/sysutils/bareos/patches/patch-core_src_dird_dird__conf.cc
diff -u pkgsrc/sysutils/bareos/patches/patch-core_src_dird_dird__conf.cc:1.1 pkgsrc/sysutils/bareos/patches/patch-core_src_dird_dird__conf.cc:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_src_dird_dird__conf.cc:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_dird_dird__conf.cc Mon Feb 1 09:08:43 2021
@@ -1,16 +1,16 @@
-$NetBSD: patch-core_src_dird_dird__conf.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_dird_dird__conf.cc,v 1.2 2021/02/01 09:08:43 kardel Exp $
- Add dumping of Honor No Dump Flag
+ add dumping of Honor No Dump Flag
---- core/src/dird/dird_conf.cc.orig 2020-04-16 08:31:41.000000000 +0000
+--- core/src/dird/dird_conf.cc.orig 2021-01-22 16:02:33.229527262 +0000
+++ core/src/dird/dird_conf.cc
-@@ -2006,6 +2006,9 @@ bool FilesetResource::PrintConfig(PoolMe
- case 'M': /* MD5 */
- IndentConfigItem(cfg_str, 3, "Signature = MD5\n");
- break;
-+ case 'N': /* Honor No Dump Flag */
-+ IndentConfigItem(cfg_str, 3, "Honor No Dump Flag = Yes\n");
-+ break;
- case 'n':
- IndentConfigItem(cfg_str, 3, "Replace = Never\n");
- break;
+@@ -1981,6 +1981,9 @@ void FilesetResource::PrintConfigInclude
+ case 'M': /* MD5 */
+ send.KeyQuotedString("Signature", "MD5");
+ break;
++ case 'N': /* honor nodump flag */
++ send.KeyBool("HonornoDumpFlag", true);
++ break;
+ case 'n':
+ send.KeyQuotedString("Replace", "Never");
+ break;
Index: pkgsrc/sysutils/bareos/patches/patch-core_src_filed_accurate__lmdb.cc
diff -u pkgsrc/sysutils/bareos/patches/patch-core_src_filed_accurate__lmdb.cc:1.1 pkgsrc/sysutils/bareos/patches/patch-core_src_filed_accurate__lmdb.cc:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_src_filed_accurate__lmdb.cc:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_filed_accurate__lmdb.cc Mon Feb 1 09:08:43 2021
@@ -1,9 +1,9 @@
-$NetBSD: patch-core_src_filed_accurate__lmdb.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_filed_accurate__lmdb.cc,v 1.2 2021/02/01 09:08:43 kardel Exp $
avoid uninitialized member crash.
lmdb not verified to be working correctly though.
---- core/src/filed/accurate_lmdb.cc.orig 2020-07-17 12:18:09.949358135 +0000
+--- core/src/filed/accurate_lmdb.cc.orig 2020-12-16 07:46:16.000000000 +0000
+++ core/src/filed/accurate_lmdb.cc
@@ -45,6 +45,7 @@ static int debuglevel = 100;
BareosAccurateFilelistLmdb::BareosAccurateFilelistLmdb(JobControlRecord* jcr,
Index: pkgsrc/sysutils/bareos/patches/patch-core_src_findlib_acl.cc
diff -u pkgsrc/sysutils/bareos/patches/patch-core_src_findlib_acl.cc:1.1 pkgsrc/sysutils/bareos/patches/patch-core_src_findlib_acl.cc:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_src_findlib_acl.cc:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_findlib_acl.cc Mon Feb 1 09:08:43 2021
@@ -1,65 +1,71 @@
-$NetBSD: patch-core_src_findlib_acl.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_findlib_acl.cc,v 1.2 2021/02/01 09:08:43 kardel Exp $
make ACL compile on NetBSD (10.x onward)
---- core/src/findlib/acl.cc.orig 2020-04-16 08:31:41.000000000 +0000
+--- core/src/findlib/acl.cc.orig 2020-12-16 07:46:16.000000000 +0000
+++ core/src/findlib/acl.cc
-@@ -552,7 +552,8 @@ static bacl_exit_code (*os_parse_acl_str
+@@ -34,6 +34,7 @@
+ * - AIX (pre-5.3 and post 5.3 acls, acl_get and aclx_get interface)
+ * - Darwin
+ * - FreeBSD (POSIX and NFSv4/ZFS acls)
++ * - NetBSD (POSIX and NFSv4/ZFS acls)
+ * - GNU Hurd
+ * - HPUX
+ * - IRIX
+@@ -556,6 +557,7 @@ static bacl_exit_code (*os_parse_acl_str
+ = aix_parse_acl_streams;
+
+ # elif defined(HAVE_DARWIN_OS) || defined(HAVE_FREEBSD_OS) \
++ || defined(HAVE_NETBSD_OS) \
+ || defined(HAVE_IRIX_OS) || defined(HAVE_OSF1_OS) \
+ || defined(HAVE_LINUX_OS) || defined(HAVE_HURD_OS)
- #elif defined(HAVE_DARWIN_OS) || defined(HAVE_FREEBSD_OS) || \
- defined(HAVE_IRIX_OS) || defined(HAVE_OSF1_OS) || \
-- defined(HAVE_LINUX_OS) || defined(HAVE_HURD_OS)
-+ defined(HAVE_NETBSD_OS) || defined(HAVE_LINUX_OS) || \
-+ defined(HAVE_HURD_OS)
-
- #include <sys/types.h>
-
-@@ -590,7 +591,7 @@ static bacl_exit_code (*os_parse_acl_str
+@@ -595,7 +597,7 @@ static bacl_exit_code (*os_parse_acl_str
/**
* On FreeBSD we can get numeric ACLs
*/
--#if defined(HAVE_FREEBSD_OS)
-+#if defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)
- #if defined(BACL_WANT_NUMERIC_IDS)
- #define BACL_ALTERNATE_TEXT ACL_TEXT_NUMERIC_IDS
- #endif
-@@ -652,7 +653,7 @@ static acl_type_t BacToOsAcltype(bacl_ty
- static int AclCountEntries(acl_t acl)
+-# if defined(HAVE_FREEBSD_OS)
++# if defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)
+ # if defined(BACL_WANT_NUMERIC_IDS)
+ # define BACL_ALTERNATE_TEXT ACL_TEXT_NUMERIC_IDS
+ # endif
+@@ -658,7 +660,7 @@ static int AclCountEntries(acl_t acl)
{
int count = 0;
--#if defined(HAVE_FREEBSD_OS) || defined(HAVE_LINUX_OS) || defined(HAVE_HURD_OS)
-+#if defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS) || defined(HAVE_LINUX_OS) || defined(HAVE_HURD_OS)
+ # if defined(HAVE_FREEBSD_OS) || defined(HAVE_LINUX_OS) \
+- || defined(HAVE_HURD_OS)
++ || defined(HAVE_HURD_OS) || defined(HAVE_NETBSD_OS)
acl_entry_t ace;
int entry_available;
-@@ -693,7 +694,7 @@ static bool AclIsTrivial(acl_t acl)
- */
+@@ -700,7 +702,7 @@ static bool AclIsTrivial(acl_t acl)
acl_entry_t ace;
acl_tag_t tag;
--#if defined(HAVE_FREEBSD_OS) || defined(HAVE_LINUX_OS) || defined(HAVE_HURD_OS)
-+#if defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS) || defined(HAVE_LINUX_OS) || defined(HAVE_HURD_OS)
+ # if defined(HAVE_FREEBSD_OS) || defined(HAVE_LINUX_OS) \
+- || defined(HAVE_HURD_OS)
++ || defined(HAVE_HURD_OS) || defined(HAVE_NETBSD_OS)
int entry_available;
entry_available = acl_get_entry(acl, ACL_FIRST_ENTRY, &ace);
-@@ -793,7 +794,7 @@ static bacl_exit_code generic_get_acl_fr
+@@ -800,7 +802,7 @@ static bacl_exit_code generic_get_acl_fr
goto bail_out;
}
- #endif
--#if defined(HAVE_FREEBSD_OS) && defined(_PC_ACL_NFS4)
-+#if (defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)) && defined(_PC_ACL_NFS4)
+ # endif
+-# if defined(HAVE_FREEBSD_OS) && defined(_PC_ACL_NFS4)
++# if (defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)) && defined(_PC_ACL_NFS4)
if (acltype == BACL_TYPE_NFS4) {
int trivial;
if (acl_is_trivial_np(acl, &trivial) == 0) {
-@@ -1066,7 +1067,7 @@ static bacl_exit_code (*os_parse_acl_str
- uint32_t content_length) =
- darwin_parse_acl_streams;
+@@ -1073,7 +1075,7 @@ static bacl_exit_code (*os_parse_acl_str
+ uint32_t content_length)
+ = darwin_parse_acl_streams;
--#elif defined(HAVE_FREEBSD_OS)
-+#elif defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)
+-# elif defined(HAVE_FREEBSD_OS)
++# elif defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)
/**
* Define the supported ACL streams for these OSes
*/
-@@ -1091,6 +1092,8 @@ static bacl_exit_code freebsd_build_acl_
+@@ -1098,6 +1100,8 @@ static bacl_exit_code freebsd_build_acl_
BErrNo be;
switch (errno) {
@@ -68,7 +74,7 @@ $NetBSD: patch-core_src_findlib_acl.cc,v
case ENOENT:
return bacl_exit_ok;
default:
-@@ -1119,6 +1122,8 @@ static bacl_exit_code freebsd_build_acl_
+@@ -1126,6 +1130,8 @@ static bacl_exit_code freebsd_build_acl_
BErrNo be;
switch (errno) {
Index: pkgsrc/sysutils/bareos/patches/patch-core_src_findlib_find__one.cc
diff -u pkgsrc/sysutils/bareos/patches/patch-core_src_findlib_find__one.cc:1.1 pkgsrc/sysutils/bareos/patches/patch-core_src_findlib_find__one.cc:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_src_findlib_find__one.cc:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_findlib_find__one.cc Mon Feb 1 09:08:43 2021
@@ -1,15 +1,15 @@
-$NetBSD: patch-core_src_findlib_find__one.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_findlib_find__one.cc,v 1.2 2021/02/01 09:08:43 kardel Exp $
- Simplify UF_NODUMP test
+ simplify UF_NODUMP test
---- core/src/findlib/find_one.cc.orig 2020-04-16 08:31:41.000000000 +0000
+--- core/src/findlib/find_one.cc.orig 2021-01-22 13:22:58.585014513 +0000
+++ core/src/findlib/find_one.cc
-@@ -206,7 +206,7 @@ static bool VolumeHasAttrlist(const char
+@@ -208,7 +208,7 @@ static bool VolumeHasAttrlist(const char
*/
static inline bool no_dump(JobControlRecord* jcr, FindFilesPacket* ff_pkt)
{
-#if defined(HAVE_CHFLAGS) && defined(UF_NODUMP)
+#if defined(UF_NODUMP)
- if (BitIsSet(FO_HONOR_NODUMP, ff_pkt->flags) &&
- (ff_pkt->statp.st_flags & UF_NODUMP)) {
+ if (BitIsSet(FO_HONOR_NODUMP, ff_pkt->flags)
+ && (ff_pkt->statp.st_flags & UF_NODUMP)) {
Jmsg(jcr, M_INFO, 1, _(" NODUMP flag set - will not process %s\n"),
Index: pkgsrc/sysutils/bareos/patches/patch-core_src_lib_scsi__lli.cc
diff -u pkgsrc/sysutils/bareos/patches/patch-core_src_lib_scsi__lli.cc:1.1 pkgsrc/sysutils/bareos/patches/patch-core_src_lib_scsi__lli.cc:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_src_lib_scsi__lli.cc:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_lib_scsi__lli.cc Mon Feb 1 09:08:43 2021
@@ -1,18 +1,18 @@
-$NetBSD: patch-core_src_lib_scsi__lli.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_lib_scsi__lli.cc,v 1.2 2021/02/01 09:08:43 kardel Exp $
- Fix coding - was probably never tested with scsi-crypto flag
+ fix coding - was probably never tested with scsi-crypto flag
---- core/src/lib/scsi_lli.cc.orig 2020-04-16 08:31:41.000000000 +0000
+--- core/src/lib/scsi_lli.cc.orig 2020-12-16 07:46:16.000000000 +0000
+++ core/src/lib/scsi_lli.cc
-@@ -410,6 +410,7 @@ bool CheckScsiAtEod(int fd) { return fal
- #elif defined(HAVE_NETBSD_OS) || defined(HAVE_OPENBSD_OS)
+@@ -411,6 +411,7 @@ bool CheckScsiAtEod(int fd) { return fal
+ # elif defined(HAVE_NETBSD_OS) || defined(HAVE_OPENBSD_OS)
- #if defined(HAVE_NETBSD_OS)
-+#include <sys/scsiio.h>
- #include <dev/scsipi/scsipi_all.h>
- #else
- #include <scsi/uscsi_all.h>
-@@ -432,7 +433,7 @@ static inline bool do_scsi_cmd_page(int
+ # if defined(HAVE_NETBSD_OS)
++# include <sys/scsiio.h>
+ # include <dev/scsipi/scsipi_all.h>
+ # else
+ # include <scsi/uscsi_all.h>
+@@ -433,7 +434,7 @@ static inline bool do_scsi_cmd_page(int
{
int rc;
scsireq_t req;
@@ -21,7 +21,7 @@ $NetBSD: patch-core_src_lib_scsi__lli.cc
bool opened_device = false;
bool retval = false;
-@@ -476,20 +477,18 @@ static inline bool do_scsi_cmd_page(int
+@@ -477,20 +478,18 @@ static inline bool do_scsi_cmd_page(int
retval = true;
break;
case SCCMD_SENSE:
Index: pkgsrc/sysutils/bareos/patches/patch-core_src_lib_scsi__tapealert.cc
diff -u pkgsrc/sysutils/bareos/patches/patch-core_src_lib_scsi__tapealert.cc:1.1 pkgsrc/sysutils/bareos/patches/patch-core_src_lib_scsi__tapealert.cc:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_src_lib_scsi__tapealert.cc:1.1 Fri Aug 21 06:01:36 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_lib_scsi__tapealert.cc Mon Feb 1 09:08:43 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-core_src_lib_scsi__tapealert.cc,v 1.1 2020/08/21 06:01:36 kardel Exp $
+$NetBSD: patch-core_src_lib_scsi__tapealert.cc,v 1.2 2021/02/01 09:08:43 kardel Exp $
fix result bit setting by keeping the uint64_t type and
not trip over endian issues and off by one errors for
result_index == 64.
---- core/src/lib/scsi_tapealert.cc.orig 2020-08-20 16:04:40.584902268 +0000
+--- core/src/lib/scsi_tapealert.cc.orig 2020-12-16 07:46:16.000000000 +0000
+++ core/src/lib/scsi_tapealert.cc
@@ -172,7 +172,7 @@ bool GetTapealertFlags(int fd, const cha
if (result_index == tapealert_mappings[j].flag) {
Index: pkgsrc/sysutils/bareos/patches/patch-core_src_stored_btape.cc
diff -u pkgsrc/sysutils/bareos/patches/patch-core_src_stored_btape.cc:1.1 pkgsrc/sysutils/bareos/patches/patch-core_src_stored_btape.cc:1.2
--- pkgsrc/sysutils/bareos/patches/patch-core_src_stored_btape.cc:1.1 Tue Jul 28 06:36:29 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_stored_btape.cc Mon Feb 1 09:08:44 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-core_src_stored_btape.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_stored_btape.cc,v 1.2 2021/02/01 09:08:44 kardel Exp $
- Add missing free*() calls to keep smartalloc happy
+ add missing free*() calls
---- core/src/stored/btape.cc.orig 2020-04-16 08:31:41.000000000 +0000
+--- core/src/stored/btape.cc.orig 2020-12-16 07:46:16.000000000 +0000
+++ core/src/stored/btape.cc
-@@ -331,6 +331,7 @@ int main(int margc, char* margv[])
+@@ -327,6 +327,7 @@ int main(int margc, char* margv[])
static void TerminateBtape(int status)
{
@@ -12,7 +12,7 @@ $NetBSD: patch-core_src_stored_btape.cc,
FreeJcr(jcr);
jcr = NULL;
-@@ -369,6 +370,8 @@ static void TerminateBtape(int status)
+@@ -365,6 +366,8 @@ static void TerminateBtape(int status)
}
StopWatchdog();
@@ -21,7 +21,7 @@ $NetBSD: patch-core_src_stored_btape.cc,
TermMsg();
RecentJobResultsList::Cleanup();
CleanupJcrChain();
-@@ -377,7 +380,6 @@ static void TerminateBtape(int status)
+@@ -373,7 +376,6 @@ static void TerminateBtape(int status)
exit(status);
}
Index: pkgsrc/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c
diff -u pkgsrc/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c:1.2 pkgsrc/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c:1.3
--- pkgsrc/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c:1.2 Tue Aug 4 12:56:15 2020
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c Mon Feb 1 09:08:43 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-core_src_lmdb_mdb.c,v 1.2 2020/08/04 12:56:15 kardel Exp $
+$NetBSD: patch-core_src_lmdb_mdb.c,v 1.3 2021/02/01 09:08:43 kardel Exp $
use POSIX semaphores on NetBSD
---- core/src/lmdb/mdb.c.orig 2020-08-04 12:17:56.368741881 +0000
+--- core/src/lmdb/mdb.c.orig 2020-12-16 07:46:16.000000000 +0000
+++ core/src/lmdb/mdb.c
@@ -150,7 +150,11 @@ typedef SSIZE_T ssize_t;
Added files:
Index: pkgsrc/sysutils/bareos/PLIST
diff -u /dev/null pkgsrc/sysutils/bareos/PLIST:1.1
--- /dev/null Mon Feb 1 09:08:44 2021
+++ pkgsrc/sysutils/bareos/PLIST Mon Feb 1 09:08:43 2021
@@ -0,0 +1,252 @@
+@comment $NetBSD: PLIST,v 1.1 2021/02/01 09:08:43 kardel Exp $
+bin/bconsole
+bin/bregex
+bin/bsmtp
+bin/bwild
+include/bareos/address_conf.h
+include/bareos/alist.h
+include/bareos/attr.h
+include/bareos/baconfig.h
+include/bareos/bareos.h
+include/bareos/base64.h
+include/bareos/bc_types.h
+include/bareos/berrno.h
+include/bareos/bits.h
+include/bareos/bpipe.h
+include/bareos/breg.h
+include/bareos/bregex.h
+include/bareos/bsock.h
+include/bareos/bsock_tcp.h
+include/bareos/bstringlist.h
+include/bareos/btime.h
+include/bareos/btimers.h
+include/bareos/cbuf.h
+include/bareos/config.h
+include/bareos/crypto.h
+include/bareos/crypto_cache.h
+include/bareos/devlock.h
+include/bareos/dlist.h
+include/bareos/fnmatch.h
+include/bareos/guid_to_name.h
+include/bareos/htable.h
+include/bareos/ini.h
+include/bareos/jcr.h
+include/bareos/lex.h
+include/bareos/lib.h
+include/bareos/lockmgr.h
+include/bareos/mem_pool.h
+include/bareos/message.h
+include/bareos/messages_resource.h
+include/bareos/messages_resource_items.h
+include/bareos/mntent_cache.h
+include/bareos/parse_conf.h
+include/bareos/plugins.h
+include/bareos/qualified_resource_name_type_converter.h
+include/bareos/rblist.h
+include/bareos/runscript.h
+include/bareos/rwlock.h
+include/bareos/scsi_crypto.h
+include/bareos/scsi_lli.h
+include/bareos/scsi_tapealert.h
+include/bareos/serial.h
+include/bareos/status_packet.h
+include/bareos/thread_list.h
+include/bareos/tls.h
+include/bareos/tls_conf.h
+include/bareos/tree.h
+include/bareos/try_tls_handshake_as_a_server.h
+include/bareos/var.h
+include/bareos/version.h
+include/bareos/watchdog.h
+lib/bareos/backends/libbareoscats-postgresql.so
+lib/bareos/backends/libbareossd-fifo.so
+lib/bareos/backends/libbareossd-gentape.so
+lib/bareos/backends/libbareossd-tape.so
+lib/bareos/plugins/BareosDirPluginBaseclass.py
+lib/bareos/plugins/BareosDirWrapper.py
+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/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-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-sd-class-plugin.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-dir.so
+lib/bareos/plugins/python3-fd.so
+lib/bareos/plugins/python3-sd.so
+lib/bareos/plugins/scsicrypto-sd.so
+lib/bareos/plugins/scsitapealert-sd.so
+lib/bareos/scripts/bareos
+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/bareos-explorer
+lib/bareos/scripts/bareos-glusterfind-wrapper
+lib/bareos/scripts/btraceback.dbx
+lib/bareos/scripts/btraceback.gdb
+lib/bareos/scripts/btraceback.mdb
+lib/bareos/scripts/chio-changer
+lib/bareos/scripts/create_bareos_database
+lib/bareos/scripts/ddl/creates/postgresql.sql
+lib/bareos/scripts/ddl/drops/postgresql.sql
+lib/bareos/scripts/ddl/grants/postgresql-change_owner.dbconfig-template.sql
+lib/bareos/scripts/ddl/grants/postgresql-readonly.sql
+lib/bareos/scripts/ddl/grants/postgresql.sql
+lib/bareos/scripts/ddl/updates/postgresql.10_11.sql
+lib/bareos/scripts/ddl/updates/postgresql.11_12.sql
+lib/bareos/scripts/ddl/updates/postgresql.12_14.sql
+lib/bareos/scripts/ddl/updates/postgresql.14_2001.sql
+lib/bareos/scripts/ddl/updates/postgresql.2001_2002.sql
+lib/bareos/scripts/ddl/updates/postgresql.2002_2003.sql
+lib/bareos/scripts/ddl/updates/postgresql.2003_2004.sql
+lib/bareos/scripts/ddl/updates/postgresql.2004_2171.sql
+lib/bareos/scripts/ddl/updates/postgresql.2171_2192.sql
+lib/bareos/scripts/ddl/updates/postgresql.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/query.sql
+lib/bareos/scripts/update_bareos_tables
+lib/libbareos.so
+lib/libbareos.so.20
+lib/libbareos.so.${PKGVERSION}
+lib/libbareoscats.so
+lib/libbareoscats.so.20
+lib/libbareoscats.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}
+lib/libbareossd-gentape.so
+lib/libbareossd.so
+lib/libbareossql.so
+lib/libbareossql.so.20
+lib/libbareossql.so.${PKGVERSION}
+${PYSITELIB}/bareosdir.so
+${PYSITELIB}/bareosfd.so
+${PYSITELIB}/bareossd.so
+man/man1/bareos-tray-monitor.1
+man/man1/bconsole.1
+man/man1/bregex.1
+man/man1/bsmtp.1
+man/man1/bwild.1
+man/man8/bareos-dbcheck.8
+man/man8/bareos-dbcopy.8
+man/man8/bareos-dir.8
+man/man8/bareos-fd.8
+man/man8/bareos-sd.8
+man/man8/bareos.8
+man/man8/bcopy.8
+man/man8/bextract.8
+man/man8/bls.8
+man/man8/bpluginfo.8
+man/man8/bscan.8
+man/man8/bscrypto.8
+man/man8/btape.8
+man/man8/btraceback.8
+sbin/bareos
+sbin/bareos-dbcheck
+sbin/bareos-dbcopy
+sbin/bareos-dir
+sbin/bareos-fd
+sbin/bareos-sd
+sbin/bconsole
+sbin/bcopy
+sbin/bextract
+sbin/bls
+sbin/bpluginfo
+sbin/bregex
+sbin/bscan
+sbin/bscrypto
+sbin/bsmtp
+sbin/btape
+sbin/btestls
+sbin/btraceback
+sbin/bwild
+share/examples/bareos/configtemplates/bareos-dir.d/catalog/MyCatalog.conf
+share/examples/bareos/configtemplates/bareos-dir.d/client/bareos-fd.conf
+share/examples/bareos/configtemplates/bareos-dir.d/console/bareos-mon.conf
+share/examples/bareos/configtemplates/bareos-dir.d/director/bareos-dir.conf
+share/examples/bareos/configtemplates/bareos-dir.d/fileset/Catalog.conf
+share/examples/bareos/configtemplates/bareos-dir.d/fileset/LinuxAll.conf
+share/examples/bareos/configtemplates/bareos-dir.d/fileset/SelfTest.conf
+share/examples/bareos/configtemplates/bareos-dir.d/fileset/Windows All Drives.conf
+share/examples/bareos/configtemplates/bareos-dir.d/fileset/plugin-ldap.conf.example
+share/examples/bareos/configtemplates/bareos-dir.d/fileset/plugin-ovirt.conf.example
+share/examples/bareos/configtemplates/bareos-dir.d/job/BackupCatalog.conf
+share/examples/bareos/configtemplates/bareos-dir.d/job/RestoreFiles.conf
+share/examples/bareos/configtemplates/bareos-dir.d/job/backup-bareos-fd.conf
+share/examples/bareos/configtemplates/bareos-dir.d/job/backup-ldap.conf.example
+share/examples/bareos/configtemplates/bareos-dir.d/job/backup-ovirt.conf.example
+share/examples/bareos/configtemplates/bareos-dir.d/job/restore-ldap.conf.example
+share/examples/bareos/configtemplates/bareos-dir.d/jobdefs/DefaultJob.conf
+share/examples/bareos/configtemplates/bareos-dir.d/messages/Daemon.conf
+share/examples/bareos/configtemplates/bareos-dir.d/messages/Standard.conf
+share/examples/bareos/configtemplates/bareos-dir.d/pool/Differential.conf
+share/examples/bareos/configtemplates/bareos-dir.d/pool/Full.conf
+share/examples/bareos/configtemplates/bareos-dir.d/pool/Incremental.conf
+share/examples/bareos/configtemplates/bareos-dir.d/pool/Scratch.conf
+share/examples/bareos/configtemplates/bareos-dir.d/profile/operator.conf
+share/examples/bareos/configtemplates/bareos-dir.d/schedule/WeeklyCycle.conf
+share/examples/bareos/configtemplates/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf
+share/examples/bareos/configtemplates/bareos-dir.d/storage/File.conf
+share/examples/bareos/configtemplates/bareos-dir.d/storage/NULL.conf.example
+share/examples/bareos/configtemplates/bareos-dir.d/storage/Tape.conf.example
+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/bareos-regress.conf
+share/examples/bareos/configtemplates/bareos-sd.d/autochanger/autochanger-0.conf.example
+share/examples/bareos/configtemplates/bareos-sd.d/device/FileStorage.conf
+share/examples/bareos/configtemplates/bareos-sd.d/device/NULL.conf.example
+share/examples/bareos/configtemplates/bareos-sd.d/device/tapedrive-0.conf.example
+share/examples/bareos/configtemplates/bareos-sd.d/director/bareos-dir.conf
+share/examples/bareos/configtemplates/bareos-sd.d/director/bareos-mon.conf
+share/examples/bareos/configtemplates/bareos-sd.d/messages/Standard.conf
+share/examples/bareos/configtemplates/bareos-sd.d/storage/bareos-sd.conf
+share/examples/bareos/configtemplates/bconsole.conf
+@pkgdir share/examples/bareos/configtemplates/bareos-sd.d/ndmp
+@pkgdir share/examples/bareos/configtemplates/bareos-dir.d/user
+@pkgdir share/examples/bareos/configtemplates/bareos-dir.d/counter
+@pkgdir share/examples/bareos/configtemplates/bareos-dir-export/client
Index: pkgsrc/sysutils/bareos-clientonly/PLIST
diff -u /dev/null pkgsrc/sysutils/bareos-clientonly/PLIST:1.1
--- /dev/null Mon Feb 1 09:08:44 2021
+++ pkgsrc/sysutils/bareos-clientonly/PLIST Mon Feb 1 09:08:44 2021
@@ -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
Index: pkgsrc/sysutils/bareos/patches/patch-core_src_console_CMakeLists.txt
diff -u /dev/null pkgsrc/sysutils/bareos/patches/patch-core_src_console_CMakeLists.txt:1.1
--- /dev/null Mon Feb 1 09:08:44 2021
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_console_CMakeLists.txt Mon Feb 1 09:08:43 2021
@@ -0,0 +1,24 @@
+$NetBSD: patch-core_src_console_CMakeLists.txt,v 1.1 2021/02/01 09:08:43 kardel Exp $
+
+ install config file with proper permissions
+
+--- core/src/console/CMakeLists.txt.orig 2021-01-22 17:06:22.267142097 +0000
++++ core/src/console/CMakeLists.txt
+@@ -62,11 +62,15 @@ install(
+ set(DESTDIR \$ENV{DESTDIR})
+ if(NOT EXISTS \$ENV{DESTDIR}${configtemplatedir}/bconsole.conf)
+ message(STATUS \"Installing: \$ENV{DESTDIR}${configtemplatedir}/bconsole.conf\")
+- file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf DESTINATION \$ENV{DESTDIR}${configtemplatedir})
++ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf DESTINATION \$ENV{DESTDIR}${configtemplatedir}
++ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
++ )
+ else()
+ message(STATUS \"Installing: \$ENV{DESTDIR}${configtemplatedir}/bconsole.conf.new\")
+ file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf.new)
+- file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf.new DESTINATION \$ENV{DESTDIR}${configtemplatedir})
++ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf.new DESTINATION \$ENV{DESTDIR}${configtemplatedir}
++ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
++ )
+ file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf.new ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf)
+ endif()
+ "
Index: pkgsrc/sysutils/bareos/patches/patch-core_src_plugins_stored_scsicrypto_scsicrypto-sd.cc
diff -u /dev/null pkgsrc/sysutils/bareos/patches/patch-core_src_plugins_stored_scsicrypto_scsicrypto-sd.cc:1.1
--- /dev/null Mon Feb 1 09:08:44 2021
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_plugins_stored_scsicrypto_scsicrypto-sd.cc Mon Feb 1 09:08:43 2021
@@ -0,0 +1,34 @@
+$NetBSD: patch-core_src_plugins_stored_scsicrypto_scsicrypto-sd.cc,v 1.1 2021/02/01 09:08:43 kardel Exp $
+
+ The original hooks did not clear the key soon enough.
+ It was possible to change media in the tape library
+ without the key being cleared causing key confusion
+ when bareos operation was mixed with other library clients.
+ Now the key is cleared whenever the device is closed.
+
+--- core/src/plugins/stored/scsicrypto/scsicrypto-sd.cc.orig 2021-01-22 16:17:58.773087567 +0000
++++ core/src/plugins/stored/scsicrypto/scsicrypto-sd.cc
+@@ -192,11 +192,13 @@ static bRC newPlugin(PluginContext* ctx)
+ * of the drive.
+ * bSdEventVolumeStatus - plugin callback for encryption status
+ * of the volume loaded in the drive.
++ * bSdEventDeviceClose - clear encryption status on close to
++ * avoid lingering keys
+ */
+ bareos_core_functions->registerBareosEvents(
+- ctx, 7, bSdEventLabelRead, bSdEventLabelVerified, bSdEventLabelWrite,
++ ctx, 8, bSdEventLabelRead, bSdEventLabelVerified, bSdEventLabelWrite,
+ bSdEventVolumeUnload, bSdEventReadError, bSdEventDriveStatus,
+- bSdEventVolumeStatus);
++ bSdEventDeviceClose, bSdEventVolumeStatus);
+
+ return bRC_OK;
+ }
+@@ -243,6 +245,7 @@ static bRC handlePluginEvent(PluginConte
+ case bSdEventLabelRead:
+ case bSdEventLabelWrite:
+ case bSdEventVolumeUnload:
++ case bSdEventDeviceClose:
+ return do_clear_scsi_encryption_key(value);
+ case bSdEventLabelVerified:
+ return do_set_scsi_encryption_key(value);
Index: pkgsrc/sysutils/bareos/patches/patch-core_src_plugins_stored_scsitapealert_scsitapealert-sd.cc
diff -u /dev/null pkgsrc/sysutils/bareos/patches/patch-core_src_plugins_stored_scsitapealert_scsitapealert-sd.cc:1.1
--- /dev/null Mon Feb 1 09:08:44 2021
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_plugins_stored_scsitapealert_scsitapealert-sd.cc Mon Feb 1 09:08:43 2021
@@ -0,0 +1,27 @@
+$NetBSD: patch-core_src_plugins_stored_scsitapealert_scsitapealert-sd.cc,v 1.1 2021/02/01 09:08:43 kardel Exp $
+
+ tape alerts where not always gathered, add missing cases.
+
+--- core/src/plugins/stored/scsitapealert/scsitapealert-sd.cc.orig 2021-01-22 16:12:55.749020270 +0000
++++ core/src/plugins/stored/scsitapealert/scsitapealert-sd.cc
+@@ -129,8 +129,8 @@ static bRC newPlugin(PluginContext* ctx)
+ * Only register plugin events we are interested in.
+ */
+ bareos_core_functions->registerBareosEvents(
+- ctx, 6, bSdEventVolumeLoad, bSdEventLabelVerified, bSdEventReadError,
+- bSdEventWriteError, bSdEventVolumeUnload, bSdEventDeviceRelease);
++ ctx, 7, bSdEventVolumeLoad, bSdEventLabelVerified, bSdEventReadError,
++ bSdEventWriteError, bSdEventVolumeLoad, bSdEventVolumeUnload, bSdEventDeviceRelease);
+
+ return bRC_OK;
+ }
+@@ -177,7 +177,9 @@ static bRC handlePluginEvent(PluginConte
+ case bSdEventLabelVerified:
+ case bSdEventReadError:
+ case bSdEventWriteError:
++ case bSdEventVolumeLoad:
+ case bSdEventVolumeUnload:
++ case bSdEventDeviceRelease:
+ return handle_tapealert_readout(value);
+ default:
+ Dmsg1(debuglevel, "scsitapealert-sd: Unknown event %d\n",
Index: pkgsrc/sysutils/bareos/patches/patch-core_src_stored_dev.cc
diff -u /dev/null pkgsrc/sysutils/bareos/patches/patch-core_src_stored_dev.cc:1.1
--- /dev/null Mon Feb 1 09:08:44 2021
+++ pkgsrc/sysutils/bareos/patches/patch-core_src_stored_dev.cc Mon Feb 1 09:08:44 2021
@@ -0,0 +1,39 @@
+$NetBSD: patch-core_src_stored_dev.cc,v 1.1 2021/02/01 09:08:44 kardel Exp $
+
+ spool.cc makes use of a ficticious temporary device that
+ has .device_resource set - ~Device() did not
+ verify that device_resource->dev referenced
+ this instance before clearing the link.
+ this leads to much confusion in the reservation code.
+
+ to use SCSI passthru file descriptors must be opened
+ READ_WRITE for scsi-crypto.
+
+--- core/src/stored/dev.cc.orig 2020-12-16 07:46:16.000000000 +0000
++++ core/src/stored/dev.cc
+@@ -635,7 +635,12 @@ bool Device::open(DeviceControlRecord* d
+ return false;
+ }
+
++#ifdef HAVE_NETBSD_OS
++ omode = device_resource->drive_crypto_enabled ? DeviceMode::OPEN_READ_WRITE : omode;
++#endif
++
+ Dmsg1(100, "call OpenDevice mode=%s\n", mode_to_str(omode));
++
+ OpenDevice(dcr, omode);
+
+ /*
+@@ -1278,7 +1283,11 @@ Device::~Device()
+ pthread_mutex_destroy(&spool_mutex);
+ // RwlDestroy(&lock);
+ attached_dcrs.clear();
+- if (device_resource) { device_resource->dev = nullptr; }
++ // drop device_resource link only if it references us
++ if (device_resource && device_resource->dev == this) {
++ Dmsg1(900, "term dev: link from device_resource cleared\n");
++ device_resource->dev = nullptr;
++ }
+ }
+
+ bool Device::CanStealLock() const
Index: pkgsrc/sysutils/bareos/patches/patch-systemtests_tests_droplet-s3_testrunner
diff -u /dev/null pkgsrc/sysutils/bareos/patches/patch-systemtests_tests_droplet-s3_testrunner:1.1
--- /dev/null Mon Feb 1 09:08:44 2021
+++ pkgsrc/sysutils/bareos/patches/patch-systemtests_tests_droplet-s3_testrunner Mon Feb 1 09:08:44 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-systemtests_tests_droplet-s3_testrunner,v 1.1 2021/02/01 09:08:44 kardel Exp $
+
+ portability fix
+
+--- systemtests/tests/droplet-s3/testrunner.orig 2021-01-21 10:17:53.629198675 +0000
++++ systemtests/tests/droplet-s3/testrunner
+@@ -31,7 +31,7 @@ BackupDirectory="${tmp}/data"
+ # Data will be placed at "${tmp}/data/".
+ setup_data "$@"
+
+-if [ "$1" == "init" ]; then
++if [ "$1" = "init" ]; then
+ exit 0
+ fi
+
Home |
Main Index |
Thread Index |
Old Index