Upgraded to 17.2.4rc2

10 files changed, 534 insertions, 416 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 619332540766..dfcba2ab7384 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,163 +1,153 @@
 pkgbase = bareos
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced
-	pkgver = 16.2.6
-	pkgrel = 2
+	pkgver = 17.2.4rc2
+	pkgrel = 1
 	url = http://www.bareos.org
 	arch = i686
 	arch = x86_64
 	groups = bareos
 	license = AGPL3
-	makedepends = sqlite3
-	makedepends = libmariadbclient
-	makedepends = postgresql-libs
-	makedepends = lzo
-	makedepends = acl
-	makedepends = libcap
-	makedepends = python2
-	makedepends = python
-	optdepends = openssl-1.0: network encryption between daemons
-	source = git+https://github.com/bareos/bareos.git#tag=Release/16.2.6
-	source = PKGBUILD.common
+	source = git+https://github.com/bareos/bareos.git#tag=Release/17.2.4-rc2
 	md5sums = SKIP
-	md5sums = e3ffabfe93e957649d21ea07f1e25465
 
 pkgname = bareos-common
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Common files
 	install = bareos-common.install
-	backup = 
+	depends = libcap
+	depends = openssl
+	depends = acl
+	depends = bash
+	depends = lzo
+	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=16.2.6
-	backup = etc/bareos/bconsole.conf
+	depends = bareos-common=17.2.4rc2
+	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=16.2.6
-	depends = bareos-database-tools=16.2.6
-	backup = 
+	depends = bareos-common=17.2.4rc2
+	depends = libcap
+	depends = lzo
+	depends = zlib
+	depends = openssl
+	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=16.2.6
+	depends = bareos-database-common=17.2.4rc2
 	depends = libmariadbclient
-	provides = bareos-database=16.2.6
-	backup = 
+	provides = bareos-database=17.2.4rc2
 
 pkgname = bareos-database-postgresql
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Libs and tools for postgresql catalog
-	depends = bareos-database-common=16.2.6
+	install = bareos-database-postgresql.install
+	depends = bareos-database-common=17.2.4rc2
 	depends = postgresql-libs
-	provides = bareos-database=16.2.6
-	backup = 
+	provides = bareos-database=17.2.4rc2
 
 pkgname = bareos-database-sqlite3
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Libs and tools for sqlite3 catalog
-	depends = bareos-database-common=16.2.6
+	depends = bareos-database-common=17.2.4rc2
 	depends = sqlite3
-	provides = bareos-database=16.2.6
-	backup = 
+	provides = bareos-database=17.2.4rc2
 
 pkgname = bareos-database-tools
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - CLI tools with database dpendencies (dbcheck, bscan)
-	backup = 
+	depends = bareos-database-common=17.2.4rc2
+	depends = openssl
+	depends = jansson
 
 pkgname = bareos-devel
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Devel headers
-	backup = 
+	arch = any
 
 pkgname = bareos-director
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Director daemon
 	install = bareos-director.install
-	depends = bareos-common=16.2.6
-	backup = etc/bareos/tray-monitor.d/director/Director-local.conf
-	backup = etc/bareos/bareos-dir.d/storage/File.conf
-	backup = etc/bareos/bareos-dir.d/schedule/WeeklyCycle.conf
-	backup = etc/bareos/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf
-	backup = etc/bareos/bareos-dir.d/profile/operator.conf
-	backup = etc/bareos/bareos-dir.d/pool/Scratch.conf
-	backup = etc/bareos/bareos-dir.d/pool/Incremental.conf
-	backup = etc/bareos/bareos-dir.d/pool/Full.conf
-	backup = etc/bareos/bareos-dir.d/pool/Differential.conf
-	backup = etc/bareos/bareos-dir.d/messages/Standard.conf
-	backup = etc/bareos/bareos-dir.d/messages/Daemon.conf
-	backup = etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf
-	backup = etc/bareos/bareos-dir.d/job/RestoreFiles.conf
-	backup = etc/bareos/bareos-dir.d/job/BackupCatalog.conf
-	backup = etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf
-	backup = etc/bareos/bareos-dir.d/fileset/Windows.All.Drives.conf
-	backup = etc/bareos/bareos-dir.d/fileset/SelfTest.conf
-	backup = etc/bareos/bareos-dir.d/fileset/LinuxAll.conf
-	backup = etc/bareos/bareos-dir.d/fileset/Catalog.conf
-	backup = etc/bareos/bareos-dir.d/director/bareos-dir.conf
-	backup = etc/bareos/bareos-dir.d/console/bareos-mon.conf
-	backup = etc/bareos/bareos-dir.d/client/bareos-fd.conf
-	backup = etc/bareos/bareos-dir.d/catalog/MyCatalog.conf
-	backup = etc/logrotate.d/bareos-dir
+	depends = bareos-common=17.2.4rc2
+	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=16.2.6
-	backup = 
+	depends = bareos-storage=17.2.4rc2
+	depends = zlib
+	depends = libcap
+	depends = openssl
+	depends = jansson
+	depends = lzo
 
 pkgname = bareos-tools
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - CLI tools (bcopy, bextract, bls, bregeq, bwild)
-	depends = bareos-common=16.2.6
-	backup = 
+	depends = bareos-common=17.2.4rc2
+	depends = glibc
 
 pkgname = bareos-filedaemon
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - File daemon
 	install = bareos-filedaemon.install
 	groups = bareos
 	groups = bareos-client
-	depends = bareos-common=16.2.6
-	backup = etc/bareos/tray-monitor.d/client/FileDaemon-local.conf
-	backup = etc/bareos/bareos-fd.d/messages/Standard.conf
-	backup = etc/bareos/bareos-fd.d/director/bareos-mon.conf
-	backup = etc/bareos/bareos-fd.d/director/bareos-dir.conf
-	backup = etc/bareos/bareos-fd.d/client/myself.conf
+	depends = bareos-common=17.2.4rc2
+	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=16.2.6
-	optdepends = openssl-1.0: network encryption between daemons
-	optdepends = lzo2: LZO compression for Storage Daemon
-	backup = etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf
-	backup = etc/bareos/bareos-sd.d/storage/bareos-sd.conf
-	backup = etc/bareos/bareos-sd.d/messages/Standard.conf
-	backup = etc/bareos/bareos-sd.d/director/bareos-mon.conf
-	backup = etc/bareos/bareos-sd.d/director/bareos-dir.conf
-	backup = etc/bareos/bareos-sd.d/device/FileStorage.conf
+	depends = bareos-common=17.2.4rc2
+	depends = zlib
+	depends = lzo
+	depends = jansson
+	depends = openssl
+	depends = libcap
 
 pkgname = bareos-storage-tape
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Tape support for storage daemon
-	depends = bareos-storage=16.2.6
+	depends = bareos-storage=17.2.4rc2
+	depends = zlib
+	depends = libcap
+	depends = bash
+	depends = openssl
+	depends = jansson
+	depends = lzo
 	depends = mtx
 	backup = etc/bareos/mtx-changer.conf
 
 pkgname = bareos-director-python-plugin
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for director daemon
-	depends = bareos-director=16.2.6
-	depends = python2
+	depends = bareos-director=17.2.4rc2
+	depends = libcap
+	depends = jansson
+	depends = lzo
 	depends = python
-	backup = 
+	depends = python2
 
 pkgname = bareos-filedaemon-python-plugin
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for file daemon
-	depends = bareos-filedaemon=16.2.6
-	depends = python2
+	depends = bareos-filedaemon=17.2.4rc2
 	depends = python
-	backup = 
+	depends = python2
+	depends = libcap
+	depends = lzo
+	depends = jansson
 
 pkgname = bareos-storage-python-plugin
 	pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for storage daemon
-	depends = bareos-storage=16.2.6
+	depends = bareos-storage=17.2.4rc2
 	depends = python2
+	depends = lzo
 	depends = python
-	backup = 
+	depends = libcap
+	depends = jansson
 
diff --git a/PKGBUILD b/PKGBUILD
index 456fd9510f49..5cdb7321665b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,5 @@
 # Maintainer: Michael Spradling <mike@mspradling.com>
-
-. PKGBUILD.common
+# Contributor: Daniel Albers <daniel@lbe.rs>
 
 pkgbase='bareos'
 
@@ -22,8 +21,419 @@ pkgname=("${pkgbase}-common"
          "${pkgbase}-filedaemon-python-plugin"
          "${pkgbase}-storage-python-plugin")
 
-source=("git+https://github.com/bareos/bareos.git#tag=Release/16.2.6"
-        "PKGBUILD.common")
+pkgver=17.2.4rc2
+_pkgver=17.2.4
+pkgrel=1
+arch=(i686 x86_64)
+groups=('bareos')
+pkgdesc="Bareos - Backup Archiving REcovery Open Sourced"
+url="http://www.bareos.org"
+license=('AGPL3')
+source=("git+https://github.com/bareos/bareos.git#tag=Release/$_pkgver-rc2")
+md5sums=('SKIP')
+
+prepare() {
+  cd $pkgbase
+  sed -i "s/python-config/python2-config/g" configure
+}
+
+build() {
+  cd $pkgbase
+  ./configure \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --localstatedir=/ \
+    --libdir=/usr/lib/$pkgbase \
+    --disable-conio \
+    --enable-dynamic-cats-backends \
+    --enable-dynamic-storage-backends \
+    --with-python \
+    --with-openssl \
+    --with-mysql \
+    --disable-rpath \
+    --with-postgresql \
+    --with-sqlite3 \
+    --with-logdir=/var/log/$pkgbase \
+    --with-dir-user=$pkgbase \
+    --with-dir-group=$pkgbase \
+    --with-sd-user=$pkgbase \
+    --with-sd-group=$pkgbase \
+    --with-fd-user=root \
+    --with-pid-dir=/run/bareos \
+    --with-fd-group=root \
+    --with-configtemplatedir=/usr/share/$pkgbase/config \
+    --with-working-dir=/var/lib/$pkgbase \
+    --with-plugindir=/usr/lib/$pkgbase/plugins \
+    --with-scriptdir=/usr/lib/$pkgbase/scripts \
+    --with-backenddir=/usr/lib/$pkgbase/backends \
+    --with-archivedir=/var/lib/$pkgbase/storage \
+    --with-bsrdir=/var/lib/$pkgbase \
+    --with-subsys-dir=/run/$pkgbase \
+    --with-systemd && make
+    #TODO systemd files
+
+    make DESTDIR="$srcdir/install" install install-autostart
+}
+
+
+_cp() {
+  mkdir -p "$(dirname $2)"
+  cp -a "$1" "$2"
+}
+
+package_bareos-common() {
+  # Matches bareos-common.install.in
+  pkgdesc="${pkgdesc} - Common files"
+  depends=('libcap' 'openssl' 'acl' 'bash' 'lzo' 'jansson' 'zlib')
+  install=bareos-common.install
+
+  for f in \
+    usr/lib/bareos/libbareos-$_pkgver.so \
+    usr/lib/bareos/libbareos.so \
+    usr/lib/bareos/libbareoscfg-$_pkgver.so \
+    usr/lib/bareos/libbareoscfg.so \
+    usr/lib/bareos/libbareosfind-$_pkgver.so \
+    usr/lib/bareos/libbareosfind.so \
+    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.gz \
+    usr/share/man/man8/btraceback.8.gz \
+  ; do
+    _cp $srcdir/install/$f $pkgdir/$f
+  done
+
+  install -d $pkgdir/var/lib/bareos
+  install -d $pkgdir/etc/bareos
+  install -d $pkgdir/run/bareos
+}
+
+package_bareos-bconsole() {
+  pkgdesc="${pkgdesc} - Admin Tool (CLI)"
+  depends=("bareos-common=$pkgver" 'readline' 'jansson')
+  groups+=('bareos-client')
+  install=bareos-bconsole.install
+
+  for f in \
+    /usr/share/bareos/config/bconsole.conf \
+    usr/bin/bconsole \
+    usr/share/man/man1/bconsole.1.gz \
+  ; do
+    _cp $srcdir/install/$f $pkgdir/$f
+  done
+}
+
+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/libbareoscats-$_pkgver.so \
+    usr/lib/bareos/libbareoscats.so \
+    usr/lib/bareos/libbareossql-$_pkgver.so \
+    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 \
+  ; do
+    _cp $srcdir/install/$f $pkgdir/$f
+  done
+}
+
+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
+
+  for f in \
+    usr/lib/bareos/backends/libbareoscats-mysql-$_pkgver.so \
+    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/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 \
+  ; do
+    _cp $srcdir/install/$f $pkgdir/$f
+  done
+}
+
+package_bareos-database-postgresql() {
+  pkgdesc="${pkgdesc} - Libs and tools for postgresql catalog"
+  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-$_pkgver.so \
+    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.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-$_pkgver.so \
+    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 \
+  ; do
+    _cp $srcdir/install/$f $pkgdir/$f
+  done
+}
+
+package_bareos-database-tools() {
+  pkgdesc="${pkgdesc} - CLI tools with database dpendencies (dbcheck, bscan)"
+  depends=("bareos-database-common=$pkgver" 'openssl' 'jansson')
+
+  for f in \
+    usr/bin/bareos-dbcheck \
+    usr/bin/bscan \
+    usr/share/man/man8/bareos-dbcheck.8.gz \
+    usr/share/man/man8/bscan.8.gz \
+  ; do
+    _cp $srcdir/install/$f $pkgdir/$f
+  done
+}
+
+package_bareos-devel() {
+  pkgdesc="${pkgdesc} - Devel headers"
+  arch=(any)
+  # TODO
+  install -d $pkgdir/usr/include/bareos
+}
+
+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.gz \
+    usr/share/man/man8/bareos.8.gz \
+  ; do
+    _cp "$srcdir/install/$f" "$pkgdir/$f"
+  done
+
+  _cp $srcdir/bareos/platforms/systemd/bareos-dir.service $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')
+  for f in \
+    usr/lib/bareos/backends/libbareossd-fifo-$_pkgver.so \
+    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 $srcdir/install/$f $pkgdir/$f
+  done
+}
+
+package_bareos-tools() {
+  pkgdesc="${pkgdesc} - CLI tools (bcopy, bextract, bls, bregeq, bwild)"
+  depends=("bareos-common=$pkgver" 'glibc')
+
+  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.gz \
+    usr/share/man/man1/bregex.1.gz \
+    usr/share/man/man8/bcopy.8.gz \
+    usr/share/man/man8/bextract.8.gz \
+    usr/share/man/man8/bls.8.gz \
+    usr/share/man/man8/bpluginfo.8.gz \
+  ; do
+    _cp $srcdir/install/$f $pkgdir/$f
+  done
+}
+
+package_bareos-filedaemon() {
+  pkgdesc="${pkgdesc} - File daemon"
+  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.gz \
+  ; do
+    _cp $srcdir/install/$f $pkgdir/$f
+  done
+
+  _cp $srcdir/bareos/platforms/systemd/bareos-fd.service $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
+
+  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.gz \
+  ; do
+    _cp $srcdir/install/$f $pkgdir/$f
+  done
+
+  install -d $pkgdir/var/lib/bareos/storage
+  _cp $srcdir/bareos/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)
+
+  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-$_pkgver.so \
+    usr/lib/bareos/backends/libbareossd-gentape.so \
+    usr/lib/bareos/backends/libbareossd-tape-$_pkgver.so \
+    usr/lib/bareos/backends/libbareossd-tape.so \
+    usr/lib/bareos/scripts/mtx-changer \
+    usr/share/man/man8/bscrypto.8.gz \
+    usr/share/man/man8/btape.8.gz \
+    usr/bin/bscrypto \
+    usr/bin/btape \
+  ; do
+    _cp $srcdir/install/$f $pkgdir/$f
+  done
+}
+
+package_bareos-director-python-plugin() {
+  pkgdesc="${pkgdesc} - Python plugin for director daemon"
+  depends=("bareos-director=$pkgver" 'libcap' 'jansson' 'lzo' 'python' 'python2')
+
+  for f in \
+    usr/lib/bareos/plugins/python-dir.so \
+    usr/lib/bareos/plugins/bareos-dir.py.template \
+    usr/lib/bareos/plugins/bareos_dir_consts.py \
+    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
+  done
+}
+
+package_bareos-filedaemon-python-plugin() {
+  pkgdesc="${pkgdesc} - Python plugin for file daemon"
+  depends=("bareos-filedaemon=$pkgver" 'python' 'python2' 'libcap' 'lzo' 'jansson')
+
+  for f in \
+    usr/lib/bareos/plugins/python-fd.so \
+    usr/lib/bareos/plugins/bareos-fd.py.template \
+    usr/lib/bareos/plugins/bareos-fd-local-fileset.py \
+    usr/lib/bareos/plugins/bareos-fd-mock-test.py \
+    usr/lib/bareos/plugins/BareosFdPluginBaseclass.py \
+    usr/lib/bareos/plugins/BareosFdPluginLocalFileset.py \
+    usr/lib/bareos/plugins/BareosFdWrapper.py \
+    usr/lib/bareos/plugins/bareos_fd_consts.py \
+  ; do
+    _cp $srcdir/install/$f $pkgdir/$f
+  done
+}
+
+package_bareos-storage-python-plugin() {
+  pkgdesc="${pkgdesc} - Python plugin for storage daemon"
+  depends=("bareos-storage=$pkgver" 'python2' 'lzo' 'python' 'libcap' 'jansson')
 
-md5sums=('SKIP'
-         'e3ffabfe93e957649d21ea07f1e25465')
+  for f in \
+    usr/lib/bareos/plugins/python-sd.so \
+    usr/lib/bareos/plugins/bareos-sd.py.template \
+    usr/lib/bareos/plugins/bareos_sd_consts.py \
+    usr/lib/bareos/plugins/BareosSdPluginBaseclass.py \
+    usr/lib/bareos/plugins/BareosSdWrapper.py \
+    usr/lib/bareos/plugins/bareos-sd-class-plugin.py \
+  ; do
+    _cp $srcdir/install/$f $pkgdir/$f
+  done
+}
diff --git a/PKGBUILD.common b/PKGBUILD.common
deleted file mode 100644
index ab04645732f9..000000000000
--- a/PKGBUILD.common
+++ /dev/null
@@ -1,312 +0,0 @@
-# Maintainer: Michael Spradling <mike@mspradling.com>
-# Contributor: Daniel Albers <daniel@lbe.rs>
-
-pkgver=16.2.6
-_pkgver=16.2.6
-pkgrel=2
-arch=(i686 x86_64)
-groups=('bareos')
-pkgdesc="Bareos - Backup Archiving REcovery Open Sourced"
-url="http://www.bareos.org"
-license=('AGPL3')
-makedepends=('sqlite3' 'libmariadbclient' 'postgresql-libs' 'lzo' 'acl' 'libcap' 'python2' 'python')
-optdepends=('openssl-1.0: network encryption between daemons')
-
-_instdir="${startdir}/install"
-_pkgsrc="${startdir}/src/bareos"
-_configure_args="--prefix=/usr \
-  --with-sbin-perm=755 \
-  --libdir=/usr/lib/bareos \
-  --sysconfdir=/etc \
-  --with-confdir=/etc/bareos \
-  --with-archivedir=/var/lib/bareos/storage \
-  --with-backenddir=/usr/lib/bareos/backends \
-  --with-configtemplatedir="" \
-  --with-scriptdir=/usr/lib/bareos/scripts \
-  --with-plugindir=/usr/lib/bareos/plugins \
-  --with-working-dir=/var/lib/bareos \
-  --with-pid-dir=/var/lib/bareos \
-  --with-bsrdir=/var/lib/bareos \
-  --with-logdir=/var/log/bareos \
-  --with-subsys-dir=/var/lock \
-  --enable-smartalloc \
-  --disable-conio \
-  --enable-readline \
-  --enable-batch-insert \
-  --enable-dynamic-debian-package-list \
-  --enable-dynamic-cats-backends \
-  --enable-dynamic-storage-backends \
-  --enable-acl \
-  --enable-ndmp \
-  --enable-xattr \
-  --enable-scsi-crypto \
-  --enable-lmdb \
-  --enable-ndmp \
-  --enable-ipv6 \
-  --with-postgresql \
-  --with-mysql \
-  --with-sqlite3 \
-  --with-openssl \
-  --with-python \
-  --enable-includes \
-  --disable-rpath \
-  --with-systemd=/usr/lib/systemd/system \
-  --with-dir-user=bareos \
-  --with-dir-group=bareos \
-  --with-sd-user=bareos \
-  --with-sd-group=bareos \
-  --with-fd-user=root \
-  --with-fd-group=root"
-
-prepare() {
-  # bareos must use python2
-  cd "${_pkgsrc}"
-  sed -i "s/python-config/python2-config/g" configure
-}
-
-build() {
-  # bug: openssl 1.0 isue
-  export CFLAGS="${CFLAGS} -L /usr/include/openssl-1.0"
-  export LIBS="${LIBS} -I /usr/include/openssl-1.0"
-  
-  pushd "${_pkgsrc}" &> /dev/null
-  QMAKE="/usr/bin/qmake-qt4" DISTNAME="debian" ./configure $_configure_args
-  make DESTDIR="$_instdir" install
-  popd &> /dev/null
-}
-
-_install_files() {
-  pushd $_instdir &> /dev/null
-
-  # Create files
-  while read line
-    do
-      # Don't expand globs yet, or it might be an old version
-      set -f
-      first=$(echo $line | sed 's,\([^ ]*\).*,\1,g') # First param
-      second=$(echo $line | sed 's,[^ ]*\(.*\),\1,g') # Second Param
-      file=$(basename $first)     # File
-      set +f
-
-      # Skip example files. they don't exist
-      if [[ $file == *".conf.example" ]]; then
-        continue 
-      fi
-
-      if [[ $second == "" ]]; then
-        pushd $_instdir &> /dev/null
-        set -f
-        srcpath=$(dirname $first)
-        srcpath=${srcpath#/}
-        set +f
-        cp -a --parents $srcpath/$file $pkgdir
-      else
-        destpath=${pkgdir}$(dirname $first)
-        mkdir -p $destpath
-        second=${second#' '} # Remove leading space from sed match
-
-        # Handle files that have a ? in them rename to '.'
-        # this only works if space files are also not paired with wildcards
-        if [[ $file == *"?"* ]]; then
-          newfile=${file//\?/.}
-          file=${file//\?/\ }
-          # Contains a space, rename to '.'
-          cp -a "${_pkgsrc}/src/defaultconfigs${second}${file}" $destpath/${newfile}
-        else
-          # No space, but may have wild cards
-          cp -a ${_pkgsrc}/src/defaultconfigs${second}${file} $destpath
-        fi
-      fi
-  done < ${_pkgsrc}/debian/$1.install
-
-  mv "${pkgdir}/usr/sbin" "${pkgdir}/usr/bin" &> /dev/null || true
-
-  popd &> /dev/null
-}
-
-_etc_files() {
-  pushd $_instdir &> /dev/null
-
-  if [ ! -e "${_pkgsrc}/debian/$1" ]; then
-    return
-  fi
-
-  while read file
-  do
-    file=$(echo $file | sed 's,\([^ ]*\).*,\1,g') # Remove second param, if exists
-    file=${file:1:${#file}-1} # Remove leading /
-    file=${file//\?/.} # Convert ? to .
-    file=${file//\*/} # Drop wildcards, pacman doesn't support them for BACKUP.  Also there is only one at the moment
-
-    # Skip example files. they don't exist
-    if [[ "$file" == *".conf.example" ]]; then
-      continue 
-    fi
-
-    if [[ "$file" =~ "etc" ]]; then
-        out="${file} $out"
-    fi
-  done < ${_pkgsrc}/debian/$1
-
-  popd &> /dev/null
-  echo $out
-}
-
-
-package_bareos-bat() {
-  pkgdesc="${pkgdesc} - Admin Tool (GUI)"
-  depends=("bareos-common=$pkgver" "qt4")
-  makedepends+=('qt4')
-  backup=(`_etc_files ${pkgname}.install`)
-  install=bareos-bat.install
-  _install_files ${pkgname}
-}
-
-package_bareos-bconsole() {
-  pkgdesc="${pkgdesc} - Admin Tool (CLI)"
-  depends=("bareos-common=$pkgver")
-  groups+=('bareos-client')
-  backup=(`_etc_files ${pkgname}.install`)
-  install=bareos-bconsole.install
-  _install_files ${pkgname}
-}
-
-package_bareos-common() {
-  pkgdesc="${pkgdesc} - Common files"
-  backup=(`_etc_files ${pkgname}.install`)
-  install=bareos-common.install
-  _install_files ${pkgname}
-}
-
-package_bareos-database-common() {
-  pkgdesc="${pkgdesc} - Generic abstration libs and tools for sql catalog"
-  depends=("bareos-common=$pkgver" "bareos-database-tools=$pkgver")
-  backup=(`_etc_files ${pkgname}.install`)
-  _install_files ${pkgname}
-}
-
-package_bareos-database-mysql() {
-  pkgdesc="${pkgdesc} - Libs and tools for mysql catalog"
-  provides=("bareos-database=$pkgver")
-  depends=("bareos-database-common=$pkgver" "libmariadbclient")
-  backup=(`_etc_files ${pkgname}.install`)
-  install=bareos-database-mysql.install
-  _install_files ${pkgname}
-}
-
-package_bareos-database-postgresql() {
-  pkgdesc="${pkgdesc} - Libs and tools for postgresql catalog"
-  provides=("bareos-database=$pkgver")
-  depends=("bareos-database-common=$pkgver" "postgresql-libs")
-  backup=(`_etc_files ${pkgname}.install`)
-  _install_files ${pkgname}
-}
-
-package_bareos-database-sqlite3() {
-  pkgdesc="${pkgdesc} - Libs and tools for sqlite3 catalog"
-  provides=("bareos-database=$pkgver")
-  depends=("bareos-database-common=$pkgver" "sqlite3")
-  backup=(`_etc_files ${pkgname}.install`)
-  _install_files ${pkgname}
-}
-
-package_bareos-database-tools() {
-  pkgdesc="${pkgdesc} - CLI tools with database dpendencies (dbcheck, bscan)"
-  backup=(`_etc_files ${pkgname}.install`)
-  _install_files ${pkgname}
-}
-
-package_bareos-devel() {
-  pkgdesc="${pkgdesc} - Devel headers"
-  backup=(`_etc_files ${pkgname}.install`)
-  _install_files ${pkgname}
-}
-
-package_bareos-director() {
-  pkgdesc="${pkgdesc} - Director daemon"
-  depends=("bareos-common=$pkgver")
-  backup=(`_etc_files ${pkgname}.install`)
-  install=bareos-director.install
-  _install_files ${pkgname}
-
-  # Install systemd service
-  mkdir -p ${pkgdir}/usr/lib/systemd/system
-  cp ${_pkgsrc}/platforms/systemd/bareos-dir.service ${pkgdir}/usr/lib/systemd/system/
-}
-
-package_bareos-director-python-plugin() {
-  pkgdesc="${pkgdesc} - Python plugin for director daemon"
-  depends=("bareos-director=$pkgver" "python2" "python")
-  backup=(`_etc_files ${pkgname}.install`)
-  _install_files ${pkgname}
-}
-
-package_bareos-filedaemon() {
-  pkgdesc="${pkgdesc} - File daemon"
-  depends=("bareos-common=$pkgver")
-  groups+=('bareos-client')
-  backup=(`_etc_files ${pkgname}.install`)
-  install=bareos-filedaemon.install
-  _install_files ${pkgname}
-
-  # Install systemd service
-  mkdir -p ${pkgdir}/usr/lib/systemd/system
-  cp ${_pkgsrc}/platforms/systemd/bareos-fd.service ${pkgdir}/usr/lib/systemd/system/
-}
-
-package_bareos-filedaemon-python-plugin() {
-  pkgdesc="${pkgdesc} - Python plugin for file daemon"
-  depends=("bareos-filedaemon=$pkgver" "python2" "python")
-  backup=(`_etc_files ${pkgname}.install`)
-  _install_files ${pkgname}
-}
-
-package_bareos-storage() {
-  pkgdesc="${pkgdesc} - Storage daemon"
-  optdepends+=('lzo2: LZO compression for Storage Daemon')
-  depends=("bareos-common=$pkgver")
-  backup=(`_etc_files ${pkgname}.install`)
-  install=bareos-storage.install
-  _install_files ${pkgname}
-
-  # Install systemd service
-  mkdir -p ${pkgdir}/usr/lib/systemd/system
-  cp ${_pkgsrc}/platforms/systemd/bareos-sd.service ${pkgdir}/usr/lib/systemd/system/
-}
-
-package_bareos-storage-fifo() {
-  pkgdesc="${pkgdesc} - FIFO support for storage daemon"
-  depends=("bareos-storage=$pkgver")
-  backup=(`_etc_files ${pkgname}.install`)
-  _install_files ${pkgname}
-}
-
-package_bareos-storage-python-plugin() {
-  pkgdesc="${pkgdesc} - Python plugin for storage daemon"
-  depends=("bareos-storage=$pkgver" "python2" "python")
-  backup=(`_etc_files ${pkgname}.install`)
-  _install_files ${pkgname}
-}
-
-package_bareos-storage-tape() {
-  pkgdesc="${pkgdesc} - Tape support for storage daemon"
-  depends=("bareos-storage=$pkgver" "mtx")
-  backup=(`_etc_files ${pkgname}.install`)
-  _install_files ${pkgname}
-}
-
-package_bareos-tools() {
-  pkgdesc="${pkgdesc} - CLI tools (bcopy, bextract, bls, bregeq, bwild)"
-  depends=("bareos-common=$pkgver")
-  backup=(`_etc_files ${pkgname}.install`)
-  _install_files ${pkgname}
-}
-
-package_bareos-traymonitor() {
-  pkgdesc="${pkgdesc} - Tray Monitor (QT)"
-  depends=("bareos-common=$pkgver" "qt4")
-  makedepends+=('qt4')
-  backup=(`_etc_files ${pkgname}.install`)
-  install=bareos-traymonitor.install
-  _install_files ${pkgname}
-}
diff --git a/bareos-bconsole.install b/bareos-bconsole.install
index ad7ebd497457..0b1c1d30f095 100644
--- a/bareos-bconsole.install
+++ b/bareos-bconsole.install
@@ -3,6 +3,10 @@ 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
-	chmod 640 /etc/bareos/bconsole.conf
+	chown root:bareos /usr/share/bareos/config/bconsole.conf
+	chmod 640 /usr/share/bareos/config/bconsole.conf
+}
+
+post_upgrade() {
+  post_install
 }
diff --git a/bareos-common.install b/bareos-common.install
index c82f70d63e0c..42615708110f 100644
--- a/bareos-common.install
+++ b/bareos-common.install
@@ -10,6 +10,7 @@ pre_install() {
 # arg 1:  the new package version
 post_install() {
 	chown bareos:bareos /var/lib/bareos/
+	chown bareos:bareos /run/bareos/
 	#chown bareos:bareos /var/log/bareos/
 }
 
@@ -19,6 +20,10 @@ pre_upgrade() {
 	pre_install
 }
 
+post_upgrade() {
+	post_install
+}
+
 # arg 1:  the old package version
 post_remove() {
 	getent passwd bareos > /dev/null && userdel bareos
diff --git a/bareos-database-mysql.install b/bareos-database-mysql.install
index 60d95665dd58..dcfdf0406c65 100644
--- a/bareos-database-mysql.install
+++ b/bareos-database-mysql.install
@@ -4,14 +4,18 @@ 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://doc.bareos.org/master/html/bareos-manual-main-reference.html#x1-400002.4.2${coloroff}"
+	#echo -e "${yellow}      http://doc.bareos.org/master/html/bareos-manual-main-reference.html#x1-400002.4.2${coloroff}"
+	echo -e "${yellow}      http://download.bareos.org/bareos/release/17.2/documentation/html/bareos-manual-main-reference.html#QQ2-1-47${coloroff}"
+
 }
 
 # arg 0:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-	echo -e "${yellow}NOTE: Please see documentation (section) 3.1.2 to update database${coloroff}"
-	echo -e "${yellow}      http://doc.bareos.org/master/html/bareos-manual-main-reference.html#x1-450003.1.2${coloroff}"
+	#echo -e "${yellow}NOTE: Please see documentation (section) 3.1.2 to update database${coloroff}"
+	#echo -e "${yellow}      http://doc.bareos.org/master/html/bareos-manual-main-reference.html#x1-450003.1.2${coloroff}"
+	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}"
 }
 
 # arg 0:  the old package version
diff --git a/bareos-database-postgresql.install b/bareos-database-postgresql.install
index 6f44b41b5320..dcfdf0406c65 100644
--- a/bareos-database-postgresql.install
+++ b/bareos-database-postgresql.install
@@ -4,14 +4,18 @@ 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://doc.bareos.org/master/html/bareos-manual-main-reference.html#x1-380002.4.2${coloroff}"
+	#echo -e "${yellow}      http://doc.bareos.org/master/html/bareos-manual-main-reference.html#x1-400002.4.2${coloroff}"
+	echo -e "${yellow}      http://download.bareos.org/bareos/release/17.2/documentation/html/bareos-manual-main-reference.html#QQ2-1-47${coloroff}"
+
 }
 
 # arg 0:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-	echo -e "${yellow}NOTE: Please see documentation (section) 3.1.2 to update database${coloroff}"
-	echo -e "${yellow}      http://doc.bareos.org/master/html/bareos-manual-main-reference.html#x1-450003.1.2${coloroff}"
+	#echo -e "${yellow}NOTE: Please see documentation (section) 3.1.2 to update database${coloroff}"
+	#echo -e "${yellow}      http://doc.bareos.org/master/html/bareos-manual-main-reference.html#x1-450003.1.2${coloroff}"
+	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}"
 }
 
 # arg 0:  the old package version
diff --git a/bareos-director.install b/bareos-director.install
index 37321d1b9dd2..518d7869abf8 100644
--- a/bareos-director.install
+++ b/bareos-director.install
@@ -3,8 +3,10 @@ post_install() {
 	/usr/lib/bareos/scripts/bareos-config initialize_local_hostname
 	/usr/lib/bareos/scripts/bareos-config initialize_passwords
 
-	chown -R bareos:bareos /etc/bareos/bareos-dir.d
-	chmod -R 750 /etc/bareos/bareos-dir.d
+	chown -R bareos:bareos /usr/share/bareos/config/bareos-dir.d
+	chmod -R 750 /usr/share/bareos/config/bareos-dir.d
+
+	chown bareos:bareos /usr/bin/bareos-dir
 
 	/usr/lib/bareos/scripts/bareos-config initialize_database_driver
 	/usr/lib/bareos/scripts/bareos-config apply_dbconfig_settings
@@ -14,3 +16,7 @@ post_install() {
 		#chmod 750 "$dir"
 	#done
 }
+
+post_upgrade() {
+	post_install
+}
diff --git a/bareos-filedaemon.install b/bareos-filedaemon.install
index a1c9ef8e72c7..bfd1ca0f15ed 100644
--- a/bareos-filedaemon.install
+++ b/bareos-filedaemon.install
@@ -2,7 +2,8 @@
 post_install() {
 	/usr/lib/bareos/scripts/bareos-config initialize_local_hostname
 	/usr/lib/bareos/scripts/bareos-config initialize_passwords
+}
 
-	chown -R bareos:bareos /etc/bareos/bareos-fd.d/
-	chmod -R 750 /etc/bareos/bareos-fd.d/
+post_upgrade() {
+	post_install
 }
diff --git a/bareos-storage.install b/bareos-storage.install
index e9b50201aedc..8026ef6fadec 100644
--- a/bareos-storage.install
+++ b/bareos-storage.install
@@ -3,11 +3,17 @@ post_install() {
 	/usr/lib/bareos/scripts/bareos-config initialize_local_hostname
 	/usr/lib/bareos/scripts/bareos-config initialize_passwords
 
-	chown -R bareos:bareos /etc/bareos/bareos-sd.d
-	chmod -R 750 /etc/bareos/bareos-sd.d
+	chown -R bareos:bareos /usr/share/bareos/config/bareos-sd.d
+	chmod -R 750 /usr/share/bareos/config/bareos-sd.d
+
+	chown bareos:bareos /usr/bin/bareos-sd
 
 	chown bareos:bareos /var/lib/bareos/storage/
 	chmod 750 /var/lib/bareos/storage/
 
 	/usr/lib/bareos/scripts/bareos-config setup_sd_user
 }
+
+post_upgrade() {
+	post_install
+}