Update 19.2.5

4 files changed, 43 insertions, 113 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 91da98e7eee7..6278d2ab8896 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bareos
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced
-	pkgver = 18.2.6
-	pkgrel = 4
+	pkgver = 19.2.5
+	pkgrel = 1
 	url = http://www.bareos.org
 	arch = i686
 	arch = x86_64
@@ -17,7 +17,7 @@ pkgbase = bareos
 	makedepends = rpcsvc-proto
 	makedepends = git
 	makedepends = lsb-release
-	source = git+https://github.com/bareos/bareos.git#tag=Release/18.2.6
+	source = git+https://github.com/bareos/bareos.git#tag=Release/19.2.5
 	md5sums = SKIP
 
 pkgname = bareos-common
@@ -36,13 +36,13 @@ pkgname = bareos-bconsole
 	install = bareos-bconsole.install
 	groups = bareos
 	groups = bareos-client
-	depends = bareos-common=18.2.6
+	depends = bareos-common=19.2.5
 	depends = readline
 	depends = jansson
 
 pkgname = bareos-database-common
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Generic abstration libs and tools for sql catalog
-	depends = bareos-common=18.2.6
+	depends = bareos-common=19.2.5
 	depends = libcap
 	depends = lzo
 	depends = zlib
@@ -53,26 +53,26 @@ pkgname = bareos-database-common
 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=18.2.6
+	depends = bareos-database-common=19.2.5
 	depends = libmariadbclient
-	provides = bareos-database=18.2.6
+	provides = bareos-database=19.2.5
 
 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=18.2.6
+	depends = bareos-database-common=19.2.5
 	depends = postgresql-libs
-	provides = bareos-database=18.2.6
+	provides = bareos-database=19.2.5
 
 pkgname = bareos-database-sqlite3
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Libs and tools for sqlite3 catalog
-	depends = bareos-database-common=18.2.6
+	depends = bareos-database-common=19.2.5
 	depends = sqlite3
-	provides = bareos-database=18.2.6
+	provides = bareos-database=19.2.5
 
 pkgname = bareos-database-tools
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - CLI tools with database dpendencies (dbcheck, bscan)
-	depends = bareos-database-common=18.2.6
+	depends = bareos-database-common=19.2.5
 	depends = openssl
 	depends = jansson
 
@@ -83,14 +83,14 @@ pkgname = bareos-devel
 pkgname = bareos-director
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Director daemon
 	install = bareos-director.install
-	depends = bareos-common=18.2.6
+	depends = bareos-common=19.2.5
 	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=18.2.6
+	depends = bareos-storage=19.2.5
 	depends = zlib
 	depends = libcap
 	depends = openssl
@@ -99,7 +99,7 @@ pkgname = bareos-storage-fifo
 
 pkgname = bareos-tools
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - CLI tools (bcopy, bextract, bls, bregeq, bwild)
-	depends = bareos-common=18.2.6
+	depends = bareos-common=19.2.5
 	depends = glibc
 
 pkgname = bareos-filedaemon
@@ -107,7 +107,7 @@ pkgname = bareos-filedaemon
 	install = bareos-filedaemon.install
 	groups = bareos
 	groups = bareos-client
-	depends = bareos-common=18.2.6
+	depends = bareos-common=19.2.5
 	depends = jansson
 	depends = zlib
 	depends = gcc-libs
@@ -115,7 +115,7 @@ pkgname = bareos-filedaemon
 pkgname = bareos-storage
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Storage daemon
 	install = bareos-storage.install
-	depends = bareos-common=18.2.6
+	depends = bareos-common=19.2.5
 	depends = zlib
 	depends = lzo
 	depends = jansson
@@ -124,7 +124,7 @@ pkgname = bareos-storage
 
 pkgname = bareos-storage-tape
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Tape support for storage daemon
-	depends = bareos-storage=18.2.6
+	depends = bareos-storage=19.2.5
 	depends = zlib
 	depends = libcap
 	depends = bash
@@ -136,7 +136,7 @@ pkgname = bareos-storage-tape
 
 pkgname = bareos-director-python-plugin
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for director daemon
-	depends = bareos-director=18.2.6
+	depends = bareos-director=19.2.5
 	depends = libcap
 	depends = jansson
 	depends = lzo
@@ -145,7 +145,7 @@ pkgname = bareos-director-python-plugin
 
 pkgname = bareos-filedaemon-python-plugin
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for file daemon
-	depends = bareos-filedaemon=18.2.6
+	depends = bareos-filedaemon=19.2.5
 	depends = python
 	depends = python2
 	depends = libcap
@@ -154,7 +154,7 @@ pkgname = bareos-filedaemon-python-plugin
 
 pkgname = bareos-storage-python-plugin
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for storage daemon
-	depends = bareos-storage=18.2.6
+	depends = bareos-storage=19.2.5
 	depends = python2
 	depends = lzo
 	depends = python
diff --git a/PKGBUILD b/PKGBUILD
index dbd65167a704..0821a43f98a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,9 +23,9 @@ pkgname=("${pkgbase}-common"
          "${pkgbase}-storage-python-plugin"
          "${pkgbase}-webui")
 
-pkgmajor=18
-pkgver=18.2.6
-pkgrel=4
+pkgmajor=19
+pkgver=19.2.5
+pkgrel=1
 arch=(i686 x86_64 armv7h aarch64)
 groups=('bareos')
 pkgdesc="Bareos - Backup Archiving REcovery Open Sourced"
@@ -38,7 +38,6 @@ md5sums=('SKIP')
 prepare() {
   cd $pkgbase
   patch --forward --strip=1 --input="../../plattforms-archlinux.patch"
-  patch --forward --strip=1 --input="../../gfapi_device-detect-glfs_ftruncate-API-change.patch"
 }
 
 build() {
@@ -109,6 +108,9 @@ package_bareos-common() {
     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 \
@@ -183,6 +185,7 @@ package_bareos-database-mysql() {
     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 \
   ; do
     _cp $srcdir/install/$f $pkgdir/$f
   done
@@ -209,6 +212,7 @@ package_bareos-database-postgresql() {
     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
@@ -231,6 +235,7 @@ package_bareos-database-sqlite3() {
     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 \
   ; do
     _cp $srcdir/install/$f $pkgdir/$f
   done
@@ -292,6 +297,7 @@ package_bareos-director() {
     usr/bin/bareos-dir \
     usr/share/man/man8/bareos-dir.8 \
     usr/share/man/man8/bareos.8 \
+    etc/logrotate.d/bareos-dir \
   ; do
     # pacman LINT tool currently does not like spaces
     space_removal=`echo $f | tr ' ' '_'`
@@ -468,6 +474,7 @@ package_bareos-webui() {
           'etc/bareos/bareos-dir.d/profile/webui-admin.conf')
 
   _cp $srcdir/install/bareos-webui $pkgdir/usr/share/webapps/bareos-webui 
+  _cp $srcdir/install/etc/httpd/conf.d/bareos-webui.conf $pkgdir/etc/httpd/conf.d/extra/bareos-webui.conf
 
   for f in \
     etc/bareos/bareos-dir.d/console/admin.conf.example \
diff --git a/gfapi_device-detect-glfs_ftruncate-API-change.patch b/gfapi_device-detect-glfs_ftruncate-API-change.patch
deleted file mode 100644
index 22fd7646ad64..000000000000
--- a/gfapi_device-detect-glfs_ftruncate-API-change.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 2ce2c58782840efbc33db029add4aba4611096f5 Mon Sep 17 00:00:00 2001

-From: Philipp Storz <philipp.storz@bareos.com>

-Date: Wed, 10 Jul 2019 21:21:49 +0200

-Subject: [PATCH] gfapi_device: detect glfs_ftruncate API change (Fedora 30)

-

-... and redefine glfs_ftruncate() to fix the problem

----

- core/cmake/BareosCheckSymbols.cmake     | 16 ++++++++++++++++

- core/src/include/config.h.in            |  3 +++

- core/src/stored/backends/gfapi_device.h |  6 +++++-

- 3 files changed, 24 insertions(+), 1 deletion(-)

-

-diff --git a/core/cmake/BareosCheckSymbols.cmake b/core/cmake/BareosCheckSymbols.cmake

-index 7ddb95d..53023a1 100644

---- a/core/cmake/BareosCheckSymbols.cmake

-+++ b/core/cmake/BareosCheckSymbols.cmake

-@@ -47,3 +47,19 @@ CHECK_SYMBOL_EXISTS(rados_ioctx_set_namespace rados/librados.h  HAVE_RADOS_NAMES

- CHECK_SYMBOL_EXISTS(rados_nobjects_list_open rados/librados.h HAVE_RADOS_NOBJECTS_LIST)

- cmake_pop_check_state()

- 

-+

-+IF(HAVE_GLUSTERFS_API_GLFS_H)

-+cmake_push_check_state()

-+set (CMAKE_REQUIRED_LIBRARIES ${GFAPI_LIBRARIES})

-+check_cxx_source_compiles("

-+#include <glusterfs/api/glfs.h>

-+int main(void)

-+{

-+       /* new glfs_ftruncate() passes two additional args */

-+       return glfs_ftruncate(NULL, 0, NULL, NULL);

-+}

-+"

-+GLFS_FTRUNCATE_HAS_FOUR_ARGS)

-+

-+endif()

-+cmake_pop_check_state()

-diff --git a/core/src/include/config.h.in b/core/src/include/config.h.in

-index 5a14cbc..d5a8810 100644

---- a/core/src/include/config.h.in

-+++ b/core/src/include/config.h.in

-@@ -391,6 +391,9 @@

- /* Define to 1 if you have gfapi lib */

- #cmakedefine HAVE_GFAPI @HAVE_GFAPI@

- 

-+/* Define to 1 if the `glfs_ftruncate' function has four arguments. */

-+#cmakedefine GLFS_FTRUNCATE_HAS_FOUR_ARGS @GLFS_FTRUNCATE_HAS_FOUR_ARGS@

-+

- /* Define to 1 if you have the `glfs_readdirplus' function. */

- #cmakedefine HAVE_GLFS_READDIRPLUS @HAVE_GLFS_READDIRPLUS@

- 

-diff --git a/core/src/stored/backends/gfapi_device.h b/core/src/stored/backends/gfapi_device.h

-index 841895d..adfe08e 100644

---- a/core/src/stored/backends/gfapi_device.h

-+++ b/core/src/stored/backends/gfapi_device.h

-@@ -2,7 +2,7 @@

-    BAREOS® - Backup Archiving REcovery Open Sourced

- 

-    Copyright (C) 2014-2014 Planets Communications B.V.

--   Copyright (C) 2014-2014 Bareos GmbH & Co. KG

-+   Copyright (C) 2014-2019 Bareos GmbH & Co. KG

- 

-    This program is Free Software; you can redistribute it and/or

-    modify it under the terms of version three of the GNU Affero General Public

-@@ -30,6 +30,10 @@

- 

- #include <api/glfs.h>

- 

-+#if defined GLFS_FTRUNCATE_HAS_FOUR_ARGS

-+#define glfs_ftruncate(fd, offset) glfs_ftruncate(fd, offset, NULL, NULL)

-+#endif

-+

- namespace storagedaemon {

- 

- class gfapi_device: public Device {

--- 

-2.9.3

-

diff --git a/plattforms-archlinux.patch b/plattforms-archlinux.patch
index db5a414a0927..caa7bd30530a 100644
--- a/plattforms-archlinux.patch
+++ b/plattforms-archlinux.patch
@@ -1,11 +1,11 @@
---- bareos/core/platforms/CMakeLists.txt	2019-10-23 00:04:57.740580637 +0200
-+++ bareosb/core/platforms/CMakeLists.txt	2019-10-23 00:54:08.225875749 +0200
-@@ -27,6 +27,8 @@
-       add_subdirectory(debian)
-    elseif (${DISTNAME} STREQUAL hpux)
-       MESSAGE( STATUS "DISTNAME: " ${DISTNAME} )
-+   elseif (${DISTNAME} STREQUAL archlinux)
-+      MESSAGE( STATUS "DISTNAME: " ${DISTNAME} )
-    else()
-       add_subdirectory(${DISTNAME})
-    endif()
+--- 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()