[pkgsrc/trunk]: pkgsrc/sysutils/bareos sysutils/bareos: upgrade to 20.0.2

[kardel <kardel%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a82313439fd
branches:  trunk
changeset: 456914:4a82313439fd
user:      kardel <kardel%pkgsrc.org@localhost>
date:      Wed Aug 11 10:24:05 2021 +0000

description:
sysutils/bareos: upgrade to 20.0.2

diffstat:

 sysutils/bareos/Makefile                                         |   3 +-
 sysutils/bareos/Makefile.common                                  |   7 ++--
 sysutils/bareos/distinfo                                         |  14 ++++----
 sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer |   6 ++--
 sysutils/bareos/patches/patch-core_src_stored_dev.cc             |  15 +---------
 5 files changed, 16 insertions(+), 29 deletions(-)

diffs (126 lines):

diff -r 13299cc8ff51 -r 4a82313439fd sysutils/bareos/Makefile
--- a/sysutils/bareos/Makefile  Wed Aug 11 10:19:22 2021 +0000
+++ b/sysutils/bareos/Makefile  Wed Aug 11 10:24:05 2021 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2021/06/23 20:33:16 nia Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/11 10:24:05 kardel Exp $
 
 CONFLICTS=             bareos-clientonly-[0-9]* bacula-clientonly-[0-9]* bacula-[0-9]*
 
 COMMENT=               Backup Archiving REcovery Open Sourced
-PKGREVISION=           3
 
 RCD_SCRIPTS=           bareos bareos-dir bareos-sd bareos-fd
 
diff -r 13299cc8ff51 -r 4a82313439fd sysutils/bareos/Makefile.common
--- a/sysutils/bareos/Makefile.common   Wed Aug 11 10:19:22 2021 +0000
+++ b/sysutils/bareos/Makefile.common   Wed Aug 11 10:24:05 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2021/02/11 06:56:35 kardel Exp $
+# $NetBSD: Makefile.common,v 1.5 2021/08/11 10:24:05 kardel Exp $
 # used by sysutils/bareos-clientonly/Makefile
 
 GITHUB_PROJECT=        bareos
-VERSION=       20.0.0
+VERSION=       20.0.2
 GITHUB_TAG=    Release/${VERSION}
 
 DISTNAME=      bareos-${VERSION}
@@ -32,9 +32,10 @@
 SUBST_MESSAGE.paths=   Fixing absolute paths.
 SUBST_FILES.paths+=    core/src/cats/make_catalog_backup.pl.in
 SUBST_FILES.paths+=    core/scripts/bareos-config-lib.sh.in
+SUBST_FILES.paths+=    core/platforms/netbsd/chio-changer
 SUBST_SED.paths=       -e 's,"/usr/local,"${PREFIX},g'
 SUBST_SED.paths+=      -e 's,"/var/log,"${VARBASE}/log,g'
-SUBST_VARS.paths=      LOCALBASE PREFIX PKGVERSION
+SUBST_VARS.paths=      LOCALBASE PREFIX PKGVERSION TOOLS_PLATFORM.sh TOOLS_PLATFORM.awk
 
 pre-configure:
        ${MKDIR} ${WRKSRC}/core/_build
diff -r 13299cc8ff51 -r 4a82313439fd sysutils/bareos/distinfo
--- a/sysutils/bareos/distinfo  Wed Aug 11 10:19:22 2021 +0000
+++ b/sysutils/bareos/distinfo  Wed Aug 11 10:24:05 2021 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2021/02/01 09:08:43 kardel Exp $
+$NetBSD: distinfo,v 1.6 2021/08/11 10:24:05 kardel Exp $
 
-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 (bareos-20.0.2.tar.gz) = 3c478df0515d341e6ef39e9a4534c1699d1094e5
+RMD160 (bareos-20.0.2.tar.gz) = 8c365c9b363df521dfc4bea16bf1eacf00fe958e
+SHA512 (bareos-20.0.2.tar.gz) = f3a0f481a2c9b3a422f4db3e094587c97fe10e2ea5e7a8ba44e9971b0a11746ae4ad598ea469d5c8ec0dfb962e4104c00931397905aebbf3e22af49834043994
+Size (bareos-20.0.2.tar.gz) = 13333946 bytes
 SHA1 (patch-core_CMakeLists.txt) = e59c94620769db0b26d6255830753bdc3b42ad77
 SHA1 (patch-core_cmake_BareosCheckIncludes.cmake) = bb3703ee083b3aa6ea8d5819c0064324037c560a
 SHA1 (patch-core_cmake_BareosFindAllLibraries.cmake) = 35ddd7c2f95f56aa5f65c5f6f2d39700c350e492
@@ -12,7 +12,7 @@
 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_platforms_netbsd_chio-changer) = 6b1451b2aa464b7f31f3d957bc62531c3a2946b2
 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
@@ -28,5 +28,5 @@
 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-core_src_stored_dev.cc) = 8b74e35806a58c0fdb68a23c4817448e2cc75af1
 SHA1 (patch-systemtests_tests_droplet-s3_testrunner) = 42f760df63beca850ab7a4b9c2d5995f09299a4e
diff -r 13299cc8ff51 -r 4a82313439fd sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer
--- a/sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer  Wed Aug 11 10:19:22 2021 +0000
+++ b/sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer  Wed Aug 11 10:24:05 2021 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-core_platforms_netbsd_chio-changer,v 1.2 2021/02/01 09:08:43 kardel Exp $
+$NetBSD: patch-core_platforms_netbsd_chio-changer,v 1.3 2021/08/11 10:24:05 kardel Exp $
 
        NetBSD changer script using NetBSD chio command
 
 --- 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
++#!@TOOLS_PLATFORM.sh@
 +#
 +# Bareos interface to chio autoloader
 +#
@@ -25,7 +25,7 @@
 +#   exit code, Bareos will assume the request failed.
 +
 +CHIO=chio
-+AWK=awk
++AWK=@TOOLS_PLATFORM.awk@
 +
 +# check parameter count on commandline
 +check_parm_count() {
diff -r 13299cc8ff51 -r 4a82313439fd sysutils/bareos/patches/patch-core_src_stored_dev.cc
--- a/sysutils/bareos/patches/patch-core_src_stored_dev.cc      Wed Aug 11 10:19:22 2021 +0000
+++ b/sysutils/bareos/patches/patch-core_src_stored_dev.cc      Wed Aug 11 10:24:05 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-core_src_stored_dev.cc,v 1.1 2021/02/01 09:08:44 kardel Exp $
+$NetBSD: patch-core_src_stored_dev.cc,v 1.2 2021/08/11 10:24:05 kardel Exp $
 
        spool.cc makes use of a ficticious temporary device that
        has .device_resource set - ~Device() did not
@@ -24,16 +24,3 @@
    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