Merge ~michal-maloszewski99/ubuntu/+source/backuppc:specify-canonical-path-ping6-focal into ubuntu/+source/backuppc:ubuntu/focal-devel

[Michał Małoszewski]

[Michał Małoszewski (michal-maloszewski99)]

I am about to finish SRU bug report and push a package with changes to PPA.

[Michał Małoszewski (michal-maloszewski99)]

Please review SRU report
https://docs.google.com/document/d/1X6N7p9YdrYi9_AEi5g4ydIQ9l0WuInUcHVT2IVKyWj0/edit?usp=sharing

[Michał Małoszewski (michal-maloszewski99)]

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-focal-michal-maloszewski99-backuppc-sru-lp782890/?format=plain)
  backuppc @ amd64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-focal-michal-maloszewski99-backuppc-sru-lp782890/focal/amd64/b/backuppc/20220808_121715_68527@/log.gz
    08.08.22 12:17:15 ✅ Triggers: backuppc/3.3.2-3ubuntu0.1~ppa1
    http://autopkgtest.ubuntu.com/results/autopkgtest-focal-michal-maloszewski99-backuppc-sru-lp782890/focal/amd64/b/backuppc/20220808_121716_e3df4@/log.gz
    08.08.22 12:17:16 ✅ Triggers: backuppc/3.3.2-3ubuntu0.1~ppa1
  backuppc @ arm64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-focal-michal-maloszewski99-backuppc-sru-lp782890/focal/arm64/b/backuppc/20220808_122124_ba97f@/log.gz
    08.08.22 12:21:24 ✅ Triggers: backuppc/3.3.2-3ubuntu0.1~ppa1
  backuppc @ armhf:
    http://autopkgtest.ubuntu.com/results/autopkgtest-focal-michal-maloszewski99-backuppc-sru-lp782890/focal/armhf/b/backuppc/20220808_124050_97eb2@/log.gz
    08.08.22 12:40:50 ✅ Triggers: backuppc/3.3.2-3ubuntu0.1~ppa1
  backuppc @ ppc64el:
    http://autopkgtest.ubuntu.com/results/autopkgtest-focal-michal-maloszewski99-backuppc-sru-lp782890/focal/ppc64el/b/backuppc/20220808_121806_17725@/log.gz
    08.08.22 12:18:06 ✅ Triggers: backuppc/3.3.2-3ubuntu0.1~ppa1
  backuppc @ s390x:
    http://autopkgtest.ubuntu.com/results/autopkgtest-focal-michal-maloszewski99-backuppc-sru-lp782890/focal/s390x/b/backuppc/20220808_121736_88b58@/log.gz
    08.08.22 12:17:36 ✅ Triggers: backuppc/3.3.2-3ubuntu0.1~ppa1

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Michał.

The changes look good to me, but there's one minor nit: you have to run update-maintainer as well, because you're introducing Ubuntu-specific delta here.

I built the package locally and performed some tests inside a container. I installed the current version of backuppc, and then upgraded it to the version from your PPA. I've also modified the configuration file before performing the upgrade, and verified that dpkg will notify the user that there are changes that conflict with the existing version of the file, which is good.

I looked at the SRU template you wrote and I have a few comments:

- IMHO you can write the template directly in the bug.

- I believe you can rewrite the Impact section and make it more straightforward. The intention is to briefly explain that the current backuppc package on Bionic/Focal does not contain a valid setting for ping6, which causes problems for users whose backup hosts are using IPv6.

- I think you meant to write "hardcode" instead of "hard-core".

- Minor nit: we always try to use "ubuntu:focal" (or "ubuntu-daily:focal") as our LXD image. The "ubuntu:XYZ" images are produced by Canonical and include cloud-init and other technologies, so it's a good "dogfooding practice" to use them.

- I'd also suggest rewriting the "Where problems could occur" section. The text is looking a bit confusing as is. Also, the part about having a hardcoded value in the configuration file should be a bit more clear regarding the conflict that the user will face.

review: Needs Fixing

[Michał Małoszewski (michal-maloszewski99)]

> Thanks for the MP, Michał.
>
> The changes look good to me, but there's one minor nit: you have to run
> update-maintainer as well, because you're introducing Ubuntu-specific delta
> here.
>
> I built the package locally and performed some tests inside a container. I
> installed the current version of backuppc, and then upgraded it to the version
> from your PPA. I've also modified the configuration file before performing
> the upgrade, and verified that dpkg will notify the user that there are
> changes that conflict with the existing version of the file, which is good.
>
> I looked at the SRU template you wrote and I have a few comments:
>
> - IMHO you can write the template directly in the bug.
>
> - I believe you can rewrite the Impact section and make it more
> straightforward. The intention is to briefly explain that the current
> backuppc package on Bionic/Focal does not contain a valid setting for ping6,
> which causes problems for users whose backup hosts are using IPv6.
>
> - I think you meant to write "hardcode" instead of "hard-core".
>
> - Minor nit: we always try to use "ubuntu:focal" (or "ubuntu-daily:focal") as
> our LXD image. The "ubuntu:XYZ" images are produced by Canonical and include
> cloud-init and other technologies, so it's a good "dogfooding practice" to use
> them.
>
> - I'd also suggest rewriting the "Where problems could occur" section. The
> text is looking a bit confusing as is. Also, the part about having a
> hardcoded value in the configuration file should be a bit more clear regarding
> the conflict that the user will face.

Done

[Sergio Durigan Junior (sergiodj)]

Sorry, but I don't see the changes I requested in the SRU template.

review: Needs Fixing

[Christian Ehrhardt  (paelzer)]

@Michal - please just grab Sergio pre/post some meeting instead of playing MP-pingpong :-)

[Michał Małoszewski (michal-maloszewski99)]

@Christian - we've had the meeting yesterday

[Sergio Durigan Junior (sergiodj)]

Thanks. Uploaded:

$ dput backuppc_3.3.2-3ubuntu0.1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/backuppc/backuppc_3.3.2-3ubuntu0.1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/backuppc/backuppc_3.3.2-3ubuntu0.1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading backuppc_3.3.2-3ubuntu0.1.dsc: done.
  Uploading backuppc_3.3.2-3ubuntu0.1.debian.tar.xz: done.
  Uploading backuppc_3.3.2-3ubuntu0.1_source.buildinfo: done.
  Uploading backuppc_3.3.2-3ubuntu0.1_source.changes: done.
Successfully uploaded packages.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: sergiodj, michal-maloszewski99
Uploaders: sergiodj
MP auto-approved

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 59f598d..43b8aca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+backuppc (3.3.2-3ubuntu0.1) focal; urgency=medium
+
+  * d/rules: Specify canonical path to ping6 (LP: #782890)
+
+ -- Michal Maloszewski <[e-mail]>  Fri, 05 Aug 2022 15:10:09 +0200
+
 backuppc (3.3.2-3) unstable; urgency=medium
 
   * Update watch file for BackupPC 4 series
diff --git a/debian/control b/debian/control
index 8d8bfdd..3722fd6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: backuppc
 Section: utils
 Priority: optional
-Maintainer: Debian BackupPC Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian BackupPC Team <[e-mail]>
 Uploaders: Tobias Frost <[e-mail]>,
            Axel Beckert <[e-mail]>,
            Jonathan Wiltshire <[e-mail]>
diff --git a/debian/rules b/debian/rules
index acbeed2..851d86f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,8 @@ override_dh_install:
 	    --bin-path sendmail=/usr/sbin/sendmail \
             --bin-path hostname=/bin/hostname --bin-path split=/usr/bin/split \
             --bin-path par2=/usr/bin/par2 --bin-path cat=/bin/cat \
-	    --bin-path gzip=/bin/gzip --bin-path bzip2=/bin/bzip2
+	    --bin-path gzip=/bin/gzip --bin-path bzip2=/bin/bzip2 \
+	    --bin-path ping6=/bin/ping6
 	mv -f debian/backuppc/usr/share/backuppc/cgi-bin/* debian/backuppc/usr/share/backuppc/lib/realindex.cgi
 	install --mode=755 index.cgi debian/backuppc/usr/lib/backuppc/cgi-bin
 	install --mode=755 debian/BackupPC_deleteFile debian/backuppc/usr/share/backuppc/bin