21.1.3

14 files changed, 787 insertions, 514 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 262faadf897b..3d96698dbfa7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bareos
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced
-	pkgver = 20.0.1
-	pkgrel = 3
+	pkgver = 21.1.3
+	pkgrel = 1
 	url = http://www.bareos.org
 	arch = i686
 	arch = x86_64
@@ -9,29 +9,52 @@ pkgbase = bareos
 	arch = aarch64
 	groups = bareos
 	license = AGPL3
+	makedepends = cmake
+	makedepends = gcc
 	makedepends = libmariadbclient
 	makedepends = postgresql-libs
-	makedepends = sqlite3
 	makedepends = python2
 	makedepends = python
-	makedepends = cmake
 	makedepends = rpcsvc-proto
 	makedepends = git
 	makedepends = lsb-release
 	makedepends = qt5-base
-	source = git+https://github.com/bareos/bareos.git#tag=Release/20.0.1
-	source = fix-build-bareos.patch
-	source = fix-headlink.patch
-	source = mysql.patch
-	source = PoolModel.patch
+	makedepends = glusterfs
+	makedepends = jansson
+	makedepends = pam_wrapper
+	source = git+https://github.com/bareos/bareos.git#tag=Release/21.1.3
+	source = 0001-distver.patch
+	source = 0002-libdroplet.patch
+	source = 0003-zend.patch
+	source = 0004-logspam.patch
+	source = 0005-version.patch
+	source = 0006-sqlspam.patch
+	source = 0007-hostname.patch
+	source = 0008-httpd.patch
+	source = 009-fix-timer_thread.patch
 	source = bootstrap-table-locale-all.min.js
 	md5sums = SKIP
-	md5sums = 018310ec5860e8b78b1855cc21c7b963
-	md5sums = b26fd1ffccc2b54f3f898d6d896e8929
-	md5sums = 926d71d75bb40c2023583c33712f6e2b
-	md5sums = e35a03f09797b00c098ecb829f1ad5f8
+	md5sums = 419b0c64af750aa3e8ea668edf464d3e
+	md5sums = f2a2a4e1a83d80ee3ba42b38b2062208
+	md5sums = f9b885e18313d9c070372d313e1b422d
+	md5sums = 39724df5903b712fb8d34209c7ac8f1e
+	md5sums = 5bf1233d94dfecc9060746bfb39b9d2b
+	md5sums = ca4c929a2462cafaead8d0b49e3cebed
+	md5sums = b0068e1a248ac0d0e83fb8ae1e034f62
+	md5sums = 33d9c3a1d25b30ac2182aa8d874e28a5
+	md5sums = c8d3568ddf543a576c6fdbe586d8d3d3
 	md5sums = e78b88f897cfc3e60129eec360521e3d
 
+pkgname = bareos-bconsole
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Admin Tool (CLI)
+	install = bareos-bconsole.install
+	groups = bareos
+	groups = bareos-client
+	depends = bareos-common=21.1.3
+	depends = readline
+	depends = jansson
+	backup = etc/bareos/bconsole.conf
+
 pkgname = bareos-common
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Common files
 	install = bareos-common.install
@@ -43,19 +66,9 @@ pkgname = bareos-common
 	depends = jansson
 	depends = zlib
 
-pkgname = bareos-bconsole
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Admin Tool (CLI)
-	install = bareos-bconsole.install
-	groups = bareos
-	groups = bareos-client
-	depends = bareos-common=20.0.1
-	depends = readline
-	depends = jansson
-	backup = etc/bareos/bconsole.conf
-
 pkgname = bareos-database-common
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Generic abstration libs and tools for sql catalog
-	depends = bareos-common=20.0.1
+	depends = bareos-common=21.1.3
 	depends = libcap
 	depends = lzo
 	depends = zlib
@@ -63,137 +76,100 @@ pkgname = bareos-database-common
 	depends = bash
 	depends = jansson
 
-pkgname = bareos-database-mysql
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Libs and tools for mysql catalog
-	install = bareos-database-mysql.install
-	depends = bareos-database-common=20.0.1
-	depends = libmariadbclient
-	provides = bareos-database=20.0.1
-
 pkgname = bareos-database-postgresql
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Libs and tools for postgresql catalog
 	install = bareos-database-postgresql.install
-	depends = bareos-database-common=20.0.1
+	depends = bareos-database-common=21.1.3
 	depends = postgresql-libs
-	provides = bareos-database=20.0.1
-
-pkgname = bareos-database-sqlite3
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Libs and tools for sqlite3 catalog
-	depends = bareos-database-common=20.0.1
-	depends = sqlite3
-	provides = bareos-database=20.0.1
+	provides = bareos-database=21.1.3
 
 pkgname = bareos-database-tools
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - CLI tools with database dpendencies (dbcheck, bscan)
-	depends = bareos-database-common=20.0.1
+	depends = bareos-database-common=21.1.3
 	depends = openssl
 	depends = jansson
 
-pkgname = bareos-devel
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Devel headers
-	arch = any
-
 pkgname = bareos-director
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Director daemon
 	install = bareos-director.install
-	depends = bareos-common=20.0.1
+	depends = bareos-common=21.1.3
 	depends = openssl
 	depends = bash
 	depends = jansson
 
-pkgname = bareos-storage-fifo
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - FIFO support for storage daemon
-	depends = bareos-storage=20.0.1
-	depends = zlib
+pkgname = bareos-director-python-plugins-common
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - This package contains the common files for the python 2 and python 3 director plugins
+	depends = bareos-director=21.1.3
+
+pkgname = bareos-director-python2-plugin
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for director daemon
+	depends = bareos-director=21.1.3
+	depends = bareos-director-python-plugins-common=21.1.3
+	depends = python2
 	depends = libcap
-	depends = openssl
 	depends = jansson
 	depends = lzo
+	conflicts = bareos-director-python-plugin
 
-pkgname = bareos-tools
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - CLI tools (bcopy, bextract, bls, bregeq, bwild)
-	depends = bareos-common=20.0.1
-	depends = glibc
+pkgname = bareos-director-python3-plugin
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for director daemon
+	depends = bareos-director=21.1.3
+	depends = bareos-director-python-plugins-common=21.1.3
+	depends = python
+	depends = libcap
+	depends = jansson
+	depends = lzo
+	conflicts = bareos-director-python-plugin
 
 pkgname = bareos-filedaemon
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - File daemon
 	install = bareos-filedaemon.install
 	groups = bareos
 	groups = bareos-client
-	depends = bareos-common=20.0.1
+	depends = bareos-common=21.1.3
 	depends = jansson
 	depends = zlib
 	depends = gcc-libs
 
-pkgname = bareos-storage
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Storage daemon
-	install = bareos-storage.install
-	depends = bareos-common=20.0.1
-	depends = zlib
-	depends = lzo
-	depends = jansson
-	depends = openssl
-	depends = libcap
+pkgname = bareos-filedaemon-glusterfs-plugin
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - GlusterFS plugin for Bareos File daemon
+	depends = bareos-filedaemon=21.1.3
+	depends = glusterfs
 
-pkgname = bareos-storage-tape
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Tape support for storage daemon
-	depends = bareos-storage=20.0.1
-	depends = zlib
-	depends = libcap
-	depends = bash
-	depends = openssl
-	depends = jansson
-	depends = lzo
-	depends = mtx
-	backup = etc/bareos/mtx-changer.conf
+pkgname = bareos-filedaemon-ldap-python-plugin
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - LDAP Python plugin for Bareos File daemon
+	depends = bareos-filedaemon=21.1.3
+	depends = bareos-filedaemon-python3-plugin=21.1.3
+	depends = python-ldap
 
-pkgname = bareos-webui
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Webui (Bareos web administration)
-	depends = php7
-	depends = php7-fpm
-	depends = jansson
-	backup = etc/bareos-webui/directors.ini
-	backup = etc/bareos-webui/configuration.ini
-	backup = etc/bareos/bareos-dir.d/console/admin.conf.example
-	backup = etc/bareos/bareos-dir.d/profile/webui-admin.conf
-	backup = etc/httpd/conf/extra/bareos-webui.conf
+pkgname = bareos-filedaemon-libcloud-python-plugin
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Libcloud Python plugin for Bareos File daemon
+	depends = bareos-filedaemon=21.1.3
+	depends = python-apache-libcloud
 
-pkgname = bareos-director-python-plugins-common
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - This package contains the common files for the python 2 and python 3 director plugins
-	depends = bareos-director=20.0.1
+pkgname = bareos-filedaemon-mariabackup-python-plugin
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - MariaBackup plugin for Bareos File daemon
+	depends = bareos-filedaemon=21.1.3
+	depends = mariadb
 
-pkgname = bareos-filedaemon-python-plugins-common
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - This package contains the common files for the python 2 and python 3 filedaemon plugins
-	depends = bareos-filedaemon=20.0.1
-
-pkgname = bareos-storage-python-plugins-common
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - This package contains the common files for the python 2 and python 3 storage plugins
-	depends = bareos-storage=20.0.1
+pkgname = bareos-filedaemon-percona-xtrabackup-python-plugin
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - XtraBackup plugin for Bareos File daemon
+	depends = bareos-filedaemon=21.1.3
+	depends = xtrabackup
 
-pkgname = bareos-director-python2-plugin
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for director daemon
-	depends = bareos-director=20.0.1
-	depends = bareos-director-python-plugins-common=20.0.1
-	depends = python2
-	depends = libcap
-	depends = jansson
-	depends = lzo
-	conflicts = bareos-director-python-plugin
+pkgname = bareos-filedaemon-postgresql-python-plugin
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - PostgreSQL plugin for Bareos File daemon
+	depends = bareos-filedaemon=21.1.3
+	depends = postgresql
 
-pkgname = bareos-director-python3-plugin
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for director daemon
-	depends = bareos-director=20.0.1
-	depends = bareos-director-python-plugins-common=20.0.1
-	depends = python
-	depends = libcap
-	depends = jansson
-	depends = lzo
-	conflicts = bareos-director-python-plugin
+pkgname = bareos-filedaemon-python-plugins-common
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - This package contains the common files for the python 2 and python 3 filedaemon plugins
+	depends = bareos-filedaemon=21.1.3
 
 pkgname = bareos-filedaemon-python2-plugin
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for file daemon
-	depends = bareos-filedaemon=20.0.1
-	depends = bareos-filedaemon-python-plugins-common=20.0.1
+	depends = bareos-filedaemon=21.1.3
+	depends = bareos-filedaemon-python-plugins-common=21.1.3
 	depends = python2
 	depends = libcap
 	depends = lzo
@@ -202,18 +178,50 @@ pkgname = bareos-filedaemon-python2-plugin
 
 pkgname = bareos-filedaemon-python3-plugin
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for file daemon
-	depends = bareos-filedaemon=20.0.1
-	depends = bareos-filedaemon-python-plugins-common=20.0.1
+	depends = bareos-filedaemon=21.1.3
+	depends = bareos-filedaemon-python-plugins-common=21.1.3
 	depends = python
 	depends = libcap
 	depends = lzo
 	depends = jansson
 	conflicts = bareos-filedaemon-python-plugin
 
+pkgname = bareos-storage
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Storage daemon
+	install = bareos-storage.install
+	depends = bareos-common=21.1.3
+	depends = zlib
+	depends = lzo
+	depends = jansson
+	depends = openssl
+	depends = libcap
+
+pkgname = bareos-storage-droplet
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Droplet support for storage daemon
+	depends = bareos-storage=21.1.3
+
+pkgname = bareos-storage-fifo
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - FIFO support for storage daemon
+	depends = bareos-storage=21.1.3
+	depends = zlib
+	depends = libcap
+	depends = openssl
+	depends = jansson
+	depends = lzo
+
+pkgname = bareos-storage-glusterfs
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - GlusterFS support for storage daemon
+	depends = bareos-storage=21.1.3
+	depends = glusterfs
+
+pkgname = bareos-storage-python-plugins-common
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - This package contains the common files for the python 2 and python 3 storage plugins
+	depends = bareos-storage=21.1.3
+
 pkgname = bareos-storage-python2-plugin
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for storage daemon
-	depends = bareos-storage=20.0.1
-	depends = bareos-storage-python-plugins-common=20.0.1
+	depends = bareos-storage=21.1.3
+	depends = bareos-storage-python-plugins-common=21.1.3
 	depends = python2
 	depends = lzo
 	depends = libcap
@@ -222,16 +230,46 @@ pkgname = bareos-storage-python2-plugin
 
 pkgname = bareos-storage-python3-plugin
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for storage daemon
-	depends = bareos-storage=20.0.1
-	depends = bareos-storage-python-plugins-common=20.0.1
+	depends = bareos-storage=21.1.3
+	depends = bareos-storage-python-plugins-common=21.1.3
 	depends = python
 	depends = lzo
 	depends = libcap
 	depends = jansson
 	conflicts = bareos-storage-python-plugin
 
-pkgname = bareos-filedaemon-ldap-python-plugin
-	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - LDAP Python plugin for Bareos File daemon
-	depends = bareos-filedaemon=20.0.1
-	depends = bareos-filedaemon-python3-plugin=20.0.1
-	depends = python-ldap
+pkgname = bareos-storage-tape
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Tape support for storage daemon
+	depends = bareos-storage=21.1.3
+	depends = zlib
+	depends = libcap
+	depends = bash
+	depends = openssl
+	depends = jansson
+	depends = lzo
+	depends = mtx
+	backup = etc/bareos/mtx-changer.conf
+
+pkgname = bareos-tools
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - CLI tools (bcopy, bextract, bls, bregeq, bwild, bregex)
+	depends = bareos-common=21.1.3
+	depends = glibc
+
+pkgname = bareos-vmware-plugin
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Bareos VMware plugin
+	depends = python2
+
+pkgname = bareos-webui
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Webui (Bareos web administration)
+	depends = php7
+	depends = php7-fpm
+	depends = jansson
+	backup = etc/bareos-webui/directors.ini
+	backup = etc/bareos-webui/configuration.ini
+	backup = etc/bareos/bareos-dir.d/console/admin.conf.example
+	backup = etc/bareos/bareos-dir.d/profile/webui-admin.conf
+	backup = etc/httpd/conf/extra/bareos-webui.conf
+
+pkgname = bareos-devel
+	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Devel headers
+	arch = any
diff --git a/0001-distver.patch b/0001-distver.patch
new file mode 100644
index 000000000000..855e1520cf2d
--- /dev/null
+++ b/0001-distver.patch
@@ -0,0 +1,10 @@
+--- core/cmake/distname.sh	2021-12-23 02:16:52.596202300 +0100
++++ core/cmake/distname.sh	2021-12-23 02:18:31.430250149 +0100
+@@ -181,6 +181,7 @@ else
+       elif test -f /etc/arch-release
+       then
+          PLATFORM=archlinux
++         DISTVER="Arch Linux"
+       elif test "$CYGWIN" = yes
+       then
+          PLATFORM=cygwin
diff --git a/0002-libdroplet.patch b/0002-libdroplet.patch
new file mode 100644
index 000000000000..9b9dc5cbcc9a
--- /dev/null
+++ b/0002-libdroplet.patch
@@ -0,0 +1,23 @@
+# C99 introduced _Bool but library predates that, fix
+
+--- core/src/droplet/libdroplet/include/droplet/cdmi/crcmodel.h   2020-12-16 08:46:16.000000000 +0100
++++ 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.     */
diff --git a/0003-zend.patch b/0003-zend.patch
new file mode 100644
index 000000000000..0c136fa0c0bf
--- /dev/null
+++ b/0003-zend.patch
@@ -0,0 +1,11 @@
+--- webui/vendor/zendframework/zend-stdlib/src/ArrayObject.php
++++ webui/vendor/zendframework/zend-stdlib/src/ArrayObject.php
+@@ -423,7 +423,7 @@ public function unserialize($data)
+                     $this->setIteratorClass($v);
+                     break;
+                 case 'protectedProperties':
+-                    continue;
++                    break;
+                 default:
+                     $this->__set($k, $v);
+             }
diff --git a/0004-logspam.patch b/0004-logspam.patch
new file mode 100644
index 000000000000..18f6d5b1faa5
--- /dev/null
+++ b/0004-logspam.patch
@@ -0,0 +1,31 @@
+--- core/src/lib/bsock.cc.orig	2021-12-23 08:56:38.194359400 +0100
++++ core/src/lib/bsock.cc	2021-12-23 10:22:09.320240831 +0100
+@@ -584,10 +584,10 @@ bool BareosSocket::DoTlsHandshake(TlsPol
+   if (!initiated_by_remote) {
+     if (tls_conn) {
+       tls_conn->TlsLogConninfo(jcr, host(), port(), who());
+-    } else {
++    } /* else {
+       Qmsg(jcr, M_INFO, 0, _("Connected %s at %s:%d, encryption: None\n"),
+            who(), host(), port());
+-    }
++    } */
+   }
+   return true;
+ }
+--- core/src/lib/tls_openssl.cc.orig	2021-12-23 08:56:38.204359200 +0100
++++ core/src/lib/tls_openssl.cc	2021-12-23 10:22:31.872857179 +0100
+@@ -107,11 +107,11 @@ void TlsOpenSsl::TlsLogConninfo(JobContr
+   if (!d_->openssl_) {
+     Qmsg(jcr, M_INFO, 0, _("No openssl to %s at %s:%d established\n"), who,
+          host, port);
+-  } else {
++  } /* else {
+     std::string cipher_name = TlsCipherGetName();
+     Qmsg(jcr, M_INFO, 0, _("Connected %s at %s:%d, encryption: %s\n"), who,
+          host, port, cipher_name.empty() ? "Unknown" : cipher_name.c_str());
+-  }
++  } */
+ }
+ 
+ /*
diff --git a/0005-version.patch b/0005-version.patch
new file mode 100644
index 000000000000..96440ac549db
--- /dev/null
+++ b/0005-version.patch
@@ -0,0 +1,12 @@
+--- core/src/lib/CMakeLists.txt.orig	2021-12-23 11:28:53.968803800 +0100
++++ core/src/lib/CMakeLists.txt	2021-12-23 11:42:18.538613886 +0100
+@@ -147,6 +147,9 @@
+           -DBAREOS_SHORT_DATE="${BAREOS_SHORT_DATE}"
+           -DBAREOS_PROG_DATE_TIME="${BAREOS_PROG_DATE_TIME}"
+           -DBAREOS_YEAR="${BAREOS_YEAR}"
++          -DBAREOS_BINARY_INFO="${BAREOS_BINARY_INFO}"
++          -DBAREOS_SERVICES_MESSAGE="${BAREOS_SERVICES_MESSAGE}"
++          -DBAREOS_JOBLOG_MESSAGE="${BAREOS_JOBLOG_MESSAGE}"
+ )
+ set_target_properties(version-obj PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ 
diff --git a/0006-sqlspam.patch b/0006-sqlspam.patch
new file mode 100644
index 000000000000..1882f0c6b988
--- /dev/null
+++ b/0006-sqlspam.patch
@@ -0,0 +1,12 @@
+--- core/src/dird/ua_prune.cc.orig	2021-12-23 12:29:52.844307700 +0100
++++ core/src/dird/ua_prune.cc	2021-12-23 14:58:31.874042423 +0100
+@@ -585,7 +585,9 @@ bail_out:
+ 
+ static void DropTempTables(UaContext* ua)
+ {
++  ua->db->SqlQuery("SET client_min_messages = warning");
+   ua->db->SqlQuery(BareosDb::SQL_QUERY::drop_deltabs);
++  ua->db->SqlQuery("SET client_min_messages = notice");
+ }
+ 
+ static bool CreateTempTables(UaContext* ua)
diff --git a/0007-hostname.patch b/0007-hostname.patch
new file mode 100644
index 000000000000..261be232d45b
--- /dev/null
+++ b/0007-hostname.patch
@@ -0,0 +1,22 @@
+--- core/scripts/bareos-config-lib.sh.in	2022-05-07 14:35:31.000000000 +0300
++++ core/scripts/bareos-config-lib.sh.in	2022-05-07 23:25:21.958745554 +0300
+@@ -1070,14 +1070,12 @@
+ {
+     # put actual short hostname in configuration files
+     # try to get short hostname
+-    hname=`hostname -s`
++    hname=`hostnamectl --static | sed 's/\..*//g'`
+     if [ -z "$hname" ]; then
+-        # try to get long hostname
+-        hname=`hostname|sed 's/\..*//g'`
+-        if [ -z "$hname" ]; then
+-            # set to "localhost"
+-            hname='localhost'
+-        fi
++       if [ -z "$hname" ]; then
++          # set to "localhost"
++          hname='localhost'
++       fi
+     fi
+     echo "$hname"
+ }
diff --git a/0008-httpd.patch b/0008-httpd.patch
new file mode 100644
index 000000000000..c8d8e8a56876
--- /dev/null
+++ b/0008-httpd.patch
@@ -0,0 +1,11 @@
+--- webui/CMakeLists.txt	2022-05-10 23:29:44.000000000 +0300
++++ webui/CMakeLists.txt	2022-05-11 00:05:05.698335917 +0300
+@@ -76,7 +76,7 @@
+ elseif(EXISTS ${sysconfdir}/apache2/conf-available)
+   set(HTTPD_CONF ${sysconfdir}/apache2/conf-available)
+ else()
+-  set(HTTPD_CONF ${sysconfdir}/httpd/conf.d)
++  set(HTTPD_CONF ${sysconfdir}/httpd/conf/extra )
+ endif()
+ 
+ configure_file(
diff --git a/009-fix-timer_thread.patch b/009-fix-timer_thread.patch
new file mode 100644
index 000000000000..533066cb6350
--- /dev/null
+++ b/009-fix-timer_thread.patch
@@ -0,0 +1,14 @@
+--- core/src/lib/timer_thread.cc  2022-03-17 17:22:34.000000000 +0100
++++ core/src/lib/timer_thread.cc  2022-05-15 19:28:30.410009804 +0200
+@@ -213,9 +213,11 @@
+       remove_from_list = true;
+     } else {
+       p->scheduled_run_timepoint = last_timer_run_timepoint + p->interval;
++      next_timer_run = min(p->scheduled_run_timepoint, next_timer_run);
+     }
++  } else {
++    next_timer_run = min(p->scheduled_run_timepoint, next_timer_run);
+   }
+-  next_timer_run = min(p->scheduled_run_timepoint, next_timer_run);
+   return remove_from_list;
+ }
diff --git a/PKGBUILD b/PKGBUILD
index 19535654753a..cfc402621a77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,71 +4,92 @@
 
 pkgbase='bareos'
 
-pkgname=("bareos-common"
-         "bareos-bconsole"
+pkgname=("bareos-bconsole"
+         "bareos-common"
          "bareos-database-common"
-         "bareos-database-mysql"
          "bareos-database-postgresql"
-         "bareos-database-sqlite3"
          "bareos-database-tools"
-         "bareos-devel"
          "bareos-director"
-         "bareos-storage-fifo"
-         "bareos-tools"
-         "bareos-filedaemon"
-         "bareos-storage"
-         "bareos-storage-tape"
-         "bareos-webui"
          "bareos-director-python-plugins-common"
-         "bareos-filedaemon-python-plugins-common"
-         "bareos-storage-python-plugins-common"
          "bareos-director-python2-plugin"
          "bareos-director-python3-plugin"
+         "bareos-filedaemon"
+         "bareos-filedaemon-glusterfs-plugin"
+         "bareos-filedaemon-ldap-python-plugin"
+         "bareos-filedaemon-libcloud-python-plugin"
+         "bareos-filedaemon-mariabackup-python-plugin"
+         "bareos-filedaemon-percona-xtrabackup-python-plugin"
+         "bareos-filedaemon-postgresql-python-plugin"
+         "bareos-filedaemon-python-plugins-common"
          "bareos-filedaemon-python2-plugin"
          "bareos-filedaemon-python3-plugin"
+         "bareos-storage"
+         "bareos-storage-droplet"
+         "bareos-storage-fifo"
+         "bareos-storage-glusterfs"
+         "bareos-storage-python-plugins-common"
          "bareos-storage-python2-plugin"
          "bareos-storage-python3-plugin"
-         "bareos-filedaemon-ldap-python-plugin"
-         #"bareos-traymonitor"
+         "bareos-storage-tape"
+         "bareos-tools"
+         "bareos-vmware-plugin"
+         "bareos-webui"
+         "bareos-devel"
          )
+#         "bareos-traymonitor"
 
-pkgver=20.0.1
+pkgver=21.1.3
 pkgmajor=${pkgver%%.*}
-pkgrel=3
+pkgrel=1
 arch=(i686 x86_64 armv7h aarch64)
 groups=('bareos')
 pkgdesc="Bareos - Backup Archiving REcovery Open Sourced"
 url="http://www.bareos.org"
 license=('AGPL3')
-makedepends=('libmariadbclient' 'postgresql-libs' 'sqlite3' 'python2' 'python' 'cmake' 'rpcsvc-proto' 'git' 'lsb-release' 'qt5-base')
+makedepends=('cmake' 'gcc' 'libmariadbclient' 'postgresql-libs' 'python2' 'python' 'rpcsvc-proto' 'git' 'lsb-release' 'qt5-base' 'glusterfs' 'jansson' 'pam_wrapper') # 'ceph-libs'
 source=("git+https://github.com/bareos/bareos.git#tag=Release/${pkgver}"
-        "fix-build-bareos.patch"
-        "fix-headlink.patch"
-        "mysql.patch"
-        "PoolModel.patch"
+        "0001-distver.patch"
+        "0002-libdroplet.patch"
+        "0003-zend.patch"
+        "0004-logspam.patch"
+        "0005-version.patch"
+        "0006-sqlspam.patch"
+        "0007-hostname.patch"
+        "0008-httpd.patch"
+        "009-fix-timer_thread.patch"
         "bootstrap-table-locale-all.min.js")
 md5sums=('SKIP'
-         '018310ec5860e8b78b1855cc21c7b963'
-         'b26fd1ffccc2b54f3f898d6d896e8929'
-         '926d71d75bb40c2023583c33712f6e2b'
-         'e35a03f09797b00c098ecb829f1ad5f8'
+         '419b0c64af750aa3e8ea668edf464d3e'
+         'f2a2a4e1a83d80ee3ba42b38b2062208'
+         'f9b885e18313d9c070372d313e1b422d'
+         '39724df5903b712fb8d34209c7ac8f1e'
+         '5bf1233d94dfecc9060746bfb39b9d2b'
+         'ca4c929a2462cafaead8d0b49e3cebed'
+         'b0068e1a248ac0d0e83fb8ae1e034f62'
+         '33d9c3a1d25b30ac2182aa8d874e28a5'
+         'c8d3568ddf543a576c6fdbe586d8d3d3'
          'e78b88f897cfc3e60129eec360521e3d')
 python3_ver="3.10"
+python2_ver="2.7"
 
 #=========================================
 prepare() {
-  cd bareos
-  # fix: в форме востановления нельзя выбрать задание на восстановление
-  #patch --forward --strip=1 --input="../../restore-form.patch"
-  patch --forward --strip=1 --input="../fix-build-bareos.patch"
-  patch --forward --strip=1 --input="../fix-headlink.patch"
-  patch --forward --strip=1 --input="../mysql.patch"
-  patch --forward --strip=1 --input="../PoolModel.patch"
+    # Apply maintainer patches
+    cd "${srcdir}/${pkgbase}"
+    local _src
+    local _patch="patch -N -t -p0 -l --no-backup-if-mismatch -i"
+    for _src in "${source[@]}"; do
+        _src="${_src%%::*}"
+        _src="${_src##*/}"
+        [[ $_src = *.patch ]] || continue
+        echo "Applying patch $_src..."
+        $_patch "../$_src"
+    done
 }
 
 #=========================================
 build() {
-  cd bareos
+  cd "${srcdir}/${pkgbase}"
   mkdir -p build
   cd build
 
@@ -79,22 +100,7 @@ build() {
     -DCMAKE_INSTALL_LOCALSTATEDIR=/ \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib/bareos \
     -Dlibdir=/usr/lib/bareos \
-    -Dconio=no \
-    -Ddynamic-cats-backends=yes \
-    -Ddynamic-storage-backends=yes \
-    -Drpath=no \
-    -Dpostgresql=yes \
-    -Dmysql=yes \
-    -Dpython=yes \
-    -Dopenssl=yes \
-    -Dsqlite3=yes \
     -Dlogdir=/var/log/bareos \
-    -Ddir-user=bareos \
-    -Ddir-group=bareos \
-    -Dsd-user=bareos \
-    -Dsd-group=bareos \
-    -Dfd-user=root \
-    -Dfd-group=root \
     -Dpiddir=/run/bareos \
     -Dsubsysdir=/run/bareos \
     -Dconfdir=/etc/bareos \
@@ -105,54 +111,57 @@ build() {
     -Dbackenddir=/usr/lib/bareos/backends \
     -Darchivedir=/var/lib/bareos/storage \
     -Dbsrdir=/var/lib/bareos \
+    -Dwebuiconfdir=/etc/bareos-webui \
+    -DBAREOS_BINARY_INFO="Arch Linux" \
+    -DBAREOS_JOBLOG_MESSAGE="Arch Linux AUR" \
+    -Ddynamic-cats-backends=yes \
+    -Ddynamic-storage-backends=yes \
+    -Dpostgresql=yes \
+    -Dpython=yes \
+    -Dopenssl=yes \
+    -Ddir-user=bareos \
+    -Ddir-group=bareos \
+    -Dsd-user=bareos \
+    -Dsd-group=bareos \
+    -Dfd-user=root \
+    -Dfd-group=root \
+    -Dscsi-crypto=yes \
     -Dsystemd=yes \
-    -Dtraymonitor=no
+    -Dtraymonitor=yes
 
   make DESTDIR="${srcdir}/install" install
 }
 
 #=========================================
-_cp() {
-  mkdir -p "$(dirname $2)"
-  cp -a "$1" "$(dirname $2)"
-}
-
-#=========================================
-package_bareos-common() {
-  pkgdesc="${pkgdesc} - Common files"
-  depends=('libcap' 'openssl' 'acl' 'bash' 'lzo' 'jansson' 'zlib')
-  install=bareos-common.install
-
-  for f in \
-      usr/lib/bareos/libbareos.so.$pkgver \
-      usr/lib/bareos/libbareos.so.$pkgmajor \
-      usr/lib/bareos/libbareos.so \
-      usr/lib/bareos/libbareosfind.so.$pkgver \
-      usr/lib/bareos/libbareosfind.so.$pkgmajor \
-      usr/lib/bareos/libbareosfind.so \
-      usr/lib/bareos/libbareoslmdb.so.$pkgver \
-      usr/lib/bareos/libbareoslmdb.so.$pkgmajor \
-      usr/lib/bareos/libbareoslmdb.so \
-      usr/lib/bareos/libbareosndmp.so.$pkgver \
-      usr/lib/bareos/libbareosndmp.so.$pkgmajor \
-      usr/lib/bareos/libbareosndmp.so \
-      usr/lib/bareos/libbareosfastlz.so \
-      usr/lib/bareos/libbareosfastlz.so.$pkgver \
-      usr/lib/bareos/libbareosfastlz.so.$pkgmajor \
-      usr/lib/bareos/scripts/bareos-config \
-      usr/lib/bareos/scripts/bareos-config-lib.sh \
-      usr/lib/bareos/scripts/btraceback.gdb \
-      usr/bin/bsmtp \
-      usr/bin/btraceback \
-      usr/share/man/man1/bsmtp.1 \
-      usr/share/man/man8/btraceback.8 \
-  ; do
-    _cp $srcdir/install/$f $pkgdir/$f
-  done
-  install -d -m750 ${pkgdir}/var/lib/bareos
-  install -d -m750 ${pkgdir}/etc/bareos
-  install -d -m750 ${pkgdir}/run/bareos
-  install -d -m750 ${pkgdir}/var/log/bareos
+# + only directory created
+# - skip a line
+# directory - add recursively an arbitrary directory
+cp_pkgdir() {
+  if [ "${1:0:1}" = "-" ] ; then
+     return
+  elif [ "${1:0:1}" = "+" ] ; then
+     dir_name=$pkgdir/`echo "$1" | sed "s|+||"`
+     mkdir -p "$dir_name"
+     return
+  fi
+  for n in $2$1 \
+  ; do
+    if [ -f "$n" ]; then
+       dir_name=$pkgdir/$(dirname "$n" | sed "s|$2||")
+    else
+       dir_name=$pkgdir/`echo "$n" | sed "s|$2||"`
+    fi
+    if [ "${dir_name:0:1}" == "." ]; then
+        return
+    else
+       mkdir -p "$dir_name"
+    fi
+    if [ -f "$n" ]; then
+       cp -a "$n" "$dir_name"
+    elif [ -d "$n" ]; then
+       cp -aR "$n" "$(dirname $dir_name)"
+    fi
+  done
 }
 
 #=========================================
@@ -163,67 +172,66 @@ package_bareos-bconsole() {
   install=bareos-bconsole.install
   backup=("etc/bareos/bconsole.conf")
 
-  install -d -m750 ${pkgdir}/etc/bareos
-  install -m640 "${srcdir}/install/usr/share/bareos/config/bconsole.conf" \
-          "${pkgdir}/etc/bareos/bconsole.conf"
-
   for f in \
-    usr/bin/bconsole \
-    usr/share/man/man1/bconsole.1 \
-    usr/share/bareos/config/bconsole.conf \
+     usr/share/bareos/config/bconsole.conf \
+     usr/bin/bconsole \
+     usr/share/man/man1/bconsole.1* \
+     +etc/bareos \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
+  install -m640 "${srcdir}/install/usr/share/bareos/config/bconsole.conf" \
+          "${pkgdir}/etc/bareos/bconsole.conf"
 }
 
 #=========================================
-package_bareos-database-common() {
-  pkgdesc="${pkgdesc} - Generic abstration libs and tools for sql catalog"
-  depends=("bareos-common=${pkgver}" 'libcap' 'lzo' 'zlib' 'openssl' 'bash' 'jansson')
-
+package_bareos-common() {
+  pkgdesc="${pkgdesc} - Common files"
+  depends=('libcap' 'openssl' 'acl' 'bash' 'lzo' 'jansson' 'zlib')
+  install=bareos-common.install
   for f in \
-    usr/lib/bareos/libbareoscats.so.${pkgver} \
-    usr/lib/bareos/libbareoscats.so.${pkgmajor} \
-    usr/lib/bareos/libbareoscats.so \
-    usr/lib/bareos/libbareossql.so.${pkgver} \
-    usr/lib/bareos/libbareossql.so.${pkgmajor} \
-    usr/lib/bareos/libbareossql.so \
-    usr/lib/bareos/scripts/create_bareos_database \
-    usr/lib/bareos/scripts/drop_bareos_database \
-    usr/lib/bareos/scripts/drop_bareos_tables \
-    usr/lib/bareos/scripts/grant_bareos_privileges \
-    usr/lib/bareos/scripts/make_bareos_tables \
-    usr/lib/bareos/scripts/update_bareos_tables \
-    usr/lib/bareos/scripts/ddl/versions.map \
+     usr/lib/bareos/libbareos.so* \
+     usr/lib/bareos/libbareosfastlz.so* \
+     usr/lib/bareos/libbareosfind.so* \
+     usr/lib/bareos/libbareoslmdb.so* \
+     usr/lib/bareos/libbareosndmp.so* \
+     usr/lib/bareos/libbareossd.so* \
+     usr/lib/bareos/scripts/bareos-config \
+     usr/lib/bareos/scripts/bareos-config-lib.sh \
+     usr/lib/bareos/scripts/bareos-explorer \
+     usr/lib/bareos/scripts/btraceback.gdb \
+     usr/bin/bsmtp \
+     usr/bin/btraceback \
+     usr/share/man/man1/bsmtp.1* \
+     usr/share/man/man8/btraceback.8* \
+     var/lib/bareos \
+     +etc/bareos \
+     +var/log/bareos \
+     +run/bareos \
+     +usr/share/licenses/${pkgname} \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
+  install -Dm644 ${srcdir}/bareos/core/{AGPL-3.0.txt,LICENSE,README.*} "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
 
-#=========================================
-package_bareos-database-mysql() {
-  pkgdesc="${pkgdesc} - Libs and tools for mysql catalog"
-  provides=("bareos-database=${pkgver}")
-  depends=("bareos-database-common=${pkgver}" 'libmariadbclient')
-  install=bareos-database-mysql.install
 
+#=========================================
+package_bareos-database-common() {
+  pkgdesc="${pkgdesc} - Generic abstration libs and tools for sql catalog"
+  depends=("bareos-common=${pkgver}" 'libcap' 'lzo' 'zlib' 'openssl' 'bash' 'jansson')
   for f in \
-    usr/lib/bareos/backends/libbareoscats-mysql.so \
-    usr/lib/bareos/scripts/ddl/drops/mysql.sql \
-    usr/lib/bareos/scripts/ddl/grants/mysql.sql \
-    usr/lib/bareos/scripts/ddl/grants/mysql-readonly.sql \
-    usr/lib/bareos/scripts/ddl/creates/mysql.sql \
-    usr/lib/bareos/scripts/ddl/updates/mysql.10_11.sql \
-    usr/lib/bareos/scripts/ddl/updates/mysql.11_12.sql \
-    usr/lib/bareos/scripts/ddl/updates/mysql.12_14.sql \
-    usr/lib/bareos/scripts/ddl/updates/mysql.14_2001.sql \
-    usr/lib/bareos/scripts/ddl/updates/mysql.2001_2002.sql \
-    usr/lib/bareos/scripts/ddl/updates/mysql.2002_2003.sql \
-    usr/lib/bareos/scripts/ddl/updates/mysql.2003_2004.sql \
-    usr/lib/bareos/scripts/ddl/updates/mysql.2004_2171.sql \
-    usr/lib/bareos/scripts/ddl/updates/mysql.2171_2192.sql \
+     usr/lib/bareos/libbareossql.so* \
+     usr/lib/bareos/libbareoscats.so* \
+     usr/lib/bareos/scripts/create_bareos_database \
+     usr/lib/bareos/scripts/drop_bareos_database \
+     usr/lib/bareos/scripts/drop_bareos_tables \
+     usr/lib/bareos/scripts/grant_bareos_privileges \
+     usr/lib/bareos/scripts/make_bareos_tables \
+     usr/lib/bareos/scripts/update_bareos_tables \
+     usr/lib/bareos/scripts/ddl/versions.map \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
@@ -233,49 +241,11 @@ package_bareos-database-postgresql() {
   provides=("bareos-database=${pkgver}")
   depends=("bareos-database-common=${pkgver}" "postgresql-libs")
   install=bareos-database-postgresql.install
-
   for f in \
-    usr/lib/bareos/backends/libbareoscats-postgresql.so \
-    usr/lib/bareos/scripts/ddl/drops/postgresql.sql \
-    usr/lib/bareos/scripts/ddl/grants/postgresql-change_owner.dbconfig-template.sql \
-    usr/lib/bareos/scripts/ddl/grants/postgresql-readonly.sql \
-    usr/lib/bareos/scripts/ddl/grants/postgresql.sql \
-    usr/lib/bareos/scripts/ddl/creates/postgresql.sql \
-    usr/lib/bareos/scripts/ddl/updates/postgresql.10_11.sql \
-    usr/lib/bareos/scripts/ddl/updates/postgresql.11_12.sql \
-    usr/lib/bareos/scripts/ddl/updates/postgresql.12_14.sql \
-    usr/lib/bareos/scripts/ddl/updates/postgresql.14_2001.sql \
-    usr/lib/bareos/scripts/ddl/updates/postgresql.2001_2002.sql \
-    usr/lib/bareos/scripts/ddl/updates/postgresql.2002_2003.sql \
-    usr/lib/bareos/scripts/ddl/updates/postgresql.2003_2004.sql \
-    usr/lib/bareos/scripts/ddl/updates/postgresql.2004_2171.sql \
-    usr/lib/bareos/scripts/ddl/updates/postgresql.2171_2192.sql \
-    usr/lib/bareos/scripts/ddl/updates/postgresql.bee.1017_2004.sql \
-  ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
-  done
-}
-
-#=========================================
-package_bareos-database-sqlite3() {
-  pkgdesc="${pkgdesc} - Libs and tools for sqlite3 catalog"
-  provides=("bareos-database=${pkgver}")
-  depends=("bareos-database-common=${pkgver}" "sqlite3")
-
-  for f in \
-    usr/lib/bareos/backends/libbareoscats-sqlite3.so \
-    usr/lib/bareos/scripts/ddl/creates/sqlite3.sql \
-    usr/lib/bareos/scripts/ddl/updates/sqlite3.10_11.sql \
-    usr/lib/bareos/scripts/ddl/updates/sqlite3.11_12.sql \
-    usr/lib/bareos/scripts/ddl/updates/sqlite3.12_14.sql \
-    usr/lib/bareos/scripts/ddl/updates/sqlite3.14_2001.sql \
-    usr/lib/bareos/scripts/ddl/updates/sqlite3.2001_2002.sql \
-    usr/lib/bareos/scripts/ddl/updates/sqlite3.2002_2003.sql \
-    usr/lib/bareos/scripts/ddl/updates/sqlite3.2003_2004.sql \
-    usr/lib/bareos/scripts/ddl/updates/sqlite3.2004_2171.sql \
-    usr/lib/bareos/scripts/ddl/updates/sqlite3.2171_2192.sql \
+     usr/lib/bareos/backends/libbareoscats-postgresql.so* \
+     usr/lib/bareos/scripts/ddl/*/postgresql*.sql \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
@@ -285,12 +255,12 @@ package_bareos-database-tools() {
   depends=("bareos-database-common=${pkgver}" 'openssl' 'jansson')
 
   for f in \
-    usr/bin/bareos-dbcheck \
-    usr/bin/bscan \
-    usr/share/man/man8/bareos-dbcheck.8 \
-    usr/share/man/man8/bscan.8 \
+     usr/bin/bareos-dbcheck \
+     usr/bin/bscan \
+     usr/share/man/man8/bareos-dbcheck.8* \
+     usr/share/man/man8/bscan.8* \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
@@ -300,7 +270,7 @@ package_bareos-devel() {
   arch=(any)
   # TODO
   install -d ${pkgdir}/usr/include/bareos
-  install -m640 ${srcdir}/install/usr/include/bareos/* ${pkgdir}/usr/include/bareos
+  install -m640 ${srcdir}/bareos/core/src/lib/*.h ${pkgdir}/usr/include/bareos
 }
 
 #=========================================
@@ -308,83 +278,91 @@ package_bareos-director() {
   pkgdesc="${pkgdesc} - Director daemon"
   depends=("bareos-common=${pkgver}" 'openssl' 'bash' 'jansson')
   install=bareos-director.install
-
   for f in \
-    usr/lib/bareos/scripts/delete_catalog_backup \
-    usr/lib/bareos/scripts/make_catalog_backup \
-    usr/lib/bareos/scripts/make_catalog_backup.pl \
-    usr/lib/bareos/scripts/query.sql \
-    usr/share/bareos/config/bareos-dir.d/catalog/MyCatalog.conf \
-    usr/share/bareos/config/bareos-dir.d/client/bareos-fd.conf \
-    usr/share/bareos/config/bareos-dir.d/console/bareos-mon.conf \
-    usr/share/bareos/config/bareos-dir.d/director/bareos-dir.conf \
-    usr/share/bareos/config/bareos-dir.d/fileset/Catalog.conf \
-    usr/share/bareos/config/bareos-dir.d/fileset/LinuxAll.conf \
-    usr/share/bareos/config/bareos-dir.d/fileset/SelfTest.conf \
-    usr/share/bareos/config/bareos-dir.d/fileset/Windows\ All\ Drives.conf \
-    usr/share/bareos/config/bareos-dir.d/job/backup-bareos-fd.conf \
-    usr/share/bareos/config/bareos-dir.d/job/BackupCatalog.conf \
-    usr/share/bareos/config/bareos-dir.d/job/RestoreFiles.conf \
-    usr/share/bareos/config/bareos-dir.d/jobdefs/DefaultJob.conf \
-    usr/share/bareos/config/bareos-dir.d/messages/Daemon.conf \
-    usr/share/bareos/config/bareos-dir.d/messages/Standard.conf \
-    usr/share/bareos/config/bareos-dir.d/pool/Differential.conf \
-    usr/share/bareos/config/bareos-dir.d/pool/Full.conf \
-    usr/share/bareos/config/bareos-dir.d/pool/Incremental.conf \
-    usr/share/bareos/config/bareos-dir.d/pool/Scratch.conf \
-    usr/share/bareos/config/bareos-dir.d/profile/operator.conf \
-    usr/share/bareos/config/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf \
-    usr/share/bareos/config/bareos-dir.d/schedule/WeeklyCycle.conf \
-    usr/share/bareos/config/bareos-dir.d/storage/File.conf \
-    usr/bin/bareos-dir \
-    usr/share/man/man8/bareos-dir.8 \
-    usr/share/man/man8/bareos.8 \
-    etc/logrotate.d/bareos-dir \
+     etc/logrotate.d/bareos-dir \
+     usr/lib/bareos/scripts/delete_catalog_backup \
+     usr/lib/bareos/scripts/make_catalog_backup \
+     usr/lib/bareos/scripts/make_catalog_backup.pl \
+     usr/lib/bareos/scripts/query.sql \
+     usr/share/bareos/config/bareos-dir.d/catalog/MyCatalog.conf \
+     usr/share/bareos/config/bareos-dir.d/client/bareos-fd.conf \
+     usr/share/bareos/config/bareos-dir.d/console/bareos-mon.conf \
+     usr/share/bareos/config/bareos-dir.d/director/bareos-dir.conf \
+     usr/share/bareos/config/bareos-dir.d/fileset/Catalog.conf \
+     usr/share/bareos/config/bareos-dir.d/fileset/LinuxAll.conf \
+     usr/share/bareos/config/bareos-dir.d/fileset/SelfTest.conf \
+     usr/share/bareos/config/bareos-dir.d/fileset/Windows?All?Drives.conf \
+     usr/share/bareos/config/bareos-dir.d/job/backup-bareos-fd.conf \
+     usr/share/bareos/config/bareos-dir.d/job/BackupCatalog.conf \
+     usr/share/bareos/config/bareos-dir.d/job/RestoreFiles.conf \
+     usr/share/bareos/config/bareos-dir.d/jobdefs/DefaultJob.conf \
+     usr/share/bareos/config/bareos-dir.d/messages/Daemon.conf \
+     usr/share/bareos/config/bareos-dir.d/messages/Standard.conf \
+     usr/share/bareos/config/bareos-dir.d/pool/Differential.conf \
+     usr/share/bareos/config/bareos-dir.d/pool/Full.conf \
+     usr/share/bareos/config/bareos-dir.d/pool/Incremental.conf \
+     usr/share/bareos/config/bareos-dir.d/pool/Scratch.conf \
+     usr/share/bareos/config/bareos-dir.d/profile/operator.conf \
+     usr/share/bareos/config/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf \
+     usr/share/bareos/config/bareos-dir.d/schedule/WeeklyCycle.conf \
+     usr/share/bareos/config/bareos-dir.d/storage/File.conf \
+     usr/share/bareos/config/bareos-dir.d/user \
+     usr/share/bareos/config/tray-monitor.d/director/Director-local*.conf \
+     usr/bin/bareos-dir \
+     usr/share/man/man8/bareos-dir.8* \
+     usr/share/man/man8/bareos.8* \
+     usr/lib/systemd/system/bareos-dir.service \
   ; do
     # pacman LINT tool currently does not like spaces
-    space_removal=`echo $f | tr ' ' '_'`
-    _cp "${srcdir}/install/$f" "${pkgdir}/${space_removal}"
+    #space_removal=`echo $f | tr ' ' '_'`
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 
   # Currently upstream systemd file does not automatically create run directory
-  sed -i '/\[Service\]/a RuntimeDirectory=bareos' ${srcdir}/bareos/core/platforms/systemd/bareos-dir.service
-  _cp ${srcdir}/bareos/core/platforms/systemd/bareos-dir.service ${pkgdir}/usr/lib/systemd/system/bareos-dir.service
-  _cp ${srcdir}/install/etc/logrotate.d ${pkgdir}/etc/logrotate.d
+  sed -i '/\[Service\]/a RuntimeDirectory=bareos' ${pkgdir}/usr/lib/systemd/system/bareos-dir.service
 }
 
 #=========================================
-package_bareos-storage-fifo() {
-  pkgdesc="${pkgdesc} - FIFO support for storage daemon"
-  depends=("bareos-storage=${pkgver}" 'zlib' 'libcap' 'openssl' 'jansson' 'lzo')
+package_bareos-director-python-plugins-common() {
+  pkgdesc="${pkgdesc} - This package contains the common files for the python 2 and python 3 director plugins"
+  depends=("bareos-director=${pkgver}")
+
   for f in \
-    usr/lib/bareos/backends/libbareossd-fifo.so \
-    usr/share/bareos/config/bareos-dir.d/storage/NULL.conf.example \
-    usr/share/bareos/config/bareos-sd.d/device/NULL.conf.example \
+     usr/lib/bareos/plugins/BareosDirWrapper.py* \
+     usr/lib/bareos/plugins/BareosDirPluginBaseclass.py* \
+     usr/lib/bareos/plugins/bareos-dir-class-plugin.py* \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
 #=========================================
-package_bareos-tools() {
-  pkgdesc="${pkgdesc} - CLI tools (bcopy, bextract, bls, bregeq, bwild)"
-  depends=("bareos-common=${pkgver}" 'glibc')
+package_bareos-director-python2-plugin() {
+  conflicts=("bareos-director-python-plugin")
+  pkgdesc="${pkgdesc} - Python plugin for director daemon"
+  depends=("bareos-director=${pkgver}"
+           "bareos-director-python-plugins-common=${pkgver}"
+           'python2' 'libcap' 'jansson' 'lzo')
+  for f in \
+     usr/lib/bareos/plugins/python-dir.so \
+     usr/lib/python2.7/site-packages/bareosdir.so \
+  ; do
+    cp_pkgdir "$f" "$srcdir/install/"
+  done
+}
 
+#=========================================
+package_bareos-director-python3-plugin() {
+  conflicts=("bareos-director-python-plugin")
+  pkgdesc="${pkgdesc} - Python plugin for director daemon"
+  depends=("bareos-director=${pkgver}"
+           "bareos-director-python-plugins-common=${pkgver}"
+           'python' 'libcap' 'jansson' 'lzo')
   for f in \
-    usr/bin/bregex \
-    usr/bin/bwild \
-    usr/bin/bcopy \
-    usr/bin/bextract \
-    usr/bin/bls \
-    usr/bin/bpluginfo \
-    usr/share/man/man1/bwild.1 \
-    usr/share/man/man1/bregex.1 \
-    usr/share/man/man8/bcopy.8 \
-    usr/share/man/man8/bextract.8 \
-    usr/share/man/man8/bls.8 \
-    usr/share/man/man8/bpluginfo.8 \
+     usr/lib/bareos/plugins/python3-dir.so \
+     usr/lib/python${python3_ver}/site-packages/bareosdir.cpython*.so \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
@@ -394,147 +372,124 @@ package_bareos-filedaemon() {
   depends=("bareos-common=${pkgver}" 'jansson' 'zlib' 'gcc-libs')
   groups+=('bareos-client')
   install=bareos-filedaemon.install
-
   for f in \
-    usr/share/bareos/config/bareos-fd.d/client/myself.conf \
-    usr/share/bareos/config/bareos-fd.d/director/bareos-dir.conf \
-    usr/share/bareos/config/bareos-fd.d/director/bareos-mon.conf \
-    usr/share/bareos/config/bareos-fd.d/messages/Standard.conf \
-    usr/bin/bareos-fd \
-    usr/lib/bareos/plugins/bpipe-fd.so \
-    usr/share/man/man8/bareos-fd.8 \
+     usr/share/bareos/config/bareos-fd.d/client/myself.conf \
+     usr/share/bareos/config/bareos-fd.d/director/bareos-dir.conf \
+     usr/share/bareos/config/bareos-fd.d/director/bareos-mon.conf \
+     usr/share/bareos/config/bareos-fd.d/messages/Standard.conf \
+     usr/share/bareos/config/tray-monitor.d/client/FileDaemon-local*.conf \
+     usr/bin/bareos-fd \
+     usr/lib/bareos/plugins/bpipe-fd.so \
+     usr/share/man/man8/bareos-fd.8* \
+     usr/lib/systemd/system/bareos-fd.service \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
-
   # Currently upstream systemd file does not automatically create run directory
-  sed -i '/\[Service\]/a RuntimeDirectory=bareos' ${srcdir}/bareos/core/platforms/systemd/bareos-fd.service
-  _cp ${srcdir}/bareos/core/platforms/systemd/bareos-fd.service ${pkgdir}/usr/lib/systemd/system/bareos-fd.service
+  sed -i '/\[Service\]/a RuntimeDirectory=bareos' ${pkgdir}/usr/lib/systemd/system/bareos-fd.service
 }
 
 #=========================================
-package_bareos-storage() {
-  pkgdesc="${pkgdesc} - Storage daemon"
-  depends=("bareos-common=${pkgver}" 'zlib' 'lzo' 'jansson' 'openssl' 'libcap')
-  install=bareos-storage.install
-
+package_bareos-filedaemon-glusterfs-plugin() {
+  pkgdesc="${pkgdesc} - GlusterFS plugin for Bareos File daemon"
+  depends=("bareos-filedaemon=${pkgver}"
+           "glusterfs")
   for f in \
-    usr/lib/bareos/plugins/autoxflate-sd.so \
-    usr/lib/bareos/scripts/disk-changer \
-    usr/share/bareos/config/bareos-sd.d/device/FileStorage.conf \
-    usr/share/bareos/config/bareos-sd.d/director/bareos-dir.conf \
-    usr/share/bareos/config/bareos-sd.d/director/bareos-mon.conf \
-    usr/share/bareos/config/bareos-sd.d/messages/Standard.conf \
-    usr/share/bareos/config/bareos-sd.d/storage/bareos-sd.conf \
-    usr/bin/bareos-sd \
-    usr/share/man/man8/bareos-sd.8 \
-    usr/lib/bareos/libbareossd.so \
+     usr/lib/bareos/plugins/gfapi-fd.so \
+     usr/share/bareos/config/bareos-dir.d/fileset/plugin-gfapi.conf.example \
+     usr/share/bareos/config/bareos-dir.d/job/BackupGFAPI.conf.example \
+     usr/share/bareos/config/bareos-dir.d/job/RestoreGFAPI.conf.example \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
-
-  install -d -m750 ${pkgdir}/var/lib/bareos/storage
-  # Currently upstream systemd file does not automatically create run directory
-  sed -i '/\[Service\]/a RuntimeDirectory=bareos' ${srcdir}/bareos/core/platforms/systemd/bareos-sd.service
-  _cp ${srcdir}/bareos/core/platforms/systemd/bareos-sd.service ${pkgdir}/usr/lib/systemd/system/bareos-sd.service
 }
 
 #=========================================
-package_bareos-storage-tape() {
-  pkgdesc="${pkgdesc} - Tape support for storage daemon"
-  depends=("bareos-storage=${pkgver}" 'zlib' 'libcap' 'bash' 'openssl' 'jansson' 'lzo' "mtx")
-  backup=(etc/bareos/mtx-changer.conf)
+package_bareos-filedaemon-ldap-python-plugin() {
+  pkgdesc="${pkgdesc} - LDAP Python plugin for Bareos File daemon"
+  depends=("bareos-filedaemon=${pkgver}"
+           "bareos-filedaemon-python3-plugin=${pkgver}"
+           'python-ldap')
+  #backup=("etc/bareos/bareos-dir.d/plugin-python-ldap.conf")
 
   for f in \
-    etc/bareos/mtx-changer.conf \
-    usr/share/bareos/config/bareos-dir.d/storage/Tape.conf.example \
-    usr/share/bareos/config/bareos-sd.d/autochanger/autochanger-0.conf.example \
-    usr/share/bareos/config/bareos-sd.d/device/tapedrive-0.conf.example \
-    usr/lib/bareos/backends/libbareossd-gentape.so \
-    usr/lib/bareos/backends/libbareossd-tape.so \
-    usr/lib/bareos/scripts/mtx-changer \
-    usr/share/man/man8/bscrypto.8 \
-    usr/share/man/man8/btape.8 \
-    usr/bin/bscrypto \
-    usr/bin/btape \
+     usr/lib/bareos/plugins/bareos-fd-ldap.py* \
+     usr/lib/bareos/plugins/BareosFdPluginLDAP.py* \
+     usr/share/bareos/config/bareos-dir.d/fileset/plugin-ldap.conf.example \
+     usr/share/bareos/config/bareos-dir.d/job/backup-ldap.conf.example \
+     usr/share/bareos/config/bareos-dir.d/job/restore-ldap.conf.example \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
 #=========================================
-package_bareos-director-python-plugins-common() {
-  pkgdesc="${pkgdesc} - This package contains the common files for the python 2 and python 3 director plugins"
-  depends=("bareos-director=${pkgver}")
-
+package_bareos-filedaemon-libcloud-python-plugin() {
+  pkgdesc="${pkgdesc} - Libcloud Python plugin for Bareos File daemon"
+  depends=("bareos-filedaemon=${pkgver}"
+           "python-apache-libcloud")
   for f in \
-    usr/lib/bareos/plugins/BareosDirPluginBaseclass.py \
-    usr/lib/bareos/plugins/bareos-dir-class-plugin.py \
-    usr/lib/bareos/plugins/BareosDirWrapper.py \
+     usr/lib/bareos/plugins/bareos-fd-libcloud.py* \
+     usr/lib/bareos/plugins/BareosFdPluginLibcloud.py* \
+     usr/lib/bareos/plugins/BareosLibcloudApi.py \
+     usr/lib/bareos/plugins/bareos_libcloud_api \
+     usr/lib/bareos/plugins/bareos_libcloud_api/* \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
 #=========================================
-package_bareos-filedaemon-python-plugins-common() {
-  pkgdesc="${pkgdesc} - This package contains the common files for the python 2 and python 3 filedaemon plugins"
-  depends=("bareos-filedaemon=${pkgver}")
-
+package_bareos-filedaemon-mariabackup-python-plugin() {
+  pkgdesc="${pkgdesc} - MariaBackup plugin for Bareos File daemon"
+  depends=("bareos-filedaemon=${pkgver}"
+           "mariadb")
   for f in \
-    usr/lib/bareos/plugins/bareos-fd-local-fileset.py \
-    usr/lib/bareos/plugins/BareosFdPluginBaseclass.py \
-    usr/lib/bareos/plugins/BareosFdPluginLocalFileset.py \
-    usr/lib/bareos/plugins/BareosFdPluginLocalFilesBaseclass.py \
-    usr/lib/bareos/plugins/BareosFdWrapper.py \
+     usr/lib/bareos/plugins/bareos-fd-mariabackup.py* \
+     usr/lib/bareos/plugins/BareosFdPluginMariabackup.py* \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
 #=========================================
-package_bareos-storage-python-plugins-common() {
-  pkgdesc="${pkgdesc} - This package contains the common files for the python 2 and python 3 storage plugins"
-  depends=("bareos-storage=${pkgver}")
-
+package_bareos-filedaemon-percona-xtrabackup-python-plugin() {
+  pkgdesc="${pkgdesc} - XtraBackup plugin for Bareos File daemon"
+  depends=("bareos-filedaemon=${pkgver}"
+           "xtrabackup")
   for f in \
-    usr/lib/bareos/plugins/BareosSdPluginBaseclass.py \
-    usr/lib/bareos/plugins/BareosSdWrapper.py \
-    usr/lib/bareos/plugins/bareos-sd-class-plugin.py \
+     usr/lib/bareos/plugins/bareos-fd-percona-xtrabackup.py* \
+     usr/lib/bareos/plugins/BareosFdPluginPerconaXtraBackup.py* \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
 #=========================================
-package_bareos-director-python2-plugin() {
-  conflicts=("bareos-director-python-plugin")
-  pkgdesc="${pkgdesc} - Python plugin for director daemon"
-  depends=("bareos-director=${pkgver}"
-           "bareos-director-python-plugins-common=${pkgver}"
-           'python2' 'libcap' 'jansson' 'lzo')
-
+package_bareos-filedaemon-postgresql-python-plugin() {
+  pkgdesc="${pkgdesc} - PostgreSQL plugin for Bareos File daemon"
+  depends=("bareos-filedaemon=${pkgver}"
+           "postgresql")
   for f in \
-    usr/lib/bareos/plugins/python-dir.so \
-    usr/lib/python2.7/site-packages/bareosdir.so \
+     usr/lib/bareos/plugins/bareos-fd-postgres.py* \
+     usr/lib/bareos/plugins/BareosFdPluginPostgres.py* \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
 #=========================================
-package_bareos-director-python3-plugin() {
-  conflicts=("bareos-director-python-plugin")
-  pkgdesc="${pkgdesc} - Python plugin for director daemon"
-  depends=("bareos-director=${pkgver}"
-           "bareos-director-python-plugins-common=${pkgver}"
-           'python' 'libcap' 'jansson' 'lzo')
-
+package_bareos-filedaemon-python-plugins-common() {
+  pkgdesc="${pkgdesc} - This package contains the common files for the python 2 and python 3 filedaemon plugins"
+  depends=("bareos-filedaemon=${pkgver}")
   for f in \
-    usr/lib/bareos/plugins/python3-dir.so \
-    usr/lib/python${python3_ver}/site-packages/bareosdir.cpython-${python3_ver//\./}-x86_64-linux-gnu.so \
+     usr/lib/bareos/plugins/bareos-fd-local-fileset.py* \
+     usr/lib/bareos/plugins/BareosFdPluginBaseclass.py* \
+     usr/lib/bareos/plugins/BareosFdPluginLocalFileset.py* \
+     usr/lib/bareos/plugins/BareosFdPluginLocalFilesBaseclass.py* \
+     usr/lib/bareos/plugins/BareosFdWrapper.py* \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
@@ -545,12 +500,11 @@ package_bareos-filedaemon-python2-plugin() {
   depends=("bareos-filedaemon=${pkgver}"
            "bareos-filedaemon-python-plugins-common=${pkgver}"
            'python2' 'libcap' 'lzo' 'jansson')
-
   for f in \
     usr/lib/bareos/plugins/python-fd.so \
-    usr/lib/python2.7/site-packages/bareosfd.so \
+    usr/lib/python${python2_ver}/site-packages/bareosfd.so \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
@@ -561,12 +515,95 @@ package_bareos-filedaemon-python3-plugin() {
   depends=("bareos-filedaemon=${pkgver}"
            "bareos-filedaemon-python-plugins-common=${pkgver}"
            'python' 'libcap' 'lzo' 'jansson')
-
   for f in \
     usr/lib/bareos/plugins/python3-fd.so \
-    usr/lib/python${python3_ver}/site-packages/bareosfd.cpython-${python3_ver//\./}-x86_64-linux-gnu.so \
+    usr/lib/python${python3_ver}/site-packages/bareosfd.cpython*.so \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
+  done
+}
+
+#=========================================
+package_bareos-storage() {
+  pkgdesc="${pkgdesc} - Storage daemon"
+  depends=("bareos-common=${pkgver}" 'zlib' 'lzo' 'jansson' 'openssl' 'libcap')
+  install=bareos-storage.install
+  for f in \
+     usr/lib/bareos/plugins/autoxflate-sd.so \
+     usr/lib/bareos/scripts/disk-changer \
+     usr/share/bareos/config/bareos-sd.d/device/FileStorage.conf \
+     usr/share/bareos/config/bareos-sd.d/director/bareos-dir.conf \
+     usr/share/bareos/config/bareos-sd.d/director/bareos-mon.conf \
+     usr/share/bareos/config/bareos-sd.d/messages/Standard.conf \
+     usr/share/bareos/config/bareos-sd.d/storage/bareos-sd.conf \
+     usr/share/bareos/config/tray-monitor.d/storage/StorageDaemon-local*.conf \
+     usr/bin/bareos-sd \
+     usr/share/man/man8/bareos-sd.8 \
+     usr/lib/systemd/system/bareos-sd.service \
+     +var/lib/bareos/storage \
+  ; do
+    cp_pkgdir "$f" "$srcdir/install/"
+  done
+
+  # Currently upstream systemd file does not automatically create run directory
+  sed -i '/\[Service\]/a RuntimeDirectory=bareos' ${pkgdir}/usr/lib/systemd/system/bareos-sd.service
+}
+
+#=========================================
+package_bareos-storage-droplet() {
+  pkgdesc="${pkgdesc} - Droplet support for storage daemon"
+  depends=("bareos-storage=${pkgver}")
+  for f in \
+     usr/lib/bareos/libbareosdroplet.so* \
+     usr/lib/bareos/backends/libbareossd-chunked.so* \
+     usr/lib/bareos/backends/libbareossd-droplet.so* \
+     usr/share/bareos/config/bareos-dir.d/storage/S3_Object.conf.example \
+     usr/share/bareos/config/bareos-sd.d/device/S3_ObjectStorage.conf.example \
+     usr/share/bareos/config/bareos-sd.d/device/droplet \
+     usr/share/bareos/config/bareos-sd.d/device/droplet/aws_eu-central-1.profile.example \
+     usr/share/bareos/config/bareos-sd.d/device/droplet/ceph-rados-gateway.profile.example \
+  ; do
+    cp_pkgdir "$f" "$srcdir/install/"
+  done
+}
+
+#=========================================
+package_bareos-storage-fifo() {
+  pkgdesc="${pkgdesc} - FIFO support for storage daemon"
+  depends=("bareos-storage=${pkgver}" 'zlib' 'libcap' 'openssl' 'jansson' 'lzo')
+  for f in \
+    usr/lib/bareos/backends/libbareossd-fifo.so* \
+    usr/share/bareos/config/bareos-dir.d/storage/NULL.conf.example \
+    usr/share/bareos/config/bareos-sd.d/device/NULL.conf.example \
+  ; do
+    cp_pkgdir "$f" "$srcdir/install/"
+  done
+}
+
+#=========================================
+package_bareos-storage-glusterfs() {
+  pkgdesc="${pkgdesc} - GlusterFS support for storage daemon"
+  depends=("bareos-storage=${pkgver}" 
+           "glusterfs")
+  for f in \
+     usr/lib/bareos/backends/libbareossd-gfapi.so* \
+     usr/share/bareos/config/bareos-dir.d/storage/Gluster.conf.example \
+     usr/share/bareos/config/bareos-sd.d/device/GlusterStorage.conf.example \
+  ; do
+    cp_pkgdir "$f" "$srcdir/install/"
+  done
+}
+
+#=========================================
+package_bareos-storage-python-plugins-common() {
+  pkgdesc="${pkgdesc} - This package contains the common files for the python 2 and python 3 storage plugins"
+  depends=("bareos-storage=${pkgver}")
+  for f in \
+    usr/lib/bareos/plugins/BareosSdPluginBaseclass.py* \
+    usr/lib/bareos/plugins/BareosSdWrapper.py* \
+    usr/lib/bareos/plugins/bareos-sd-class-plugin.py* \
+  ; do
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
@@ -577,12 +614,11 @@ package_bareos-storage-python2-plugin() {
   depends=("bareos-storage=${pkgver}"
            "bareos-storage-python-plugins-common=${pkgver}"
            'python2' 'lzo' 'libcap' 'jansson')
-
   for f in \
     usr/lib/bareos/plugins/python-sd.so \
-    usr/lib/python2.7/site-packages/bareossd.so \
+    usr/lib/python${python2_ver}/site-packages/bareossd.so \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
@@ -593,31 +629,59 @@ package_bareos-storage-python3-plugin() {
   depends=("bareos-storage=${pkgver}"
            "bareos-storage-python-plugins-common=${pkgver}"
            'python' 'lzo' 'libcap' 'jansson')
-
   for f in \
     usr/lib/bareos/plugins/python3-sd.so \
-    usr/lib/python${python3_ver}/site-packages/bareossd.cpython-${python3_ver//\./}-x86_64-linux-gnu.so \
+    usr/lib/python${python3_ver}/site-packages/bareossd.cpython*.so \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
 #=========================================
-package_bareos-filedaemon-ldap-python-plugin() {
-  pkgdesc="${pkgdesc} - LDAP Python plugin for Bareos File daemon"
-  depends=("bareos-filedaemon=${pkgver}"
-           "bareos-filedaemon-python3-plugin=${pkgver}"
-           'python-ldap')
-  #backup=("etc/bareos/bareos-dir.d/plugin-python-ldap.conf")
+package_bareos-storage-tape() {
+  pkgdesc="${pkgdesc} - Tape support for storage daemon"
+  depends=("bareos-storage=${pkgver}" 'zlib' 'libcap' 'bash' 'openssl' 'jansson' 'lzo' "mtx")
+  backup=(etc/bareos/mtx-changer.conf)
+  for f in \
+     etc/bareos/mtx-changer.conf \
+     usr/share/bareos/config/bareos-dir.d/storage/Tape.conf.example \
+     usr/share/bareos/config/bareos-sd.d/autochanger/autochanger-0.conf.example \
+     usr/share/bareos/config/bareos-sd.d/device/tapedrive-0.conf.example \
+     usr/lib/bareos/backends/libbareossd-gentape.so* \
+     usr/lib/bareos/backends/libbareossd-tape.so* \
+     usr/lib/bareos/plugins/scsicrypto-sd.so \
+     usr/lib/bareos/plugins/scsitapealert-sd.so \
+     usr/lib/bareos/scripts/mtx-changer \
+     usr/share/man/man8/bscrypto.8* \
+     usr/share/man/man8/btape.8* \
+     usr/bin/bscrypto \
+     usr/bin/btape \
+  ; do
+    cp_pkgdir "$f" "$srcdir/install/"
+  done
+}
 
+#=========================================
+package_bareos-tools() {
+  pkgdesc="${pkgdesc} - CLI tools (bcopy, bextract, bls, bregeq, bwild, bregex)"
+  depends=("bareos-common=${pkgver}" 'glibc')
   for f in \
-    usr/lib/bareos/plugins/bareos-fd-ldap.py \
-    usr/lib/bareos/plugins/BareosFdPluginLDAP.py \
-    usr/share/bareos/config/bareos-dir.d/fileset/plugin-ldap.conf.example \
-    usr/share/bareos/config/bareos-dir.d/job/backup-ldap.conf.example \
-    usr/share/bareos/config/bareos-dir.d/job/restore-ldap.conf.example \
+     usr/bin/bregex \
+     usr/bin/bwild \
+     usr/bin/bcopy \
+     usr/bin/bextract \
+     usr/bin/bls \
+     usr/bin/bregex \
+     usr/bin/bwild \
+     usr/bin/bpluginfo \
+     usr/share/man/man1/bwild.1* \
+     usr/share/man/man1/bregex.1* \
+     usr/share/man/man8/bcopy.8* \
+     usr/share/man/man8/bextract.8* \
+     usr/share/man/man8/bls.8* \
+     usr/share/man/man8/bpluginfo.8* \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
 }
 
@@ -626,42 +690,72 @@ package_bareos-traymonitor() {
   groups+=("bareos-client")
   pkgdesc="${pkgdesc} - This package contains the tray monitor (QT based)"
   depends=("bareos-common=${pkgver}")
-  #backup=("etc/bareos/tray-monitor.d/tray-monitor.conf")
+  backup=("etc/bareos/tray-monitor.d/monitor/bareos-mon.conf"
+          "etc/bareos/tray-monitor.d/client/file-daemon.conf"
+          "etc/bareos/tray-monitor.d/director/director.conf"
+          "etc/bareos/tray-monitor.d/storage/storage-daemon.conf")
   install=bareos-traymonitor.install
-
-  install -d -m750 ${pkgdir}/etc/bareos/tray-monitor.d/monitor
-
   for f in \
     usr/bin/bareos-tray-monitor \
+    usr/share/bareos/config/tray-monitor.d/client/FileDaemon-local.conf \
+    usr/share/bareos/config/tray-monitor.d/director/Director-local.conf \
+    usr/share/bareos/config/tray-monitor.d/monitor/bareos-mon.conf \
+    usr/share/bareos/config/tray-monitor.d/storage/StorageDaemon-local.conf \
     usr/share/man/man1/bareos-tray-monitor.1 \
     usr/share/applications/bareos-tray-monitor.desktop \
     etc/xdg/autostart/bareos-tray-monitor.desktop \
     usr/share/pixmaps/bareos-tray-monitor.png \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
+  done
+
+  # tray-monitor needs configuration files to run
+  install -d -m750 ${pkgdir}/etc/bareos/tray-monitor.d/{client,director,monitor,storage}
+  install -m640 "${pkgdir}/usr/share/bareos/config/tray-monitor.d/monitor/bareos-mon.conf"          "${pkgdir}/etc/bareos/tray-monitor.d/monitor/bareos-mon.conf"
+  install -m640 "${pkgdir}/usr/share/bareos/config/tray-monitor.d/client/FileDaemon-local.conf"     "${pkgdir}/etc/bareos/tray-monitor.d/client/file-daemon.conf"
+  install -m640 "${pkgdir}/usr/share/bareos/config/tray-monitor.d/director/Director-local.conf"     "${pkgdir}/etc/bareos/tray-monitor.d/director/director.conf"
+  install -m640 "${pkgdir}/usr/share/bareos/config/tray-monitor.d/storage/StorageDaemon-local.conf" "${pkgdir}/etc/bareos/tray-monitor.d/storage/storage-daemon.conf"
+}
+
+#=========================================
+package_bareos-vmware-plugin() {
+  pkgdesc="${pkgdesc} - Bareos VMware plugin"
+  depends=('python2')
+  for f in \
+     usr/lib/bareos/plugins/BareosFdPluginVMware.py \
+     usr/lib/bareos/plugins/bareos-fd-vmware.py \
+     -usr/bin/vmware_cbt_tool.py \
+     +usr/bin \
+  ; do
+    cp_pkgdir "$f" "$srcdir/install/"
   done
+  install -m755 "${srcdir}/bareos/core/src/vmware/vmware_cbt_tool/vmware_cbt_tool.py" "${pkgdir}/usr/bin/vmware_cbt_tool.py"
 }
 
 #=========================================
 package_bareos-webui() {
   pkgdesc="${pkgdesc} - Webui (Bareos web administration)"
   depends=('php7' 'php7-fpm' 'jansson')
-  optdepend=('nginx' 'php7-apache')
+  optdepend=('apache' 'nginx' 'php7-apache' )
   backup=('etc/bareos-webui/directors.ini'
           'etc/bareos-webui/configuration.ini'
           'etc/bareos/bareos-dir.d/console/admin.conf.example'
           'etc/bareos/bareos-dir.d/profile/webui-admin.conf'
           'etc/httpd/conf/extra/bareos-webui.conf')
-
-  _cp ${srcdir}/install/usr/share/bareos-webui ${pkgdir}/usr/share/webapps/bareos-webui
-  sed -e "s|usr/share/bareos-webui/public|usr/share/webapps/bareos-webui/public|g" -i ${srcdir}/install/etc/httpd/conf.d/bareos-webui.conf
-  _cp ${srcdir}/install/etc/httpd/conf.d/bareos-webui.conf ${pkgdir}/etc/httpd/conf/extra/bareos-webui.conf
+  #_cp ${srcdir}/install/usr/share/bareos-webui ${pkgdir}/usr/share/webapps/bareos-webui
   for f in \
-    etc/bareos/bareos-dir.d/console/admin.conf.example \
-    etc/bareos/bareos-dir.d/profile/webui-admin.conf \
-    etc/bareos-webui \
+     etc/bareos/bareos-dir.d/console/admin.conf.example \
+     etc/bareos/bareos-dir.d/profile/webui-admin.conf \
+     etc/bareos/bareos-dir.d/profile/webui-limited.conf.example \
+     etc/bareos/bareos-dir.d/profile/webui-readonly.conf \
+     etc/httpd/conf/extra/bareos-webui.conf \
+     etc/bareos-webui/directors.ini \
+     etc/bareos-webui/configuration.ini \
+     usr/share/bareos-webui \
+     +usr/share/licenses/${pkgname} \
   ; do
-    _cp ${srcdir}/install/$f ${pkgdir}/$f
+    cp_pkgdir "$f" "$srcdir/install/"
   done
-  cp ${srcdir}/bootstrap-table-locale-all.min.js ${pkgdir}/usr/share/webapps/bareos-webui/public/js/bootstrap-table-locale-all.min.js
+  cp ${srcdir}/bootstrap-table-locale-all.min.js ${pkgdir}/usr/share/bareos-webui/public/js/bootstrap-table-locale-all.min.js
+  install -Dm644 ${srcdir}/bareos/webui/{README.md,LICENSE,doc/README-TRANSLATION.md} "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/bareos-database-mysql.install b/bareos-database-mysql.install
index 9cebd5f8b7a2..d462aced941d 100644
--- a/bareos-database-mysql.install
+++ b/bareos-database-mysql.install
@@ -3,16 +3,13 @@ coloroff='\e[0m'
 
 # arg 0:  the new package version
 post_install() {
-   echo -e "${yellow}NOTE: Please see documentation (section 2.4.2) to setup database:${coloroff}"
-   echo -e "${yellow}      http://download.bareos.org/bareos/release/17.2/documentation/html/bareos-manual-main-reference.html#QQ2-1-47${coloroff}"
-
+   echo -e "${yellow}NOTE: Please see documentation to setup database${coloroff}"
 }
 
 # arg 0:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-   echo -e "${yellow}NOTE: Please see documentation (section) 4.2.2 to update database${coloroff}"
-   echo -e "${yellow}      http://download.bareos.org/bareos/release/17.2/documentation/html/bareos-manual-main-reference.html#x1-710004.2.2${coloroff}"
+   echo -e "${yellow}NOTE: Please see documentation to setup database${coloroff}"
 }
 
 # arg 0:  the old package version
diff --git a/bareos-database-postgresql.install b/bareos-database-postgresql.install
index aeeca1886316..d462aced941d 100644
--- a/bareos-database-postgresql.install
+++ b/bareos-database-postgresql.install
@@ -3,15 +3,13 @@ coloroff='\e[0m'
 
 # arg 0:  the new package version
 post_install() {
-   echo -e "${yellow}NOTE: Please see documentation (section 2.4.2) to setup database:${coloroff}"
-   echo -e "${yellow}      http://download.bareos.org/bareos/release/17.2/documentation/html/bareos-manual-main-reference.html#QQ2-1-47${coloroff}"
+   echo -e "${yellow}NOTE: Please see documentation to setup database${coloroff}"
 }
 
 # arg 0:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-   echo -e "${yellow}NOTE: Please see documentation (section) 4.2.2 to update database${coloroff}"
-   echo -e "${yellow}      http://download.bareos.org/bareos/release/17.2/documentation/html/bareos-manual-main-reference.html#x1-710004.2.2${coloroff}"
+   echo -e "${yellow}NOTE: Please see documentation to setup database${coloroff}"
 }
 
 # arg 0:  the old package version
diff --git a/bareos-traymonitor.install b/bareos-traymonitor.install
index f67bb96586c2..926a09620bd5 100644
--- a/bareos-traymonitor.install
+++ b/bareos-traymonitor.install
@@ -2,7 +2,7 @@
 post_install() {
    /usr/lib/bareos/scripts/bareos-config initialize_local_hostname
    /usr/lib/bareos/scripts/bareos-config initialize_passwords
-   #chown root:bareos /etc/bareos/bconsole.conf
+   chown -R bareos:bareos /etc/bareos/tray-monitor.d/monitor/
 }
 
 post_upgrade() {