plugins: add Debian packaging for PostgreSQL plugin

Add Debian packaging for bareos-filedaemon-postgresql-python-plugin. python*-dateutil is required for bareos-filedaemon-postgresql-python-plugin. Adding the requirement to the packages bareos-filedaemon-python2-plugin and bareos-filedaemon-python3-plugin, as these handle the different type versions and it is also required by other Python modules (e.g. libcloud). Pluging packages prefer Python 3 instead of Python 2. While is is posible to install both plugins, it is not possible to load both at the same time into the filedaemon.
bareos · Feb 24, 2021 · 3d92538 · 3d92538
1 parent ef77e43
commit 3d92538
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 
 ### Added
 - added reload commands to systemd service [PR #694]
+- Build the package **bareos-filedaemon-postgresql-python-plugin** also for Debian, Ubuntu and UCS (deb packages) [PR #723].
 - added an informative debugmessage when a dynamic backend cannot be loaded [PR #740]
 
 ### Changed

diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bareos
 # Copyright (c) 2011-2012 Bruno Friedmann (Ioda-Net) and Philipp Storz (dass IT)
-#               2013-2018 Bareos GmbH & Co KG
+#               2013-2021 Bareos GmbH & Co KG
 #
 
 Name: 		bareos
@@ -63,7 +63,7 @@ BuildRequires: libtirpc-devel
 %endif
 
 #
-# SUSE (openSUSE, SLES) specific settigs
+# SUSE (openSUSE, SLES) specific settings
 #
 %if 0%{?sles_version} == 10
 %define build_qt_monitor 0
@@ -554,6 +554,8 @@ Requires:   bareos-filedaemon-python-plugin = %{version}
 Summary:    PostgreSQL Python plugin for Bareos File daemon
 Group:      Productivity/Archiving/Backup
 Requires:   bareos-filedaemon = %{version}
+Requires:   bareos-filedaemon-python-plugin = %{version}
+
 %package    filedaemon-percona-xtrabackup-python-plugin
 Summary:    Percona xtrabackup Python plugin for Bareos File daemon
 Group:      Productivity/Archiving/Backup
@@ -1601,10 +1603,10 @@ mkdir -p %{?buildroot}/%{_libdir}/bareos/plugins/vmware_plugin
 #attr(0640, #{director_daemon_user}, #{daemon_group}) #{_sysconfdir}/#{name}/bareos-dir.d/job/backup-libcloud.conf.example
 
 %files filedaemon-postgresql-python-plugin
-
 %defattr(-, root, root)
 %{plugin_dir}/BareosFdPluginPostgres.py*
 %{plugin_dir}/bareos-fd-postgres.py*
+
 %files filedaemon-percona-xtrabackup-python-plugin
 %defattr(-, root, root)
 %{plugin_dir}/bareos-fd-percona-xtrabackup.py*

diff --git a/debian/bareos-filedaemon-postgresql-python-plugin.install.in b/debian/bareos-filedaemon-postgresql-python-plugin.install.in
@@ -0,0 +1,2 @@
+@plugindir@/bareos-fd-postgres.py*
+@plugindir@/BareosFdPluginPostgres.py*
diff --git a/debian/bareos-filedaemon-python-plugins-common.install.in b/debian/bareos-filedaemon-python-plugins-common.install.in
@@ -1,4 +1,5 @@
 @plugindir@/bareos-fd-local-fileset.py*
 @plugindir@/BareosFdPluginBaseclass.py*
 @plugindir@/BareosFdPluginLocalFileset.py*
+@plugindir@/BareosFdPluginLocalFilesBaseclass.py*
 @plugindir@/BareosFdWrapper.py*
diff --git a/debian/control b/debian/control
@@ -332,5 +332,6 @@ Description: Backup Archiving Recovery Open Sourced - common tools
 
 
 
+
 
 
diff --git a/debian/control.bareos-filedaemon-python-plugins-common b/debian/control.bareos-filedaemon-python-plugins-common
@@ -24,18 +24,32 @@ Package:        bareos-filedaemon-percona-xtrabackup-python-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python-plugin (= ${binary:Version})${misc:Depends}
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python-plugin (= ${binary:Version}), ${misc:Depends}
+Recommends:     bareos-filedaemon-python3-plugin
 Description: Backup Archiving Recovery Open Sourced - file daemon Percona XtraBackup plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
  .
  This package provides the Percona XtraBackup Python plugin for the filedaemon.
 
+Package:        bareos-filedaemon-postgresql-python-plugin
+Architecture:   any
+Section:        python
+Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python-plugin (= ${binary:Version}), ${misc:Depends}
+Recommends:     bareos-filedaemon-python3-plugin
+Description: Backup Archiving Recovery Open Sourced - file daemon PostgreSQL plugin
+ Bareos is a set of programs to manage backup, recovery and verification of
+ data across a network of computers of different kinds.
+ .
+ This package provides the PostgreSQL Python plugin for the filedaemon.
+
 Package:        bareos-filedaemon-libcloud-python-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python-plugin (= ${binary:Version})${misc:Depends}
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python-plugin (= ${binary:Version}), ${misc:Depends}
+Recommends:     bareos-filedaemon-python3-plugin
 Description: Backup Archiving Recovery Open Sourced - file daemon Apache Libcloud plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.

diff --git a/debian/control.bareos-filedaemon-python2-plugin b/debian/control.bareos-filedaemon-python2-plugin
@@ -3,9 +3,10 @@ Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
 Depends:        bareos-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, bareos-filedaemon-python-plugins-common
+Recommends:     python-dateutil
 Provides:       bareos-filedaemon-python-plugin (= ${binary:Version})
 Replaces:       bareos-filedaemon-python-plugin
-Conflicts:      bareos-filedaemon-python-plugin
+Conflicts:      bareos-filedaemon-python-plugin (< 20.0.0)
 Description: Backup Archiving Recovery Open Sourced - file daemon Python plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.

diff --git a/debian/control.bareos-filedaemon-python3-plugin b/debian/control.bareos-filedaemon-python3-plugin
@@ -3,9 +3,10 @@ Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
 Depends:        bareos-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, bareos-filedaemon-python-plugins-common
+Recommends:     python3-dateutil
 Provides:       bareos-filedaemon-python-plugin (= ${binary:Version})
 Replaces:       bareos-filedaemon-python-plugin
-Conflicts:      bareos-filedaemon-python-plugin
+Conflicts:      bareos-filedaemon-python-plugin (< 20.0.0)
 Description: Backup Archiving Recovery Open Sourced - file daemon Python plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.

diff --git a/docs/pkglists/Debian_10.x86_64 b/docs/pkglists/Debian_10.x86_64
@@ -20,6 +20,7 @@ amd64/bareos-filedaemon-ceph-plugin
 amd64/bareos-filedaemon-ldap-python-plugin
 amd64/bareos-filedaemon-libcloud-python-plugin
 amd64/bareos-filedaemon-percona-xtrabackup-python-plugin
+amd64/bareos-filedaemon-postgresql-python-plugin
 amd64/bareos-filedaemon-python-plugins-common
 amd64/bareos-filedaemon-python2-plugin
 amd64/bareos-filedaemon-python3-plugin

diff --git a/docs/pkglists/Debian_9.0.i586 b/docs/pkglists/Debian_9.0.i586
@@ -20,6 +20,7 @@ i386/bareos-filedaemon-ceph-plugin
 i386/bareos-filedaemon-ldap-python-plugin
 i386/bareos-filedaemon-libcloud-python-plugin
 i386/bareos-filedaemon-percona-xtrabackup-python-plugin
+i386/bareos-filedaemon-postgresql-python-plugin
 i386/bareos-filedaemon-python-plugins-common
 i386/bareos-filedaemon-python2-plugin
 i386/bareos-filedaemon-python3-plugin

diff --git a/docs/pkglists/Debian_9.0.x86_64 b/docs/pkglists/Debian_9.0.x86_64
@@ -20,6 +20,7 @@ amd64/bareos-filedaemon-ceph-plugin
 amd64/bareos-filedaemon-ldap-python-plugin
 amd64/bareos-filedaemon-libcloud-python-plugin
 amd64/bareos-filedaemon-percona-xtrabackup-python-plugin
+amd64/bareos-filedaemon-postgresql-python-plugin
 amd64/bareos-filedaemon-python-plugins-common
 amd64/bareos-filedaemon-python2-plugin
 amd64/bareos-filedaemon-python3-plugin

diff --git a/docs/pkglists/Univention_4.3.x86_64 b/docs/pkglists/Univention_4.3.x86_64
@@ -21,6 +21,7 @@ amd64/bareos-filedaemon-ceph-plugin
 amd64/bareos-filedaemon-ldap-python-plugin
 amd64/bareos-filedaemon-libcloud-python-plugin
 amd64/bareos-filedaemon-percona-xtrabackup-python-plugin
+amd64/bareos-filedaemon-postgresql-python-plugin
 amd64/bareos-filedaemon-python-plugins-common
 amd64/bareos-filedaemon-python2-plugin
 amd64/bareos-filedaemon-python3-plugin

diff --git a/docs/pkglists/Univention_4.4.x86_64 b/docs/pkglists/Univention_4.4.x86_64
@@ -21,6 +21,7 @@ amd64/bareos-filedaemon-ceph-plugin
 amd64/bareos-filedaemon-ldap-python-plugin
 amd64/bareos-filedaemon-libcloud-python-plugin
 amd64/bareos-filedaemon-percona-xtrabackup-python-plugin
+amd64/bareos-filedaemon-postgresql-python-plugin
 amd64/bareos-filedaemon-python-plugins-common
 amd64/bareos-filedaemon-python2-plugin
 amd64/bareos-filedaemon-python3-plugin

diff --git a/docs/pkglists/xUbuntu_16.04.i586 b/docs/pkglists/xUbuntu_16.04.i586
@@ -20,6 +20,7 @@ i386/bareos-filedaemon-ceph-plugin
 i386/bareos-filedaemon-ldap-python-plugin
 i386/bareos-filedaemon-libcloud-python-plugin
 i386/bareos-filedaemon-percona-xtrabackup-python-plugin
+i386/bareos-filedaemon-postgresql-python-plugin
 i386/bareos-filedaemon-python-plugins-common
 i386/bareos-filedaemon-python2-plugin
 i386/bareos-filedaemon-python3-plugin

diff --git a/docs/pkglists/xUbuntu_16.04.x86_64 b/docs/pkglists/xUbuntu_16.04.x86_64
@@ -20,6 +20,7 @@ amd64/bareos-filedaemon-ceph-plugin
 amd64/bareos-filedaemon-ldap-python-plugin
 amd64/bareos-filedaemon-libcloud-python-plugin
 amd64/bareos-filedaemon-percona-xtrabackup-python-plugin
+amd64/bareos-filedaemon-postgresql-python-plugin
 amd64/bareos-filedaemon-python-plugins-common
 amd64/bareos-filedaemon-python2-plugin
 amd64/bareos-filedaemon-python3-plugin

diff --git a/docs/pkglists/xUbuntu_18.04.x86_64 b/docs/pkglists/xUbuntu_18.04.x86_64
@@ -20,6 +20,7 @@ amd64/bareos-filedaemon-ceph-plugin
 amd64/bareos-filedaemon-ldap-python-plugin
 amd64/bareos-filedaemon-libcloud-python-plugin
 amd64/bareos-filedaemon-percona-xtrabackup-python-plugin
+amd64/bareos-filedaemon-postgresql-python-plugin
 amd64/bareos-filedaemon-python-plugins-common
 amd64/bareos-filedaemon-python2-plugin
 amd64/bareos-filedaemon-python3-plugin

diff --git a/docs/pkglists/xUbuntu_20.04.x86_64 b/docs/pkglists/xUbuntu_20.04.x86_64
@@ -20,6 +20,7 @@ amd64/bareos-filedaemon-ceph-plugin
 amd64/bareos-filedaemon-ldap-python-plugin
 amd64/bareos-filedaemon-libcloud-python-plugin
 amd64/bareos-filedaemon-percona-xtrabackup-python-plugin
+amd64/bareos-filedaemon-postgresql-python-plugin
 amd64/bareos-filedaemon-python-plugins-common
 amd64/bareos-filedaemon-python2-plugin
 amd64/bareos-filedaemon-python3-plugin