bareos: 22.0.3-1 -> 22.1.0-1

2 files changed, 4 insertions, 145 deletions

diff --git a/bareos/2bb7d74215bf6ae4f350de11bff04b68cf3c82b3.patch b/bareos/2bb7d74215bf6ae4f350de11bff04b68cf3c82b3.patch
deleted file mode 100644
index 95c1d6509..000000000
--- a/bareos/2bb7d74215bf6ae4f350de11bff04b68cf3c82b3.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 2bb7d74215bf6ae4f350de11bff04b68cf3c82b3 Mon Sep 17 00:00:00 2001
-From: Bruno Friedmann <bruno.friedmann@bareos.com>
-Date: Mon, 27 Mar 2023 13:22:11 +0200
-Subject: [PATCH] core: fixes for gcc-13 support
-
-- add explicit system_error and stdexcept
-- console_conf.cc fix std::move warning
-
-Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com>
----
- core/src/cats/cats.h                    | 2 ++
- core/src/console/console_conf.cc        | 4 ++--
- core/src/lib/thread_list.cc             | 3 ++-
- core/src/lib/thread_specific_data.cc    | 3 ++-
- core/src/lib/thread_specific_data.h     | 3 ++-
- core/src/lib/thread_specific_data_key.h | 4 +++-
- 6 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/core/src/cats/cats.h b/core/src/cats/cats.h
-index 7a6641b3f72..edb5ecbe38b 100644
---- a/core/src/cats/cats.h
-+++ b/core/src/cats/cats.h
-@@ -41,6 +41,8 @@
- #include "lib/output_formatter.h"
- 
- #include <string>
-+#include <stdexcept>
-+#include <system_error>
- #include <vector>
- template <typename T> class dlist;
- 
-diff --git a/core/src/console/console_conf.cc b/core/src/console/console_conf.cc
-index 9d3aecead2b..f0c0402744e 100644
---- a/core/src/console/console_conf.cc
-+++ b/core/src/console/console_conf.cc
-@@ -3,7 +3,7 @@
- 
-    Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
-    Copyright (C) 2011-2012 Planets Communications B.V.
--   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
-+   Copyright (C) 2013-2023 Bareos GmbH & Co. KG
- 
-    This program is Free Software; you can redistribute it and/or
-    modify it under the terms of version three of the GNU Affero General Public
-@@ -203,7 +203,7 @@ static bool SaveResource(int type, ResourceItem* items, int pass)
-                 res_dir->resource_name_);
-         } else {
-           p->tls_cert_.allowed_certificate_common_names_
--              = std::move(p->tls_cert_.allowed_certificate_common_names_);
-+              = std::move(res_dir->tls_cert_.allowed_certificate_common_names_);
-         }
-         break;
-       }
-diff --git a/core/src/lib/thread_list.cc b/core/src/lib/thread_list.cc
-index 50aefb8ee2d..05607124a55 100644
---- a/core/src/lib/thread_list.cc
-+++ b/core/src/lib/thread_list.cc
-@@ -1,7 +1,7 @@
- /*
-    BAREOS® - Backup Archiving REcovery Open Sourced
- 
--   Copyright (C) 2019-2022 Bareos GmbH & Co. KG
-+   Copyright (C) 2019-2023 Bareos GmbH & Co. KG
- 
-    This program is Free Software; you can redistribute it and/or
-    modify it under the terms of version three of the GNU Affero General Public
-@@ -32,6 +32,7 @@
- #include <memory>
- #include <mutex>
- #include <set>
-+#include <system_error>
- #include <thread>
- 
- static constexpr int debuglevel{800};
-diff --git a/core/src/lib/thread_specific_data.cc b/core/src/lib/thread_specific_data.cc
-index 0953f5c125a..22a98c4a759 100644
---- a/core/src/lib/thread_specific_data.cc
-+++ b/core/src/lib/thread_specific_data.cc
-@@ -3,7 +3,7 @@
- 
-    Copyright (C) 2000-2012 Free Software Foundation Europe e.V.
-    Copyright (C) 2011-2012 Planets Communications B.V.
--   Copyright (C) 2019-2019 Bareos GmbH & Co. KG
-+   Copyright (C) 2019-2023 Bareos GmbH & Co. KG
- 
-    This program is Free Software; you can redistribute it and/or
-    modify it under the terms of version three of the GNU Affero General Public
-@@ -25,6 +25,7 @@
- #include "lib/thread_specific_data.h"
- #include "lib/thread_specific_data_key.h"
- #include "include/jcr.h"
-+#include <system_error>
- 
- JobControlRecord* GetJcrFromThreadSpecificData()
- {
-diff --git a/core/src/lib/thread_specific_data.h b/core/src/lib/thread_specific_data.h
-index 4bd4dedafae..4c427d171c0 100644
---- a/core/src/lib/thread_specific_data.h
-+++ b/core/src/lib/thread_specific_data.h
-@@ -3,7 +3,7 @@
- 
-    Copyright (C) 2000-2012 Free Software Foundation Europe e.V.
-    Copyright (C) 2011-2012 Planets Communications B.V.
--   Copyright (C) 2019-2021 Bareos GmbH & Co. KG
-+   Copyright (C) 2019-2023 Bareos GmbH & Co. KG
- 
-    This program is Free Software; you can redistribute it and/or
-    modify it under the terms of version three of the GNU Affero General Public
-@@ -24,6 +24,7 @@
- #ifndef BAREOS_LIB_THREAD_SPECIFIC_DATA_H_
- #define BAREOS_LIB_THREAD_SPECIFIC_DATA_H_
- 
-+
- class JobControlRecord;
- 
- JobControlRecord* GetJcrFromThreadSpecificData();
-diff --git a/core/src/lib/thread_specific_data_key.h b/core/src/lib/thread_specific_data_key.h
-index 9c02c07f47e..c8c63c757fe 100644
---- a/core/src/lib/thread_specific_data_key.h
-+++ b/core/src/lib/thread_specific_data_key.h
-@@ -1,7 +1,7 @@
- /*
-    BAREOS® - Backup Archiving REcovery Open Sourced
- 
--   Copyright (C) 2019-2021 Bareos GmbH & Co. KG
-+   Copyright (C) 2019-2023 Bareos GmbH & Co. KG
- 
-    This program is Free Software; you can redistribute it and/or
-    modify it under the terms of version three of the GNU Affero General Public
-@@ -22,6 +22,8 @@
- #ifndef BAREOS_LIB_THREAD_SPECIFIC_DATA_KEY_H_
- #define BAREOS_LIB_THREAD_SPECIFIC_DATA_KEY_H_
- 
-+
-+#include <system_error>
- #include "lib/berrno.h"
- 
- #include <mutex>
diff --git a/bareos/PKGBUILD b/bareos/PKGBUILD
index 3a5b70cb1..c316bd77b 100644
--- a/bareos/PKGBUILD
+++ b/bareos/PKGBUILD
@@ -20,7 +20,7 @@ pkgname=("${pkgbase}-common"
          "${pkgbase}-storage-python-plugin"
          "${pkgbase}-webui")
 
-pkgver=22.0.3
+pkgver=22.1.0
 pkgrel=1
 arch=(x86_64 i486 i686 pentium4 armv6h armv7h aarch64)
 groups=('bareos')
@@ -50,15 +50,12 @@ makedepends_armv6h=("${_pinned_dependencies_libmariadbclient[@]}")
 makedepends_armv7h=("${_pinned_dependencies_libmariadbclient[@]}")
 makedepends_aarch64=(ceph "${_pinned_dependencies_libmariadbclient[@]}")
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/$pkgbase/$pkgbase/archive/Release/$pkgver.tar.gz"
-'check-if-bareos-backup-is-running'
-2bb7d74215bf6ae4f350de11bff04b68cf3c82b3.patch)
-sha512sums=('cbdf4bfb5284104894e7fb8ddbb20d6ecedd827c8133b13913e9a27c4e3b98b550ec60a9a23c2c4efe6d566c94ed745d77946a444e5fccb56c09ab8f740d9f8c'
-            '0235763891f368c13931f0fc43e3ae2d7ec796b7ef35896b6b9c048345d539308abe4a9bafda4e95221a89231d2f373ac3cfc2098d572d4068a1c068d27452f6'
-            '7256e57d5331835f5dbf1598ff37bbef2f1b57b46cb494a12c0230530b3f1e444fe7e4dc6f9a9064a68e2b739a65cfad034815fd5328086a7e2a9cfd1038f302')
+'check-if-bareos-backup-is-running')
+sha512sums=('dea64c6eb34a93f1a93eb6b0ac628a75101ac8873e06800a256f226e8f3a556fe39ce4e500246f9c51de30a2b0907732f789c6394f29b7bb9d983a64c709ad2c'
+            '0235763891f368c13931f0fc43e3ae2d7ec796b7ef35896b6b9c048345d539308abe4a9bafda4e95221a89231d2f373ac3cfc2098d572d4068a1c068d27452f6')
 
 prepare() {
   cd $pkgbase-Release-$pkgver
-  patch -p1 -i ../2bb7d74215bf6ae4f350de11bff04b68cf3c82b3.patch
   sed -i '
     1i #include <system_error>
   ' core/src/stored/dev.cc