Merge ~racb/ubuntu/+source/bacula:merge into ubuntu/+source/bacula:debian/sid

[Robie Basak]

Merge latest bacula (9.4.2->9.4.4). Upstream changes: https://www.bacula.org/git/cgit.cgi/bacula/log/?h=Branch-9.4

Build and autopkgtest passes locally on amd64.

[Robie Basak (racb)]

Hold review please. Debian responded to my patch and applied https://salsa.debian.org/bacula-team/bacula/-/commit/0fc482983a142b19f107e37ab0011b0b1806496d, which touches a bunch of other files too that evidently aren't in the test paths. I should replace my fix with a cherry-pick of the upstream commit.

[Robie Basak (racb)]

Branch updated. You may resume the review. Thanks!

[Andreas Hasenack (ahasenack)]

The merge looks fine, so +1 from that perspective.

Did you check all the upstream changes, though? Some look like new features and would require an FFe for this upload:

9.4.4:
- looks fine

9.4.3:
 - baculum: Add capability to use many ACL Console directives in one config
  resource
 - baculum: Add client ls command to openapi file
 - baculum: Add text box list control to support directives that can be defined
  multiple times in one resource
 - baculum: Add cancel button to last step new job wizard
 - baculum: Change PoolType field from text box into combo box
 - baculum: Add support to multiple schedule run directives
and so on

Otherwise we keep the mysql8 delta, and apply the protected_regular=2 fix to the maintainerscripts.

review: Needs Information

Unmerged commits

0c74920... by Robie Basak on 2020-02-28

Finalise changelog

8b487c6... by Robie Basak on 2020-03-03

update-maintainer

b0589e3... by Robie Basak on 2020-03-03

reconstruct-changelog

2c09d99... by Robie Basak on 2020-03-03

merge-changelogs

9cc50ca... by Carsten Leonhardt <email address hidden> on 2020-03-03

Make installation of bacula-sd possible on systems with
protected_regular=2 set (Closes: #953030).

Based on a patch by Robie Basak.

2d4db33... by Robie Basak on 2020-02-28

    - d/t/control: some dbconfig-common output goes to stderr. This is not a
      failure, so instruct the autopkgtest machinery accordingly.

742a186... by Robie Basak on 2020-02-28

    - d/t/backup-test: fix test failures caused by test dependency installation
      misordering by reinstalling the required database schema at the start of
      the test. This is a workaround for Debian bug 923444.

115ddd7... by Carsten Leonhardt <email address hidden> on 2019-07-06

Import patches-unapplied version 9.4.4-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: eafe1b26d1e8681841b24aea9a7dbaab20404537

New changelog entries:
  * Upload to unstable.

eafe1b2... by Carsten Leonhardt <email address hidden> on 2019-06-19

Import patches-unapplied version 9.4.4-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: f320e4c79fa55669b008fee99b2c97205d094412

New changelog entries:
  [ Carsten Leonhardt, Sven Hartge ]
  * New upstream version 9.4.4
  [ Carsten Leonhardt ]
  * Remove the transitional bacula-director-common package
  * Remove the make_bacula_catalog_awk scripts

f320e4c... by Carsten Leonhardt <email address hidden> on 2019-02-28

Import patches-unapplied version 9.4.2-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: d2bcf61ada1d376f637fce9fdc908a7350f7a83a

New changelog entries:
  [ Carsten Leonhardt ]
  * Update debian/copyright to include list of authors
  [ Sven Hartge ]
  * wrap-and-sort Debian control files
  * Switch to debhelper-compat virtual package

diff --git a/debian/bacula-console-qt.postinst b/debian/bacula-console-qt.postinst
index 3c2f825..386fb88 100644
--- a/debian/bacula-console-qt.postinst
+++ b/debian/bacula-console-qt.postinst
@@ -15,11 +15,11 @@ case "$1" in
 	# create new bat.conf using the template
 	TMP_CONFIG="$(mktemp -p /tmp $PKG_NAME.conf.ucftmp-XXXXXXXXXX)"
 	chmod 640 $TMP_CONFIG
-	chown root:bacula $TMP_CONFIG
-
 	sed -e s~@debian_basename@~`hostname`~ \
 	    -e s~XXX_DIRPASSWORD_XXX~$DIRPASSWD~ \
 	    $TEMPLATE > $TMP_CONFIG
+	chown root:bacula $TMP_CONFIG
+
 	# let ucf handle the conffile and register it
 	ucf --debconf-ok --three-way $TMP_CONFIG $TARGET
 	ucfr $PKG_NAME $TARGET
diff --git a/debian/bacula-console.postinst b/debian/bacula-console.postinst
index 8a35c00..f8d5bae 100644
--- a/debian/bacula-console.postinst
+++ b/debian/bacula-console.postinst
@@ -15,11 +15,11 @@ case "$1" in
 	# create new bconsole.conf using the template
 	TMP_CONFIG="$(mktemp -p /tmp $PKG_NAME.conf.ucftmp-XXXXXXXXXX)"
 	chmod 640 $TMP_CONFIG
-	chown root:bacula $TMP_CONFIG
-
 	sed -e s~@debian_basename@~`hostname`~ \
 	    -e s~XXX_DIRPASSWORD_XXX~$DIRPASSWD~ \
 	    $TEMPLATE > $TMP_CONFIG
+	chown root:bacula $TMP_CONFIG
+
 	# let ucf handle the conffile and register it
 	ucf --debconf-ok --three-way $TMP_CONFIG $TARGET
 	ucfr $PKG_NAME $TARGET
diff --git a/debian/bacula-director.postinst b/debian/bacula-director.postinst
index 9e0cdec..ee629e5 100644
--- a/debian/bacula-director.postinst
+++ b/debian/bacula-director.postinst
@@ -27,8 +27,6 @@ case "$1" in
 	# create new bacula-dir.conf using the template
 	TMP_CONFIG="$(mktemp -p /tmp $PKG_NAME.conf.ucftmp-XXXXXXXXXX)"
 	chmod 640 $TMP_CONFIG
-	chown root:bacula $TMP_CONFIG
-
 	sed -e s~XXX_DIRPASSWORD_XXX~$DIRPASSWD~ \
 	    -e s~XXX_MONDIRPASSWORD_XXX~$DIRMPASSWD~ \
 	    -e s~XXX_SDPASSWORD_XXX~$SDPASSWD~ \
@@ -59,6 +57,8 @@ case "$1" in
 		;;
 	    esac
         fi
+	chown root:bacula $TMP_CONFIG
+
 	# let ucf handle the conffile and register it
 	ucf --debconf-ok --three-way $TMP_CONFIG $TARGET
 	ucfr $PKG_NAME $TARGET
diff --git a/debian/bacula-fd.postinst b/debian/bacula-fd.postinst
index 8529173..f2a229e 100644
--- a/debian/bacula-fd.postinst
+++ b/debian/bacula-fd.postinst
@@ -15,12 +15,12 @@ case "$1" in
 	# create new bacula-fd.conf using the template
 	TMP_CONFIG="$(mktemp -p /tmp $PKG_NAME.conf.ucftmp-XXXXXXXXXX)"
 	chmod 640 $TMP_CONFIG
-	chown root:bacula $TMP_CONFIG
-
 	sed -e s~@debian_basename@~`hostname`~ \
 	    -e s~XXX_FDPASSWORD_XXX~$FDPASSWD~ \
 	    -e s~XXX_MONFDPASSWORD_XXX~$FDMPASSWD~ \
 	    $TEMPLATE > $TMP_CONFIG
+	chown root:bacula $TMP_CONFIG
+
 	# let ucf handle the conffile and register it
 	ucf --debconf-ok --three-way $TMP_CONFIG $TARGET
 	ucfr $PKG_NAME $TARGET
diff --git a/debian/bacula-sd.postinst b/debian/bacula-sd.postinst
index 1ed67ff..1465d6f 100644
--- a/debian/bacula-sd.postinst
+++ b/debian/bacula-sd.postinst
@@ -15,12 +15,14 @@ case "$1" in
 	# create new bacula-sd.conf using the template
 	TMP_CONFIG="$(mktemp -p /tmp $PKG_NAME.conf.ucftmp-XXXXXXXXXX)"
 	chmod 640 $TMP_CONFIG
-	chown bacula:bacula $TMP_CONFIG
-
 	sed -e s~@debian_basename@~`hostname`~ \
 	    -e s~XXX_SDPASSWORD_XXX~$SDPASSWD~ \
 	    -e s~XXX_MONSDPASSWORD_XXX~$SDMPASSWD~ \
 	    $TEMPLATE > $TMP_CONFIG
+	# change owner of file to bacula only after we wrote to it as root
+	# cf. bug #953030
+	chown bacula:bacula $TMP_CONFIG
+
 	# let ucf handle the conffile and register it
 	ucf --debconf-ok --three-way $TMP_CONFIG $TARGET
 	ucfr $PKG_NAME $TARGET
diff --git a/debian/bacula-tray-monitor.postinst b/debian/bacula-tray-monitor.postinst
index 0440a9d..341152a 100644
--- a/debian/bacula-tray-monitor.postinst
+++ b/debian/bacula-tray-monitor.postinst
@@ -15,13 +15,13 @@ case "$1" in
 	# create new bacula-tray-monitor.conf using the template
 	TMP_CONFIG="$(mktemp -p /tmp $PKG_NAME.conf.ucftmp-XXXXXXXXXX)"
 	chmod 640 $TMP_CONFIG
-	chown root:bacula $TMP_CONFIG
-
 	sed -e s~@debian_basename@~`hostname`~ \
 	    -e s~XXX_MONDIRPASSWORD_XXX~$DIRMPASSWD~ \
 	    -e s~XXX_MONFDPASSWORD_XXX~$FDMPASSWD~ \
 	    -e s~XXX_MONSDPASSWORD_XXX~$SDMPASSWD~ \
 	    $TEMPLATE > $TMP_CONFIG
+	chown root:bacula $TMP_CONFIG
+
 	# let ucf handle the conffile and register it
 	ucf --debconf-ok --three-way $TMP_CONFIG $TARGET
 	ucfr $PKG_NAME $TARGET
diff --git a/debian/changelog b/debian/changelog
index 463f9ed..2c49093 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+bacula (9.4.4-2ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/t/backup-test: fix test failures caused by test dependency installation
+      misordering by reinstalling the required database schema at the start of
+      the test. This is a workaround for Debian bug 923444.
+    - d/t/control: some dbconfig-common output goes to stderr. This is not a
+      failure, so instruct the autopkgtest machinery accordingly.
+  * Drop changes (applied upstream):
+    - debian/patches/debian/mysql-8-compat: Fix compatibility with MySQL 8 by
+      using bool instead of my_bool.
+  * Various postinsts in d/: change temporary file ownership after writing
+    to avoid protected_regular=2 world-writeable sticky denials. Closes:
+    #953030. Cherry-picked from Debian VCS 0fc4829. Thanks to Carsten
+    Leonhardt.
+
+ -- Robie Basak <[e-mail]>  Tue, 03 Mar 2020 11:24:56 +0000
+
 bacula (9.4.4-2) unstable; urgency=medium
 
   * Upload to unstable.
@@ -15,6 +33,30 @@ bacula (9.4.4-1) experimental; urgency=medium
 
  -- Carsten Leonhardt <[e-mail]>  Wed, 19 Jun 2019 23:08:15 +0200
 
+bacula (9.4.2-2ubuntu3) eoan; urgency=medium
+
+  * d/t/backup-test: fix test failures caused by test dependency installation
+    misordering by reinstalling the required database schema at the start of
+    the test. This is a workaround for Debian bug 923444.
+  * d/t/control: some dbconfig-common output goes to stderr. This is not a
+    failure, so instruct the autopkgtest machinery accordingly.
+
+ -- Robie Basak <[e-mail]>  Wed, 28 Aug 2019 13:00:33 +0000
+
+bacula (9.4.2-2ubuntu2) eoan; urgency=medium
+
+  * No change rebuild for libmysqlclient21.
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 15 Aug 2019 09:32:44 +0200
+
+bacula (9.4.2-2ubuntu1) disco; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/patches/debian/mysql-8-compat: Fix compatibility with MySQL 8 by
+      using bool instead of my_bool.
+
+ -- Logan Rosen <[e-mail]>  Sun, 03 Mar 2019 15:17:26 -0500
+
 bacula (9.4.2-2) unstable; urgency=medium
 
   [ Carsten Leonhardt ]
@@ -26,6 +68,12 @@ bacula (9.4.2-2) unstable; urgency=medium
 
  -- Carsten Leonhardt <[e-mail]>  Thu, 28 Feb 2019 12:05:39 +0100
 
+bacula (9.4.2-1ubuntu1) disco; urgency=medium
+
+  * Fix compatibility with MySQL 8 by using bool instead of my_bool.
+
+ -- Logan Rosen <[e-mail]>  Sat, 23 Feb 2019 23:16:05 -0500
+
 bacula (9.4.2-1) unstable; urgency=medium
 
   [ Carsten Leonhardt ]
@@ -2630,3 +2678,4 @@ bacula (1.32f-4-1) unstable; urgency=low
           * Initial Packaging: 12 binary packages built
 
  -- José Luis Tallón <[e-mail]>  Wed, 18 Feb 2004 00:04:11 +0100
+
diff --git a/debian/control b/debian/control
index 9e13a46..df28412 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: bacula
 Section: admin
 Priority: optional
-Maintainer: Debian Bacula Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Bacula Team <[e-mail]>
 Uploaders: Carsten Leonhardt <[e-mail]>
 Build-Depends: autoconf,
                bc,
diff --git a/debian/tests/backup-test b/debian/tests/backup-test
index 2e0c616..7c09956 100755
--- a/debian/tests/backup-test
+++ b/debian/tests/backup-test
@@ -10,6 +10,22 @@ BASH_XTRACEFD="3"
 # Activate Tracing and exit-on-error
 set -ex
 
+# Workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923444
+apt-get -y install debconf-utils
+# If we don't reset some password fields we get a password mismatch error on
+# the subsequent database reinstallation. For the purposes of this workaround
+# in this isolated test environment it's easier just to reset them all.
+debconf-get-selections|awk '$3=="password"{print}'|debconf-set-selections
+for pkg in bacula-director-mysql bacula-director-pgsql; do
+    # This test script is used in multiple cases; we want to only reinstall the
+    # database if its package is installed.
+    pkg_status=`dpkg-query --showformat '${db:Status-Status}' -W "$pkg" 2>/dev/null || true`
+    if [ "$pkg_status" = "installed" ]; then
+        echo "$pkg $pkg/dbconfig-reinstall boolean true"|debconf-set-selections
+        DEBIAN_FRONTEND=noninteractive dpkg-reconfigure "$pkg"
+    fi
+done
+
 echo "start testing ... "
 echo "USER: ${USER}"
 
diff --git a/debian/tests/control b/debian/tests/control
index ead3052..a9c5087 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,13 +1,13 @@
 Tests: backup-test-pgsql, program-test-pgsql
-Restrictions: breaks-testbed needs-root
+Restrictions: breaks-testbed needs-root allow-stderr
 Depends: postgresql
 
 Tests: backup-test-mysql, program-test-mysql
-Restrictions: breaks-testbed needs-root
+Restrictions: breaks-testbed needs-root allow-stderr
 Depends: bacula,
          bacula-director-mysql,
          default-mysql-server | virtual-mysql-server
 
 Tests: backup-test-sqlite3, program-test-sqlite3
-Restrictions: breaks-testbed needs-root
+Restrictions: breaks-testbed needs-root allow-stderr
 Depends: bacula, bacula-director-sqlite3