From cd6a2be95cf5213ba67f124b49526880a27c6dc7 Mon Sep 17 00:00:00 2001
From: Francesco Colista <fcolista@alpinelinux.org>
Date: Wed, 18 Aug 2021 16:08:43 +0000
Subject: [PATCH] community/bareos: upgrade to 20.0.2
---
community/bareos/APKBUILD | 12 ++++++++----
community/bareos/disable-systemtest-minio.patch | 14 ++++++++++++++
2 files changed, 22 insertions(+), 4 deletions(-)
create mode 100644 community/bareos/disable-systemtest-minio.patch
diff --git a/community/bareos/APKBUILD b/community/bareos/APKBUILD
index 5cdcf16c77cd..9d097f44249f 100644
--- a/community/bareos/APKBUILD
+++ b/community/bareos/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=bareos
-pkgver=20.0.0
-pkgrel=2
+pkgver=20.0.2
+pkgrel=0
pkgdesc="Bareos - Backup Archiving REcovery Open Sourced"
url="http://www.bareos.org"
# FTBFS on mips
@@ -36,6 +36,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/bareos/bareos/archive/Releas
path-mounted.patch
support-alpine-dist.patch
xattr-include.patch
+ disable-systemtest-minio.patch
"
builddir="$srcdir"/$pkgname-Release-$pkgver
@@ -189,7 +190,8 @@ _webui_nginx() {
}
-sha512sums="14961ed5db7d169e1e529eded47299129cd92fe29974bd457863756cdee47aa0731fe65ece8439e71a7c474b483c2cfc1a95dd6d8419bf9ae3d3690db52bc3cf bareos-20.0.0.tar.gz
+sha512sums="
+f3a0f481a2c9b3a422f4db3e094587c97fe10e2ea5e7a8ba44e9971b0a11746ae4ad598ea469d5c8ec0dfb962e4104c00931397905aebbf3e22af49834043994 bareos-20.0.2.tar.gz
eb1e7072b579bf9ae21f2e351d6900abb277db64e373f4760bac8188b82929376e4a196d2c935cefe1ae4cc2c396f2fcba1a25642b26e2f92a0d008fbdc4b5f2 bareos-dir.initd
c770b1d041fafef93d4eb0269ba8d9733e85ef465657fe8dd5d5c68a27ec773cec9c5c582d4a16596d95bbf6dbd3f7194dc9c0d8ed73138e9fb438fba9aa9445 bareos-sd.initd
c6347079dbcef5f4a69ec0c4ecc31803520d715d599d89c6bbfbb3741a86c50d7295c30432889b13ee9c16f2feaa84b1c6ae992cfee6505d569c6493d7e85a5b bareos-fd.initd
@@ -197,4 +199,6 @@ c6347079dbcef5f4a69ec0c4ecc31803520d715d599d89c6bbfbb3741a86c50d7295c30432889b13
c2fd44d5880b74b24d8001b0798a1a42936347284633b9dd93d604a642c7b15220e5af66cbceb8919263e85b3cfee866cf3f956046ab7cc0d93edce96ad1ecda nginx-conf.patch
2053eb72bbdb8c02d9ee7dcf387a973e0203485eb85304f1e1513ad501f6738d9fc0bb97596d6d9a1a8c96f6675fd2d2edafc85e961a5bd370b5f22f320c7cbf path-mounted.patch
e427e32bd5d589618cc8efc6d9a679f62e01904a76f2ce3f56bdbba7df31bf12922380c848bb409291f685fdb80a6ed25d842d44728a363103ab99591b473232 support-alpine-dist.patch
-754d383abeafaac2668a59f21031959024d343da210bc1b0f82c11b4132e0f71a4b64a38a44f21bc583f4ea4c4910a865e1b306be6ee1c88a883065e3bf2170b xattr-include.patch"
+754d383abeafaac2668a59f21031959024d343da210bc1b0f82c11b4132e0f71a4b64a38a44f21bc583f4ea4c4910a865e1b306be6ee1c88a883065e3bf2170b xattr-include.patch
+a30d6c52b0c7cc6608639cca62bdf0322f502b50be06943bc0f9178aa21680d5f7331e48f5ca860cf7bca0681fd03ddc581dde65f55ec2b079f856e43353f3e6 disable-systemtest-minio.patch
+"
diff --git a/community/bareos/disable-systemtest-minio.patch b/community/bareos/disable-systemtest-minio.patch
new file mode 100644
index 000000000000..3e71eab4cd2e
--- /dev/null
+++ b/community/bareos/disable-systemtest-minio.patch
@@ -0,0 +1,14 @@
+diff --git a/systemtests/CMakeLists.txt b/systemtests/CMakeLists.txt
+index a890ce6..8fc816d 100644
+--- a/systemtests/CMakeLists.txt
++++ b/systemtests/CMakeLists.txt
+@@ -1161,9 +1161,3 @@ execute_process(
+ RESULT_VARIABLE RESULT_GENERATE_MINIO_CERTS
+ OUTPUT_QUIET ERROR_QUIET
+ )
+-if(NOT "${RESULT_GENERATE_MINIO_CERTS}" STREQUAL "0")
+- message(
+- FATAL_ERROR
+- "Creation of certificates failed: ${RESULT_GENERATE_MINIO_CERTS} ${CMAKE_BINARY_DIR}"
+- )
+-endif()
--
GitLab