bareosbareos: 21.1.2-20 -> 22.0.1-1

3 files changed, 21 insertions, 88 deletions

diff --git a/bareos/PKGBUILD b/bareos/PKGBUILD
index b851ce117..cf9da3af2 100644
--- a/bareos/PKGBUILD
+++ b/bareos/PKGBUILD
@@ -20,8 +20,8 @@ pkgname=("${pkgbase}-common"
          "${pkgbase}-storage-python-plugin"
          "${pkgbase}-webui")
 
-pkgver=21.1.2
-pkgrel=20
+pkgver=22.0.1
+pkgrel=1
 arch=(x86_64 i486 i686 pentium4 armv6h armv7h aarch64)
 groups=('bareos')
 pkgdesc="Bareos - Backup Archiving REcovery Open Sourced"
@@ -32,11 +32,11 @@ _pinned_dependencies=(
   'glibc>=2.31'
   'jansson=2.14'
   'libacl.so=1'
+  'libcrypto.so=3'
   'libpam.so=0'
   'libpq.so=5'
   'libreadline.so=8'
   'lzo=2.10'
-  'openssl-1.1=1.1.1.s'
   'zlib=1:1.2.13'
 )
 _pinned_dependencies_libmariadbclient=(
@@ -50,20 +50,10 @@ 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"
-'ce3339d28623b8bb771e5e0aa139168df5963c4b.patch'
-'xattr.patch'
 'check-if-bareos-backup-is-running')
-sha512sums=('acdc787ff828add93c81b2b7d293dec90f2aa22aa3aee3002662bd30e88dc0dc58b753bb63ca7c111fac6c7eeea888938236c1169f92ed6cec27941036c7b6b1'
-            '9c5b3ff610d50d0aef5de8ca0f2ed49bb72817a5a044013b87762139b048382b9a0949129ecf1788443363ef1dd4e70e773c985490dda1fae12212a4170da5aa'
-            'c535f89866816669208d56e21ffb13f70aa962e578847bc7bcc76a3e8ad54b252c8e09b745b500064d6f02cb5497cb81b62dd1c156d2e907c393aaa091aa5f0e'
+sha512sums=('0cb3af444710e8ef6e40b3fd83cbd7787ac81fcf290433102b33d5279f391d34047242229729af60be4a34bd42ac3ca8371e948071724ae2cbe02492ad17653c'
             '0235763891f368c13931f0fc43e3ae2d7ec796b7ef35896b6b9c048345d539308abe4a9bafda4e95221a89231d2f373ac3cfc2098d572d4068a1c068d27452f6')
 
-prepare() {
-  cd $pkgbase-Release-$pkgver
-  patch -p1 -i ../ce3339d28623b8bb771e5e0aa139168df5963c4b.patch
-  patch -p1 -i ../xattr.patch
-}
-
 build() {
   cd $pkgbase-Release-$pkgver
   mkdir build
@@ -136,8 +126,8 @@ package_bareos-common() {
     'glibc>=2.31'
     'jansson=2.14'
     'libacl.so=1'
+    'libcrypto.so=3'
     'lzo=2.10'
-    'openssl-1.1=1.1.1.s'
     'zlib=1:1.2.13'
   )
   depends=('bash' "${_pinned_dependencies[@]}")
@@ -148,11 +138,11 @@ package_bareos-common() {
 #    usr/lib/bareos/libbareossd.so
 
   install -Dm755 \
-    "$srcdir/install/usr/lib/bareos"/libbareos.so* \
-    "$srcdir/install/usr/lib/bareos"/libbareosfind.so* \
-    "$srcdir/install/usr/lib/bareos"/libbareoslmdb.so* \
-    "$srcdir/install/usr/lib/bareos"/libbareossd.so* \
-    "$srcdir/install/usr/lib/bareos"/libbareosfastlz.so* \
+    "$srcdir/install/usr/lib/bareos/libbareos.so.$pkgver" \
+    "$srcdir/install/usr/lib/bareos/libbareosfind.so.$pkgver" \
+    "$srcdir/install/usr/lib/bareos/libbareoslmdb.so.$pkgver" \
+    "$srcdir/install/usr/lib/bareos/libbareossd.so.$pkgver" \
+    "$srcdir/install/usr/lib/bareos/libbareosfastlz.so.$pkgver" \
     -t "$pkgdir/usr/lib/bareos"
 
   install -Dm755 \
@@ -211,11 +201,11 @@ package_bareos-database-common() {
     'gcc-libs=12.2.0'
     'glibc>=2.31'
   )
-  depends=("bareos-common=$pkgver" 'libcap' 'lzo' 'zlib' 'openssl-1.1' 'bash' 'jansson' "${_pinned_dependencies[@]}")
+  depends=("bareos-common=$pkgver" 'libcap' 'lzo' 'zlib' 'bash' 'jansson' "${_pinned_dependencies[@]}")
 
   install -Dm755 \
-    "$srcdir/install/usr/lib/bareos"/libbareoscats.so* \
-    "$srcdir/install/usr/lib/bareos"/libbareossql.so* \
+    "$srcdir/install/usr/lib/bareos/libbareoscats.so.$pkgver" \
+    "$srcdir/install/usr/lib/bareos/libbareossql.so.$pkgver" \
     -t "$pkgdir/usr/lib/bareos"
 
   install -Dm755 \
@@ -269,7 +259,7 @@ package_bareos-database-tools() {
     'gcc-libs=12.2.0'
     'glibc>=2.31'
     'jansson=2.14'
-    'openssl-1.1=1.1.1.s'
+    'libcrypto.so=3'
   )
   depends=("bareos-common=$pkgver" "bareos-database-common=$pkgver" "${_pinned_dependencies[@]}")
 
@@ -297,8 +287,8 @@ package_bareos-director() {
     'gcc-libs=12.2.0'
     'glibc>=2.31'
     'jansson=2.14'
+    'libcrypto.so=3'
     'libpam.so=0'
-    'openssl-1.1=1.1.1.s'
   )
   depends=("bareos-common=$pkgver" "bareos-database=$pkgver" "bareos-database-common=$pkgver" 'bash' "${_pinned_dependencies[@]}")
   install=bareos-director.install
@@ -404,7 +394,7 @@ package_bareos-storage-fifo() {
     'gcc-libs=12.2.0'
     'glibc>=2.31'
   )
-  depends=("bareos-storage=$pkgver" 'libcap' 'openssl-1.1' 'jansson' 'lzo' "${_pinned_dependencies[@]}")
+  depends=("bareos-storage=$pkgver" 'libcap' 'jansson' 'lzo' "${_pinned_dependencies[@]}")
   install=bareos-storage-fifo.install
   install -Dm755 \
     "$srcdir/install/usr/lib/bareos/backends/libbareossd-fifo.so" \
@@ -504,7 +494,7 @@ package_bareos-storage() {
     'gcc-libs=12.2.0'
     'glibc>=2.31'
   )
-  depends=("bareos-common=$pkgver" 'lzo' 'jansson' 'openssl-1.1' 'libcap' "${_pinned_dependencies[@]}")
+  depends=("bareos-common=$pkgver" 'lzo' 'jansson' 'libcap' "${_pinned_dependencies[@]}")
   install=bareos-storage.install
 
   install -Dm755 \
@@ -553,7 +543,7 @@ package_bareos-storage-tape() {
     'gcc-libs=12.2.0'
     'glibc>=2.31'
   )
-  depends=("bareos-common=$pkgver" "bareos-storage=$pkgver" 'libcap' 'bash' 'openssl-1.1' 'jansson' 'lzo' 'mtx' "${_pinned_dependencies[@]}")
+  depends=("bareos-common=$pkgver" "bareos-storage=$pkgver" 'libcap' 'bash' 'jansson' 'lzo' 'mtx' "${_pinned_dependencies[@]}")
   install=bareos-storage-tape.install
   backup=(
     'etc/bareos/mtx-changer.conf'
@@ -574,7 +564,6 @@ package_bareos-storage-tape() {
     "$srcdir/install/usr/share/bareos/config/bareos-sd.d/device/tapedrive-0.conf.example" \
     -t "$pkgdir/etc/bareos/bareos-sd.d/device"
   install -Dm755 \
-    "$srcdir/install/usr/lib/bareos/backends/libbareossd-gentape.so" \
     "$srcdir/install/usr/lib/bareos/backends/libbareossd-tape.so" \
     -t "$pkgdir/usr/lib/bareos/backends"
   install -Dm755 \
@@ -604,6 +593,9 @@ package_bareos-director-python-plugin() {
     "$srcdir/install/usr/lib/bareos/plugins/BareosDirPluginBaseclass.py" \
     "$srcdir/install/usr/lib/bareos/plugins/bareos-dir-class-plugin.py" \
     -t "$pkgdir/usr/lib/bareos/plugins"
+  install -Dm755 \
+    "$srcdir/install/usr/lib/python3.10/site-packages"/* \
+    -t "$pkgdir/usr/lib/python3.10/site-packages"
 }
 
 package_bareos-filedaemon-python-plugin() {
diff --git a/bareos/ce3339d28623b8bb771e5e0aa139168df5963c4b.patch b/bareos/ce3339d28623b8bb771e5e0aa139168df5963c4b.patch
deleted file mode 100644
index ca899fd0d..000000000
--- a/bareos/ce3339d28623b8bb771e5e0aa139168df5963c4b.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ce3339d28623b8bb771e5e0aa139168df5963c4b Mon Sep 17 00:00:00 2001
-From: Andreas Rogge <andreas.rogge@bareos.com>
-Date: Wed, 2 Feb 2022 19:41:25 +0100
-Subject: [PATCH] lib: fix use-after-free in timer_thread
-
----
- core/src/lib/timer_thread.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/core/src/lib/timer_thread.cc b/core/src/lib/timer_thread.cc
-index 7ec8021989..1624ddd4f0 100644
---- a/core/src/lib/timer_thread.cc
-+++ b/core/src/lib/timer_thread.cc
-@@ -2,7 +2,7 @@
-    BAREOS® - Backup Archiving REcovery Open Sourced
- 
-    Copyright (C) 2002-2011 Free Software Foundation Europe e.V.
--   Copyright (C) 2019-2019 Bareos GmbH & Co. KG
-+   Copyright (C) 2019-2022 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
-@@ -204,6 +204,7 @@ static bool RunOneItem(TimerThread::Timer* p,
-       = std::chrono::steady_clock::now();
- 
-   bool remove_from_list = false;
-+  next_timer_run = min(p->scheduled_run_timepoint, next_timer_run);
-   if (p->is_active && last_timer_run_timepoint > p->scheduled_run_timepoint) {
-     LogMessage(p);
-     p->user_callback(p);
-@@ -215,7 +216,6 @@ static bool RunOneItem(TimerThread::Timer* p,
-       p->scheduled_run_timepoint = last_timer_run_timepoint + p->interval;
-     }
-   }
--  next_timer_run = min(p->scheduled_run_timepoint, next_timer_run);
-   return remove_from_list;
- }
- 
diff --git a/bareos/xattr.patch b/bareos/xattr.patch
deleted file mode 100644
index 47294dad8..000000000
--- a/bareos/xattr.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/core/src/droplet/libdroplet/include/droplet/cdmi/crcmodel.h	2020-12-16 08:46:16.000000000 +0100
-+++ b/core/src/droplet/libdroplet/include/droplet/cdmi/crcmodel.h	2021-01-09 21:50:10.506666487 +0100
-@@ -79,7 +79,6 @@
- #ifndef DONE_STYLE
- 
- typedef unsigned long ulong;
--typedef unsigned bool;
- typedef unsigned char* p_ubyte_;
- 
- #  ifndef TRUE
-@@ -107,8 +107,8 @@
-   int cm_width;   /* Parameter: Width in bits [8,32].       */
-   ulong cm_poly;  /* Parameter: The algorithm's polynomial. */
-   ulong cm_init;  /* Parameter: Initial register value.     */
--  bool cm_refin;  /* Parameter: Reflect input bytes?        */
--  bool cm_refot;  /* Parameter: Reflect output CRC?         */
-+  _Bool cm_refin; /* Parameter: Reflect input bytes?        */
-+  _Bool cm_refot; /* Parameter: Reflect output CRC?         */
-   ulong cm_xorot; /* Parameter: XOR this to output CRC.     */
- 
-   ulong cm_reg; /* Context: Context during execution.     */