aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2021-01-22 17:42:13 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2021-01-22 17:42:13 +0000
commit77e5c93a5c868016ac2f7c9819199e9ab410f913 (patch)
tree8f52c1802f495da74fa47ee6f91f25eb12b6f957
parentbd4e89c6a26bf7c247c3335b8a7aef053815dfc7 (diff)
downloadaports-77e5c93a5c868016ac2f7c9819199e9ab410f913.tar.gz
aports-77e5c93a5c868016ac2f7c9819199e9ab410f913.tar.bz2
aports-77e5c93a5c868016ac2f7c9819199e9ab410f913.tar.xz
community/bareos: upgrade to 20.0.0
-rw-r--r--community/bareos/APKBUILD30
-rw-r--r--community/bareos/support-alpine-dist.patch15
-rw-r--r--community/bareos/xattr-include.patch91
3 files changed, 122 insertions, 14 deletions
diff --git a/community/bareos/APKBUILD b/community/bareos/APKBUILD
index c5f105b5b4..07d9140879 100644
--- a/community/bareos/APKBUILD
+++ b/community/bareos/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=bareos
-pkgver=19.2.9
+pkgver=20.0.0
pkgrel=0
pkgdesc="Bareos - Backup Archiving REcovery Open Sourced"
url="http://www.bareos.org"
@@ -14,7 +14,12 @@ makedepends="cmake gawk
lzo-dev acl-dev gettext-dev
readline-dev ncurses-dev jansson-dev
sqlite-dev postgresql-dev mariadb-connector-c-dev
-php7"
+php7
+gtest-dev py3-psycopg2 chromium-chromedriver
+libcap-dev libtirpc-dev
+py3-apache-libcloud py3-dateutil
+python3-dev python3 py3-dateutil py3-psycopg2 py3-apache-libcloud
+json-c-dev libxml2-dev linux-pam-dev"
install="$pkgname.pre-install $pkgname.post-install"
subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-dbg
$pkgname-mysql:_mysql $pkgname-sqlite:_sqlite $pkgname-postgresql:_postgresql
@@ -25,10 +30,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/bareos/bareos/archive/Releas
$pkgname-dir.initd
$pkgname-sd.initd
$pkgname-fd.initd
- detect-alpine.patch
add-libintl.patch
nginx-conf.patch
path-mounted.patch
+ support-alpine-dist.patch
+ xattr-include.patch
"
builddir="$srcdir"/$pkgname-Release-$pkgver
@@ -69,7 +75,6 @@ build() {
-Dpiddir=/run/$pkgname \
-Dbsrdir=/run/$pkgname \
-Dsubsysdir=/var/lock \
- -Dsmartalloc=yes \
-Dbatch-insert=yes \
-Dscsi-crypto=yes \
-Dlmdb=yes \
@@ -88,7 +93,6 @@ build() {
-Dsd-group=$pkgname \
-Dfd-user=root \
-Dfd-group=$pkgname
-
make
}
@@ -154,19 +158,16 @@ _postgresql() {
_webui() {
description="$description (webui)"
- depends="php7 php7-gettext php7-mbstring php7-session php7-ctype php7-openssl php7-json"
+ depends="php7 php7-gettext php7-mbstring php7-session php7-ctype php7-openssl php7-json py3-selenium"
mkdir -p "$subpkgdir"/usr/share
- mv "$pkgdir"/bareos-webui "$subpkgdir"/usr/share/
+ mv "$pkgdir"/usr/share/bareos-webui "$subpkgdir"/usr/share/
mkdir -p "$subpkgdir"/etc
mv "$pkgdir"/etc/bareos-webui "$subpkgdir"/etc/
- mkdir -p "$subpkgdir"/etc/bareos/bareos-dir.d/console/
- mv "$pkgdir"/etc/bareos/bareos-dir.d/console/admin.conf.example "$subpkgdir"/etc/bareos/bareos-dir.d/console/
-
mkdir -p "$subpkgdir"/etc/bareos/bareos-dir.d/profile/
- mv "$pkgdir"/etc/bareos/bareos-dir.d/profile/webui-admin.conf "$subpkgdir"/etc/bareos/bareos-dir.d/profile/
+ mv "$pkgdir"/etc/bareos/bareos-dir.d/profile/webui-* "$subpkgdir"/etc/bareos/bareos-dir.d/profile/
}
_webui_apache2() {
@@ -187,11 +188,12 @@ _webui_nginx() {
}
-sha512sums="b480a9a8dd459b8af3ab353bc5de2f8d1498d5754416972990add8cc6c8ea40462f6bde01ae92ca23f91c96d8ac2e6daf1dae085de80f021d52c5c87dc9a103e bareos-19.2.9.tar.gz
+sha512sums="14961ed5db7d169e1e529eded47299129cd92fe29974bd457863756cdee47aa0731fe65ece8439e71a7c474b483c2cfc1a95dd6d8419bf9ae3d3690db52bc3cf bareos-20.0.0.tar.gz
eb1e7072b579bf9ae21f2e351d6900abb277db64e373f4760bac8188b82929376e4a196d2c935cefe1ae4cc2c396f2fcba1a25642b26e2f92a0d008fbdc4b5f2 bareos-dir.initd
c770b1d041fafef93d4eb0269ba8d9733e85ef465657fe8dd5d5c68a27ec773cec9c5c582d4a16596d95bbf6dbd3f7194dc9c0d8ed73138e9fb438fba9aa9445 bareos-sd.initd
c6347079dbcef5f4a69ec0c4ecc31803520d715d599d89c6bbfbb3741a86c50d7295c30432889b13ee9c16f2feaa84b1c6ae992cfee6505d569c6493d7e85a5b bareos-fd.initd
-1251d81d142b58bb2f5ab2ea762068fe2273aa5face9dfd314011706e9c2189ecab36b80f76317a595679f164b124cff85623c1ec98cc6997e350b6223f2a524 detect-alpine.patch
9d12f26d77d384ab122fdb133667b17a1e83c748d9fca9ca810c368b8f4f3cb2fc258f7c54628e96a0347e7f996c00f46d89655aad2fee373a61e7433fd783b9 add-libintl.patch
c2fd44d5880b74b24d8001b0798a1a42936347284633b9dd93d604a642c7b15220e5af66cbceb8919263e85b3cfee866cf3f956046ab7cc0d93edce96ad1ecda nginx-conf.patch
-2053eb72bbdb8c02d9ee7dcf387a973e0203485eb85304f1e1513ad501f6738d9fc0bb97596d6d9a1a8c96f6675fd2d2edafc85e961a5bd370b5f22f320c7cbf path-mounted.patch"
+2053eb72bbdb8c02d9ee7dcf387a973e0203485eb85304f1e1513ad501f6738d9fc0bb97596d6d9a1a8c96f6675fd2d2edafc85e961a5bd370b5f22f320c7cbf path-mounted.patch
+e427e32bd5d589618cc8efc6d9a679f62e01904a76f2ce3f56bdbba7df31bf12922380c848bb409291f685fdb80a6ed25d842d44728a363103ab99591b473232 support-alpine-dist.patch
+754d383abeafaac2668a59f21031959024d343da210bc1b0f82c11b4132e0f71a4b64a38a44f21bc583f4ea4c4910a865e1b306be6ee1c88a883065e3bf2170b xattr-include.patch"
diff --git a/community/bareos/support-alpine-dist.patch b/community/bareos/support-alpine-dist.patch
new file mode 100644
index 0000000000..1cb4ab68af
--- /dev/null
+++ b/community/bareos/support-alpine-dist.patch
@@ -0,0 +1,15 @@
+diff --git a/core/cmake/distname.sh b/core/cmake/distname.sh
+index 2dfc47f..5026e11 100755
+--- a/core/cmake/distname.sh
++++ b/core/cmake/distname.sh
+@@ -184,6 +184,10 @@ else
+ elif test "$CYGWIN" = yes
+ then
+ PLATFORM=cygwin
++ elif test -f /etc/alpine-release
++ then
++ PLATFORM=alpine
++ DISTVER=`cat /etc/alpine-release`
+ else
+ PLATFORM=unknown
+ DISTVER=unknown
diff --git a/community/bareos/xattr-include.patch b/community/bareos/xattr-include.patch
new file mode 100644
index 0000000000..05c93503b9
--- /dev/null
+++ b/community/bareos/xattr-include.patch
@@ -0,0 +1,91 @@
+diff --git a/core/src/droplet/configure.ac b/core/src/droplet/configure.ac
+index a7d088a..d82d202 100644
+--- a/core/src/droplet/configure.ac
++++ b/core/src/droplet/configure.ac
+@@ -69,8 +69,6 @@ AC_MSG_NOTICE("Using JSON libs: $JSON_LIBS")
+ AC_SEARCH_LIBS([sqrt], [m], [], [AC_MSG_ERROR([libm library missing])])
+ AX_PTHREAD
+
+-AC_CHECK_HEADER([attr/xattr.h],[],AC_MSG_ERROR([libattr1 missing]))
+-
+ AC_ARG_ENABLE(coverage, AS_HELP_STRING([--enable-coverage],
+ [Build with test coverage instrumentation]))
+ if test "$enable_coverage" = yes ; then
+diff --git a/core/src/droplet/libdroplet/src/backend/posix/backend.c b/core/src/droplet/libdroplet/src/backend/posix/backend.c
+index 373a47b..fe95456 100644
+--- a/core/src/droplet/libdroplet/src/backend/posix/backend.c
++++ b/core/src/droplet/libdroplet/src/backend/posix/backend.c
+@@ -39,7 +39,13 @@
+ #include <sys/stat.h>
+ #include <dirent.h>
+ #include <sys/types.h>
+-#include <linux/xattr.h>
++#ifdef HAVE_ATTR_XATTR_H
++# include <attr/xattr.h>
++#else
++# ifdef HAVE_SYS_XATTR_H
++# include <sys/xattr.h>
++# endif
++#endif
+ #include <utime.h>
+ #include <pwd.h>
+ #include <grp.h>
+diff --git a/core/src/droplet/libdroplet/src/backend/posix/replyparser.c b/core/src/droplet/libdroplet/src/backend/posix/replyparser.c
+index 1e7b2e5..de200b9 100644
+--- a/core/src/droplet/libdroplet/src/backend/posix/replyparser.c
++++ b/core/src/droplet/libdroplet/src/backend/posix/replyparser.c
+@@ -38,7 +38,13 @@
+ #include <sys/stat.h>
+ #include <dirent.h>
+ #include <sys/types.h>
+-#include <linux/xattr.h>
++#ifdef HAVE_ATTR_XATTR_H
++# include <attr/xattr.h>
++#else
++# ifdef HAVE_SYS_XATTR_H
++# include <sys/xattr.h>
++# endif
++#endif
+ #include <utime.h>
+ #include <pwd.h>
+ #include <grp.h>
+diff --git a/core/src/droplet/libdroplet/src/backend/posix/reqbuilder.c b/core/src/droplet/libdroplet/src/backend/posix/reqbuilder.c
+index 1c74de1..8a83da9 100644
+--- a/core/src/droplet/libdroplet/src/backend/posix/reqbuilder.c
++++ b/core/src/droplet/libdroplet/src/backend/posix/reqbuilder.c
+@@ -38,8 +38,13 @@
+ #include <sys/stat.h>
+ #include <dirent.h>
+ #include <sys/types.h>
+-#include <linux/xattr.h>
+-#include <attr/xattr.h>
++#ifdef HAVE_ATTR_XATTR_H
++# include <attr/xattr.h>
++#else
++# ifdef HAVE_SYS_XATTR_H
++# include <sys/xattr.h>
++# endif
++#endif
+ #include <utime.h>
+ #include <pwd.h>
+ #include <grp.h>
+diff --git a/core/src/droplet/libdroplet/src/utils.c b/core/src/droplet/libdroplet/src/utils.c
+index 8114229..4fe947d 100644
+--- a/core/src/droplet/libdroplet/src/utils.c
++++ b/core/src/droplet/libdroplet/src/utils.c
+@@ -32,9 +32,14 @@
+ * https://github.com/scality/Droplet
+ */
+ #include <dropletp.h>
+-#include <linux/xattr.h>
+-#include <attr/xattr.h>
+ #include <errno.h>
++#ifdef HAVE_ATTR_XATTR_H
++# include <attr/xattr.h>
++#else
++# ifdef HAVE_SYS_XATTR_H
++# include <sys/xattr.h>
++# endif
++#endif
+
+ /** @file */