summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2021-06-18 18:47:14 +0200
committerErich Eckner <git@eckner.net>2021-06-18 18:47:33 +0200
commit3a0c51445fa7f822f78b4c208ad452f0bf1d9de3 (patch)
tree53fee34d78d70587c41453eb3cb34c6c189aa0e9
parent16eb14059cc5f37e872633a02890a15d56bd2dc5 (diff)
downloadarchlinuxewe-3a0c51445fa7f822f78b4c208ad452f0bf1d9de3.tar.xz
bareosbareos: 20.0.1-9 -> 20.0.2-1
-rw-r--r--bareos/PKGBUILD8
-rw-r--r--bareos/xattr.patch30
2 files changed, 19 insertions, 19 deletions
diff --git a/bareos/PKGBUILD b/bareos/PKGBUILD
index b3f86fbb6..8b3ca4dd9 100644
--- a/bareos/PKGBUILD
+++ b/bareos/PKGBUILD
@@ -24,8 +24,8 @@ pkgname=("${pkgbase}-common"
"${pkgbase}-storage-python-plugin"
"${pkgbase}-webui")
-pkgver=20.0.1
-pkgrel=9
+pkgver=20.0.2
+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=('94023b21a8c8a020ad5f01153a115c45e7479b204bbd834cdc89aa0f10878ea199738835f9d831922ca10b2a077aa8725f8356f205d5dc414712ef24d1c3e7d4'
- 'e2e1af7110b8b99897e00bdd9ec599c662b298a2861bf4cd8945ca718585c13255fc9849e1b9f0d050e43e46fa42d6c0fbb7dd5cadc8b72b1c3445d79612e290'
+sha512sums=('f3a0f481a2c9b3a422f4db3e094587c97fe10e2ea5e7a8ba44e9971b0a11746ae4ad598ea469d5c8ec0dfb962e4104c00931397905aebbf3e22af49834043994'
+ '555c24eed9f9d2b4ead94caab8ec6535c3d05008b0e78fe07302683bb7a31f6e021ed98d686feb739bfff9189c90f148a9b42f8bae12efa077faafc8c59a8d0e'
'0235763891f368c13931f0fc43e3ae2d7ec796b7ef35896b6b9c048345d539308abe4a9bafda4e95221a89231d2f373ac3cfc2098d572d4068a1c068d27452f6')
prepare() {
diff --git a/bareos/xattr.patch b/bareos/xattr.patch
index 8951ed0fa..c69a9a4df 100644
--- a/bareos/xattr.patch
+++ b/bareos/xattr.patch
@@ -11,25 +11,25 @@
/** @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
-@@ -78,7 +78,6 @@
+@@ -79,7 +79,6 @@
#ifndef DONE_STYLE
- typedef unsigned long ulong;
--typedef unsigned bool;
- typedef unsigned char * p_ubyte_;
+ typedef unsigned long ulong;
+-typedef unsigned bool;
+ typedef unsigned char* p_ubyte_;
- #ifndef TRUE
-@@ -106,8 +106,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. */
+ # 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. */
+ 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 @@