22.1.0

2 files changed, 47 insertions, 115 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb894571ce3c..88a62876c7b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bareos
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced
-	pkgver = 22.0.3
-	pkgrel = 3
+	pkgver = 22.1.0
+	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.3
+	source = git+https://github.com/bareos/bareos.git#tag=Release/22.1.0
 	source = 0001-distver.patch
 	source = 0002-logspam.patch
 	source = 0003-version.patch
@@ -46,7 +46,7 @@ pkgname = bareos-bconsole
 	install = bareos-bconsole.install
 	groups = bareos
 	groups = bareos-client
-	depends = bareos-common=22.0.3
+	depends = bareos-common=22.1.0
 	depends = readline
 	depends = jansson
 	backup = etc/bareos/bconsole.conf
@@ -64,24 +64,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.3
-	depends = bareos-director-python-plugin=22.0.3
+	depends = bareos-common=22.1.0
+	depends = bareos-director-python-plugin=22.1.0
 
 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.3
-	depends = bareos-filedaemon-python-plugin=22.0.3
+	depends = bareos-common=22.1.0
+	depends = bareos-filedaemon-python-plugin=22.1.0
 
 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.3
-	depends = bareos-filedaemon=22.0.3
+	depends = python-bareos=22.1.0
+	depends = bareos-filedaemon=22.1.0
 
 pkgname = bareos-database-common
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Backup Archiving Recovery Open Sourced - common catalog files
-	depends = bareos-common=22.0.3
-	depends = bareos-database-postgresql=22.0.3
+	depends = bareos-common=22.1.0
+	depends = bareos-database-postgresql=22.1.0
 	depends = libcap
 	depends = lzo
 	depends = zlib
@@ -92,25 +92,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.3
+	depends = bareos-database-common=22.1.0
 	depends = postgresql-libs
-	provides = bareos-database=22.0.3
+	provides = bareos-database=22.1.0
 
 pkgname = bareos-database-tools
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - CLI tools with database dpendencies (dbcheck, bscan)
-	depends = bareos-database-common=22.0.3
+	depends = bareos-database-common=22.1.0
 	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.3
+	depends = bareos-director=22.1.0
 
 pkgname = bareos-director-python3-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Python plugin for director daemon
-	depends = bareos-director=22.0.3
-	depends = bareos-director-python-plugins-common=22.0.3
+	depends = bareos-director=22.1.0
+	depends = bareos-director-python-plugins-common=22.1.0
 	depends = python
 	depends = libcap
 	depends = jansson
@@ -120,56 +120,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.3
+	depends = bareos-common=22.1.0
 	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.3
+	depends = bareos-filedaemon=22.1.0
 	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.3
-	depends = bareos-filedaemon-python3-plugin=22.0.3
+	depends = bareos-filedaemon=22.1.0
+	depends = bareos-filedaemon-python3-plugin=22.1.0
 	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.3
+	depends = bareos-filedaemon=22.1.0
 	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.3
+	depends = bareos-filedaemon=22.1.0
 	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.3
+	depends = bareos-filedaemon=22.1.0
 	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.3
+	depends = bareos-filedaemon=22.1.0
 	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.3
+	depends = bareos-filedaemon=22.1.0
 
 pkgname = bareos-filedaemon-python3-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Python plugin for file daemon
-	depends = bareos-filedaemon=22.0.3
-	depends = bareos-filedaemon-python-plugins-common=22.0.3
+	depends = bareos-filedaemon=22.1.0
+	depends = bareos-filedaemon-python-plugins-common=22.1.0
 	depends = python
 	depends = libcap
 	depends = lzo
@@ -181,18 +181,18 @@ pkgname = bareos-filedaemon
 	install = bareos-filedaemon.install
 	groups = bareos
 	groups = bareos-client
-	depends = bareos-common=22.0.3
+	depends = bareos-common=22.1.0
 	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.3
+	depends = bareos-storage=22.1.0
 
 pkgname = bareos-storage-fifo
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - FIFO support for storage daemon
-	depends = bareos-storage=22.0.3
+	depends = bareos-storage=22.1.0
 	depends = zlib
 	depends = libcap
 	depends = openssl
@@ -201,18 +201,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.3
+	depends = bareos-storage=22.1.0
 	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.3
+	depends = bareos-storage=22.1.0
 
 pkgname = bareos-storage-python3-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Python plugin for storage daemon
-	depends = bareos-storage=22.0.3
-	depends = bareos-storage-python-plugins-common=22.0.3
+	depends = bareos-storage=22.1.0
+	depends = bareos-storage-python-plugins-common=22.1.0
 	depends = python
 	depends = lzo
 	depends = libcap
@@ -221,7 +221,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.3
+	depends = bareos-storage=22.1.0
 	depends = zlib
 	depends = libcap
 	depends = bash
@@ -234,7 +234,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.3
+	depends = bareos-common=22.1.0
 	depends = zlib
 	depends = lzo
 	depends = jansson
@@ -243,7 +243,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.3
+	depends = bareos-common=22.1.0
 	depends = glibc
 
 pkgname = bareos-traymonitor
@@ -251,16 +251,15 @@ pkgname = bareos-traymonitor
 	install = bareos-traymonitor.install
 	groups = bareos
 	groups = bareos-client
-	depends = bareos-common=22.0.3
+	depends = bareos-common=22.1.0
 	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.3
-	depends = bareos-common=22.0.3
-	optdepends = bareos-filedaemon-python3-plugin=22.0.3
-	optdepends = bareos-filedaemon-python2-plugin=22.0.3
+	depends = bareos-vadp-dumper=22.1.0
+	depends = bareos-common=22.1.0
+	optdepends = bareos-filedaemon-python3-plugin=22.1.0
 
 pkgname = bareos-webui
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Webui (Bareos web administration)
diff --git a/PKGBUILD b/PKGBUILD
index 2304d6c88d68..e044e7493112 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -41,31 +41,24 @@ pkgname=("bareos-bconsole"
          "python-bareos"
          )
 
-#         "bareos-director-python2-plugin"
-#         "bareos-filedaemon-python2-plugin"
-#         "bareos-storage-python2-plugin"
-#         "python2-bareos"
 #         "bareos-vadp-dumper"
 #         "bareos-vmware-vix-disklib"
 
-pkgver=22.0.3
+pkgver=22.1.0
 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=('cmake' 'gcc' 'libmariadbclient' 'postgresql-libs' 'python' 'python-setuptools' 'rpcsvc-proto' 'git' 'lsb-release' 'qt5-base' 'glusterfs' 'jansson' 'pam_wrapper')
-#makedepends=('cmake' 'gcc' 'libmariadbclient' 'postgresql-libs' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'rpcsvc-proto' 'git' 'lsb-release' 'qt5-base' 'glusterfs' 'jansson' 'pam_wrapper')
 source=("git+https://github.com/bareos/bareos.git#tag=Release/${pkgver}"
         "0001-distver.patch"
         "0002-logspam.patch"
         "0003-version.patch"
         "0004-sqlspam.patch"
         "0005-httpd.patch"
-        "0006-hostname.patch"
-        "0007-fix-gcc-13.patch"
         "bootstrap-table-locale-all.min.js")
 
 md5sums=('SKIP'
@@ -74,13 +67,10 @@ md5sums=('SKIP'
          '5bf1233d94dfecc9060746bfb39b9d2b'
          'ca4c929a2462cafaead8d0b49e3cebed'
          'a6a260808e46c20b1c22aa2efebc3fe1'
-         '40fc1919d59133214466972b3f9aa6d2'
-         '19f8be5aec4e35b5b98f3f26af7c9d8a'
          'e78b88f897cfc3e60129eec360521e3d'
          )
 
-python3_ver="3.11"
-#python2_ver="2.7"
+python3_ver=$(python -c "from sys import version_info; print(\"%d.%d\" % (version_info[0],version_info[1]))");#"
 
 #=========================================
 prepare() {
@@ -147,7 +137,6 @@ build() {
 
   cd "${srcdir}/${pkgbase}/python-bareos"
   python setup.py build
-  #python2 setup.py build
 }
 
 #=========================================
@@ -410,22 +399,6 @@ package_bareos-director-python-plugins-common() {
   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')
-  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")
@@ -575,21 +548,6 @@ package_bareos-filedaemon-python-plugins-common() {
 }
 
 #=========================================
-package_bareos-filedaemon-python2-plugin() {
-  conflicts=("bareos-filedaemon-python-plugin")
-  pkgdesc="${pkgdesc} - Python plugin for file daemon"
-  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/python${python2_ver}/site-packages/bareosfd.so \
-  ; do
-    cp_pkgdir "$f" "$srcdir/install"
-  done
-}
-
-#=========================================
 package_bareos-filedaemon-python3-plugin() {
   conflicts=("bareos-filedaemon-python-plugin")
   pkgdesc="${pkgdesc} - Python plugin for file daemon"
@@ -689,21 +647,6 @@ package_bareos-storage-python-plugins-common() {
 }
 
 #=========================================
-package_bareos-storage-python2-plugin() {
-  conflicts=("bareos-storage-python-plugin")
-  pkgdesc="${pkgdesc} - Python plugin for storage daemon"
-  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/python${python2_ver}/site-packages/bareossd.so \
-  ; do
-    cp_pkgdir "$f" "$srcdir/install"
-  done
-}
-
-#=========================================
 package_bareos-storage-python3-plugin() {
   conflicts=("bareos-storage-python-plugin")
   pkgdesc="${pkgdesc} - Python plugin for storage daemon"
@@ -817,7 +760,7 @@ package_bareos-vmware-plugin() {
   arch=(any)
   pkgdesc="${pkgdesc} - Bareos VMware plugin"
   depends=("bareos-vadp-dumper=${pkgver}" "bareos-common=${pkgver}" )
-  optdepends=("bareos-filedaemon-python3-plugin=${pkgver}" "bareos-filedaemon-python2-plugin=${pkgver}")
+  optdepends=("bareos-filedaemon-python3-plugin=${pkgver}")
   for f in \
      usr/lib/bareos/plugins/BareosFdPluginVMware.py \
      usr/lib/bareos/plugins/bareos-fd-vmware.py \
@@ -889,13 +832,3 @@ package_python-bareos() {
   cd "${srcdir}/${pkgbase}/python-bareos"
   python setup.py install --skip-build --root="${pkgdir}" --optimize='1'
 }
-
-#=========================================
-package_python2-bareos() {
-  pkgdesc="${pkgdesc} - python-bareos is a Python2 module to access a backup system."
-  depends=('python2' 'python2-sslpsk' 'jansson')
-  conflicts=("python-bareos")
-
-  cd "${srcdir}/${pkgbase}/python-bareos"
-  python2 setup.py install --skip-build --root="${pkgdir}" --optimize='1'
-}