Merge ~sergiodj/ubuntu/+source/backuppc:samba-dep8-bug1962166 into ubuntu/+source/backuppc:ubuntu/devel

Proposed by Sergio Durigan Junior
Status: Merged
Merged at revision: 065434cf403e8850993ce652cb4836aa93635ac5
Proposed branch: ~sergiodj/ubuntu/+source/backuppc:samba-dep8-bug1962166
Merge into: ubuntu/+source/backuppc:ubuntu/devel
Diff against target: 45 lines (+12/-3)
3 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/tests/smb-backup (+2/-2)
Reviewer Review Type Date Requested Status
Andreas Hasenack Approve
Canonical Server packageset reviewers Pending
Canonical Server Pending
Review via email: mp+416111@code.launchpad.net

Description of the change

This MP fixes backuppc's dep8 failures with Samba 4.15.5.

You can read about my investigation here:

https://bugs.launchpad.net/ubuntu/+source/backuppc/+bug/1962166/comments/1

and here:

https://bugzilla.samba.org/show_bug.cgi?id=14991

Debian is still on Samba 4.13.14, so this patch doesn't apply to them. Also, I'm going to file a bug against backuppc upstream and see if I can get them to improve/fix the way they invoke smbclient when both the username and password provided are empty.

There's a PPA with the proposed change here:

https://launchpad.net/~sergiodj/+archive/ubuntu/backuppc-bug1962166/+packages

autopkgtest is now passing on all architectures (using all-proposed=1, otherwise Samba 4.15.5 isn't used):

autopkgtest [22:35:55]: @@@@@@@@@@@@@@@@@@@@ summary
smb-backup PASS

To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Nice investigation, thanks!

It does sound silly to provide empty username and password. Let's land this, and I will file a bug for myself to add another DEP8 test, one that uses an actual username and password, and rename this one to "test anonymous backup" or something. And if it stays like this (samba upstream says it's as it should be, and backuppc says one shouldn't be using anonymous shares like this), we can add an entry to the release notes.

I also subscribed to the upstream samba bug you filed, thanks for that too.

review: Approve
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

On Saturday, February 26 2022, Andreas Hasenack wrote:

> Nice investigation, thanks!
>
> It does sound silly to provide empty username and password. Let's land
> this, and I will file a bug for myself to add another DEP8 test, one
> that uses an actual username and password, and rename this one to
> "test anonymous backup" or something. And if it stays like this (samba
> upstream says it's as it should be, and backuppc says one shouldn't be
> using anonymous shares like this), we can add an entry to the release
> notes.

+1, thanks for the quick review and sorry about the delay.

> I also subscribed to the upstream samba bug you filed, thanks for that too.

No problem.

Uploaded:

$ dput backuppc_4.4.0-5ubuntu1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/backuppc/backuppc_4.4.0-5ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/backuppc/backuppc_4.4.0-5ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading backuppc_4.4.0-5ubuntu1.dsc: done.
  Uploading backuppc_4.4.0-5ubuntu1.debian.tar.xz: done.
  Uploading backuppc_4.4.0-5ubuntu1_source.buildinfo: done.
  Uploading backuppc_4.4.0-5ubuntu1_source.changes: done.
Successfully uploaded packages.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 9976159..543bb7a 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+backuppc (4.4.0-5ubuntu1) jammy; urgency=medium
7+
8+ * d/t/smb-backup: Provide non-empty username/password values to
9+ authenticate against the Samba share, working around a possible Samba
10+ regression with anonymous authentication. (LP: #1962166)
11+
12+ -- Sergio Durigan Junior <sergio.durigan@canonical.com> Fri, 25 Feb 2022 16:49:57 -0500
13+
14 backuppc (4.4.0-5) unstable; urgency=medium
15
16 [ Simon McVittie ]
17diff --git a/debian/control b/debian/control
18index 829dc6f..51e3d7d 100644
19--- a/debian/control
20+++ b/debian/control
21@@ -1,7 +1,8 @@
22 Source: backuppc
23 Section: utils
24 Priority: optional
25-Maintainer: Debian BackupPC Team <team+pkg-backuppc@tracker.debian.org>
26+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
27+XSBC-Original-Maintainer: Debian BackupPC Team <team+pkg-backuppc@tracker.debian.org>
28 Uploaders: Tobias Frost <tobi@debian.org>,
29 Axel Beckert <abe@debian.org>,
30 Jonathan Wiltshire <jmw@debian.org>
31diff --git a/debian/tests/smb-backup b/debian/tests/smb-backup
32index 7ec3f21..209af08 100644
33--- a/debian/tests/smb-backup
34+++ b/debian/tests/smb-backup
35@@ -62,8 +62,8 @@ add_localhost_backuppc_config() {
36 \$Conf{ClientCharset} = '';
37 \$Conf{ClientCharsetLegacy} = 'iso-8859-1';
38 \$Conf{SmbShareName} = 'public';
39-\$Conf{SmbShareUserName} = '';
40-\$Conf{SmbSharePasswd} = '';
41+\$Conf{SmbShareUserName} = 'guest';
42+\$Conf{SmbSharePasswd} = 'nothing';
43 \$Conf{PingPath} = '/bin/ping';
44 \$Conf{Ping6Path} = '/bin/ping6';
45 EOFEOF

Subscribers

People subscribed via source and target branches