From 169e2fc86548e2ea088ffad81be6f027733347cb Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 25 Nov 2021 21:25:56 +0100
Subject: bareosbareos: 20.0.3-2 -> 20.0.4-1

---
 bareos/PKGBUILD    |  8 ++++----
 bareos/xattr.patch | 22 ----------------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/bareos/PKGBUILD b/bareos/PKGBUILD
index 2838f7c74..e42d02d07 100644
--- a/bareos/PKGBUILD
+++ b/bareos/PKGBUILD
@@ -24,8 +24,8 @@ pkgname=("${pkgbase}-common"
          "${pkgbase}-storage-python-plugin"
          "${pkgbase}-webui")
 
-pkgver=20.0.3
-pkgrel=2
+pkgver=20.0.4
+pkgrel=1
 arch=(x86_64 i486 i686 pentium4 armv6h armv7h aarch64)
 groups=('bareos')
 pkgdesc="Bareos - Backup Archiving REcovery Open Sourced"
@@ -59,8 +59,8 @@ makedepends_aarch64=(ceph "${_pinned_dependencies_libmariadbclient[@]}")
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/$pkgbase/$pkgbase/archive/Release/$pkgver.tar.gz"
 'xattr.patch'
 'check-if-bareos-backup-is-running')
-sha512sums=('3f9bf020e0d519da75221ebd200634713c791e2fdc90a13482ffb3294912d5e2ee28f8338dbef06ba6c98727bae447f6f8bb8d4a06520001f7cefa3614769082'
-            '555c24eed9f9d2b4ead94caab8ec6535c3d05008b0e78fe07302683bb7a31f6e021ed98d686feb739bfff9189c90f148a9b42f8bae12efa077faafc8c59a8d0e'
+sha512sums=('37edb550b44d883adba2f699e828156714e61b8ac068c4b3c699b3cb05e0ccedd3175d30a9cb193e56be102d64166dc8201a7a5772c9d4a875489496be65741f'
+            'c535f89866816669208d56e21ffb13f70aa962e578847bc7bcc76a3e8ad54b252c8e09b745b500064d6f02cb5497cb81b62dd1c156d2e907c393aaa091aa5f0e'
             '0235763891f368c13931f0fc43e3ae2d7ec796b7ef35896b6b9c048345d539308abe4a9bafda4e95221a89231d2f373ac3cfc2098d572d4068a1c068d27452f6')
 
 prepare() {
diff --git a/bareos/xattr.patch b/bareos/xattr.patch
index c69a9a4df..47294dad8 100644
--- a/bareos/xattr.patch
+++ b/bareos/xattr.patch
@@ -1,14 +1,3 @@
---- a/core/src/droplet/libdroplet/src/utils.c	2020-12-16 08:46:16.000000000 +0100
-+++ b/core/src/droplet/libdroplet/src/utils.c	2021-01-09 21:28:43.099999815 +0100
-@@ -33,7 +33,7 @@
-  */
- #include <dropletp.h>
- #include <linux/xattr.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include <errno.h>
- 
- /** @file */
 --- 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 @@
@@ -30,14 +19,3 @@
    ulong cm_xorot; /* Parameter: XOR this to output CRC.     */
  
    ulong cm_reg; /* Context: Context during execution.     */
---- a/core/src/droplet/libdroplet/src/backend/posix/reqbuilder.c	2020-12-16 08:46:16.000000000 +0100
-+++ b/core/src/droplet/libdroplet/src/backend/posix/reqbuilder.c	2021-01-09 22:27:57.346666239 +0100
-@@ -39,7 +39,7 @@
- #include <dirent.h>
- #include <sys/types.h>
- #include <linux/xattr.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include <utime.h>
- #include <pwd.h>
- #include <grp.h>
-- 
cgit v1.2.3-70-g09d2