22.0.3

3 files changed, 47 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37e6148c8aad..02ada846d521 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bareos
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced
-	pkgver = 22.0.2
-	pkgrel = 3
+	pkgver = 22.0.3
+	pkgrel = 1
 	url = http://www.bareos.org
 	arch = i686
 	arch = x86_64
@@ -22,7 +22,7 @@ pkgbase = bareos
 	makedepends = glusterfs
 	makedepends = jansson
 	makedepends = pam_wrapper
-	source = git+https://github.com/bareos/bareos.git#tag=Release/22.0.2
+	source = git+https://github.com/bareos/bareos.git#tag=Release/22.0.3
 	source = 0001-distver.patch
 	source = 0002-logspam.patch
 	source = 0003-version.patch
@@ -44,7 +44,7 @@ pkgname = bareos-bconsole
 	install = bareos-bconsole.install
 	groups = bareos
 	groups = bareos-client
-	depends = bareos-common=22.0.2
+	depends = bareos-common=22.0.3
 	depends = readline
 	depends = jansson
 	backup = etc/bareos/bconsole.conf
@@ -62,24 +62,24 @@ pkgname = bareos-common
 
 pkgname = bareos-contrib-director-python-plugins
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Backup Archiving Recovery Open Sourced - contributed Director plugins
-	depends = bareos-common=22.0.2
-	depends = bareos-director-python-plugin=22.0.2
+	depends = bareos-common=22.0.3
+	depends = bareos-director-python-plugin=22.0.3
 
 pkgname = bareos-contrib-filedaemon-python-plugins
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Backup Archiving Recovery Open Sourced - contributed File Daemon plugins
-	depends = bareos-common=22.0.2
-	depends = bareos-filedaemon-python-plugin=22.0.2
+	depends = bareos-common=22.0.3
+	depends = bareos-filedaemon-python-plugin=22.0.3
 
 pkgname = bareos-contrib-tools
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Backup Archiving Recovery Open Sourced - contributed tools
 	arch = any
-	depends = python-bareos=22.0.2
-	depends = bareos-filedaemon=22.0.2
+	depends = python-bareos=22.0.3
+	depends = bareos-filedaemon=22.0.3
 
 pkgname = bareos-database-common
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Backup Archiving Recovery Open Sourced - common catalog files
-	depends = bareos-common=22.0.2
-	depends = bareos-database-postgresql=22.0.2
+	depends = bareos-common=22.0.3
+	depends = bareos-database-postgresql=22.0.3
 	depends = libcap
 	depends = lzo
 	depends = zlib
@@ -90,25 +90,25 @@ pkgname = bareos-database-common
 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=22.0.2
+	depends = bareos-database-common=22.0.3
 	depends = postgresql-libs
-	provides = bareos-database=22.0.2
+	provides = bareos-database=22.0.3
 
 pkgname = bareos-database-tools
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - CLI tools with database dpendencies (dbcheck, bscan)
-	depends = bareos-database-common=22.0.2
+	depends = bareos-database-common=22.0.3
 	depends = openssl
 	depends = jansson
 
 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
 	arch = any
-	depends = bareos-director=22.0.2
+	depends = bareos-director=22.0.3
 
 pkgname = bareos-director-python3-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Python plugin for director daemon
-	depends = bareos-director=22.0.2
-	depends = bareos-director-python-plugins-common=22.0.2
+	depends = bareos-director=22.0.3
+	depends = bareos-director-python-plugins-common=22.0.3
 	depends = python
 	depends = libcap
 	depends = jansson
@@ -118,56 +118,56 @@ pkgname = bareos-director-python3-plugin
 pkgname = bareos-director
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Director daemon
 	install = bareos-director.install
-	depends = bareos-common=22.0.2
+	depends = bareos-common=22.0.3
 	depends = openssl
 	depends = bash
 	depends = jansson
 
 pkgname = bareos-filedaemon-glusterfs-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - GlusterFS plugin for Bareos File daemon
-	depends = bareos-filedaemon=22.0.2
+	depends = bareos-filedaemon=22.0.3
 	depends = glusterfs
 
 pkgname = bareos-filedaemon-ldap-python-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - LDAP Python plugin for Bareos File daemon
 	arch = any
-	depends = bareos-filedaemon=22.0.2
-	depends = bareos-filedaemon-python3-plugin=22.0.2
+	depends = bareos-filedaemon=22.0.3
+	depends = bareos-filedaemon-python3-plugin=22.0.3
 	depends = python-ldap
 
 pkgname = bareos-filedaemon-libcloud-python-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Libcloud Python plugin for Bareos File daemon
 	arch = any
-	depends = bareos-filedaemon=22.0.2
+	depends = bareos-filedaemon=22.0.3
 	depends = python-apache-libcloud
 
 pkgname = bareos-filedaemon-mariabackup-python-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - MariaBackup plugin for Bareos File daemon
 	arch = any
-	depends = bareos-filedaemon=22.0.2
+	depends = bareos-filedaemon=22.0.3
 	depends = mariadb
 
 pkgname = bareos-filedaemon-percona-xtrabackup-python-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - XtraBackup plugin for Bareos File daemon
 	arch = any
-	depends = bareos-filedaemon=22.0.2
+	depends = bareos-filedaemon=22.0.3
 	depends = xtrabackup
 
 pkgname = bareos-filedaemon-postgresql-python-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - PostgreSQL plugin for Bareos File daemon
 	arch = any
-	depends = bareos-filedaemon=22.0.2
+	depends = bareos-filedaemon=22.0.3
 	depends = postgresql
 
 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
 	arch = any
-	depends = bareos-filedaemon=22.0.2
+	depends = bareos-filedaemon=22.0.3
 
 pkgname = bareos-filedaemon-python3-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Python plugin for file daemon
-	depends = bareos-filedaemon=22.0.2
-	depends = bareos-filedaemon-python-plugins-common=22.0.2
+	depends = bareos-filedaemon=22.0.3
+	depends = bareos-filedaemon-python-plugins-common=22.0.3
 	depends = python
 	depends = libcap
 	depends = lzo
@@ -179,18 +179,18 @@ pkgname = bareos-filedaemon
 	install = bareos-filedaemon.install
 	groups = bareos
 	groups = bareos-client
-	depends = bareos-common=22.0.2
+	depends = bareos-common=22.0.3
 	depends = jansson
 	depends = zlib
 	depends = gcc-libs
 
 pkgname = bareos-storage-droplet
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Droplet support for storage daemon
-	depends = bareos-storage=22.0.2
+	depends = bareos-storage=22.0.3
 
 pkgname = bareos-storage-fifo
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - FIFO support for storage daemon
-	depends = bareos-storage=22.0.2
+	depends = bareos-storage=22.0.3
 	depends = zlib
 	depends = libcap
 	depends = openssl
@@ -199,18 +199,18 @@ pkgname = bareos-storage-fifo
 
 pkgname = bareos-storage-glusterfs
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - GlusterFS support for storage daemon
-	depends = bareos-storage=22.0.2
+	depends = bareos-storage=22.0.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
 	arch = any
-	depends = bareos-storage=22.0.2
+	depends = bareos-storage=22.0.3
 
 pkgname = bareos-storage-python3-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Python plugin for storage daemon
-	depends = bareos-storage=22.0.2
-	depends = bareos-storage-python-plugins-common=22.0.2
+	depends = bareos-storage=22.0.3
+	depends = bareos-storage-python-plugins-common=22.0.3
 	depends = python
 	depends = lzo
 	depends = libcap
@@ -219,7 +219,7 @@ pkgname = bareos-storage-python3-plugin
 
 pkgname = bareos-storage-tape
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Tape support for storage daemon
-	depends = bareos-storage=22.0.2
+	depends = bareos-storage=22.0.3
 	depends = zlib
 	depends = libcap
 	depends = bash
@@ -232,7 +232,7 @@ pkgname = bareos-storage-tape
 pkgname = bareos-storage
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Storage daemon
 	install = bareos-storage.install
-	depends = bareos-common=22.0.2
+	depends = bareos-common=22.0.3
 	depends = zlib
 	depends = lzo
 	depends = jansson
@@ -241,7 +241,7 @@ pkgname = bareos-storage
 
 pkgname = bareos-tools
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - CLI tools (bcopy, bextract, bls, bregeq, bwild, bregex)
-	depends = bareos-common=22.0.2
+	depends = bareos-common=22.0.3
 	depends = glibc
 
 pkgname = bareos-traymonitor
@@ -249,16 +249,16 @@ pkgname = bareos-traymonitor
 	install = bareos-traymonitor.install
 	groups = bareos
 	groups = bareos-client
-	depends = bareos-common=22.0.2
+	depends = bareos-common=22.0.3
 	backup = etc/bareos/tray-monitor.d/monitor/bareos-mon.conf
 
 pkgname = bareos-vmware-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Bareos VMware plugin
 	arch = any
-	depends = bareos-vadp-dumper=22.0.2
-	depends = bareos-common=22.0.2
-	optdepends = bareos-filedaemon-python3-plugin=22.0.2
-	optdepends = bareos-filedaemon-python2-plugin=22.0.2
+	depends = bareos-vadp-dumper=22.0.3
+	depends = bareos-common=22.0.3
+	optdepends = bareos-filedaemon-python3-plugin=22.0.3
+	optdepends = bareos-filedaemon-python2-plugin=22.0.3
 
 pkgname = bareos-webui
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Webui (Bareos web administration)
diff --git a/PKGBUILD b/PKGBUILD
index 8276dc5ff859..a005a40bf009 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -48,9 +48,9 @@ pkgname=("bareos-bconsole"
 #         "bareos-vadp-dumper"
 #         "bareos-vmware-vix-disklib"
 
-pkgver=22.0.2
+pkgver=22.0.3
 pkgmajor=${pkgver%%.*}
-pkgrel=3
+pkgrel=1
 arch=(i686 x86_64 armv7h aarch64)
 groups=('bareos')
 pkgdesc="Bareos - Backup Archiving Recovery Open Sourced"
@@ -847,7 +847,7 @@ package_bareos-webui() {
   ; do
     cp_pkgdir "$f" "$srcdir/install"
   done
-  cp ${srcdir}/bootstrap-table-locale-all.min.js ${pkgdir}/usr/share/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/plattforms-archlinux.patch b/plattforms-archlinux.patch
deleted file mode 100644
index caa7bd30530a..000000000000
--- a/plattforms-archlinux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bareos/core/platforms/CMakeLists.txt	2020-02-07 22:05:23.436631465 +0100
-+++ bareosb/core/platforms/CMakeLists.txt	2020-02-07 22:19:25.365678836 +0100
-@@ -31,6 +31,8 @@
-     add_subdirectory(univention)
-   elseif(${DISTNAME} STREQUAL hpux)
-     message(STATUS "DISTNAME: " ${DISTNAME})
-+  elseif(${DISTNAME} STREQUAL archlinux)
-+    message(STATUS "DISTNAME: ", ${DISTNAME})
-   else()
-     add_subdirectory(${DISTNAME})
-   endif()