Merge ~ahasenack/ubuntu/+source/samba:lunar-fix-breaks-replaces-for-kinetic-upgrade into ubuntu/+source/samba:ubuntu/lunar-devel

[Andreas Hasenack]

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/samba-fix-breaks-replaces/

Adjust the breaks/replaces originally on version 4.16.6+dfsg-5~ to 2:4.17.7+dfsg-1ubuntu1~, which was the first version of the ubuntu packaging that included the debian change that moved some files between packages.

As explained in https://bugs.launchpad.net/ubuntu/+source/samba/+bug/2024663/comments/7, the scenarios where this file conflict could occur are less likely nowadays, but could still happen, therefore I'll propose to fix this bug and add the block-proposed tag for the remaining stable release (lunar).

To test:
- deploy kinetic
- install packages:

  $ sudo apt install samba samba-libs winbind -y

To reproduce the bug:
- upgrade to lunar: sudo do-release-upgrade
- Verify the bug happened by inspecting the apt-terminal.log file:

  $ grep "trying to overwrite" /var/log/dist-upgrade/apt-term.log
  dpkg: warning: trying to overwrite '/usr/share/man/man8/idmap_rfc2307.8.gz', which is also in package samba-libs:amd64 2:4.16.8+dfsg-0ubuntu1.2
  dpkg: warning: trying to overwrite '/usr/share/man/man8/idmap_script.8.gz', which is also in package samba 2:4.16.8+dfsg-0ubuntu1.2

To verify the fix:
- add the ppa (note it will complain there are no kinetic packages in the ppa, that's ok):

  $ sudo add-apt-repository ppa:ahasenack/samba-fix-breaks-replaces -y -u

- upgrade do lunar, but preserving the ppa:

  $ sudo do-release-upgrade --allow-third-party

- verify apt-terminal.log has no "trying to overwrite" lines:

  $ grep "trying to overwrite" /var/log/dist-upgrade/apt-term.log
  $

- to be sure, check that winbind was unpacked without errors in the log:

  $ grep "Unpacking winbind" /var/log/dist-upgrade/apt-term.log -4
  Unpacking samba (2:4.17.7+dfsg-1ubuntu2.1~ppa1) over (2:4.16.8+dfsg-0ubuntu1.2) ...
  Preparing to unpack .../18-samba-libs_2%3a4.17.7+dfsg-1ubuntu2.1~ppa1_amd64.deb ...
  Unpacking samba-libs:amd64 (2:4.17.7+dfsg-1ubuntu2.1~ppa1) over (2:4.16.8+dfsg-0ubuntu1.2) ...
  Preparing to unpack .../19-winbind_2%3a4.17.7+dfsg-1ubuntu2.1~ppa1_amd64.deb ...
  Unpacking winbind (2:4.17.7+dfsg-1ubuntu2.1~ppa1) over (2:4.16.8+dfsg-0ubuntu1.2) ...
  Preparing to unpack .../20-samba-common-bin_2%3a4.17.7+dfsg-1ubuntu2.1~ppa1_amd64.deb ...
  Unpacking samba-common-bin (2:4.17.7+dfsg-1ubuntu2.1~ppa1) over (2:4.16.8+dfsg-0ubuntu1.2) ...
  Preparing to unpack .../21-samba-vfs-modules_2%3a4.17.7+dfsg-1ubuntu2.1~ppa1_amd64.deb ...
  Unpacking samba-vfs-modules:amd64 (2:4.17.7+dfsg-1ubuntu2.1~ppa1) over (2:4.16.8+dfsg-0ubuntu1.2) ...

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

I cannot do anything more than say - it LGTM :)

[Bryce Harrington (bryce)]

Based on Michal's comment, setting to Approved.

I also did a review of LP: #2024663 and did a cursory check of the packaging changes and all LGTM as well. Notably I agree this seems low risk since it's addressing a potential corner cases for kinetic users which is unlikely to be hit, but worth cleanup in case jammy or focal get backports of this.

review: Approve

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

Approvers: ahasenack, bryce
Uploaders: ahasenack, bryce
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, uploaded with rich history, and I added the block-proposed-lunar tag to the bug:

Uploading samba_4.17.7+dfsg-1ubuntu2.1.dsc
Uploading samba_4.17.7+dfsg-1ubuntu2.1.debian.tar.xz
Uploading samba_4.17.7+dfsg-1ubuntu2.1_source.buildinfo
Uploading samba_4.17.7+dfsg-1ubuntu2.1_source.changes

diff --git a/debian/changelog b/debian/changelog
index 0df6f08..17631d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+samba (2:4.17.7+dfsg-1ubuntu2.1) lunar; urgency=medium
+
+  * d/control: adjust breaks/replaces for file move that Debian did in
+    4.16.6+dfsg-5, and Ubuntu only did in 4.17.7+dfsg-1ubuntu1, to avoid
+    file conflict in a dist-upgrade from earlier Ubuntu releases, like
+    Kinetic (LP: #2024663)
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 01 Aug 2023 18:30:42 -0300
+
 samba (2:4.17.7+dfsg-1ubuntu2) lunar; urgency=medium
 
   * d/p/secure-channel-faulty-kb5028166.patch: fix domain membership
diff --git a/debian/control b/debian/control
index d5d994e..588ebaa 100644
--- a/debian/control
+++ b/debian/control
@@ -395,8 +395,9 @@ Depends: samba-common (= ${source:Version}),
 Enhances: libkrb5-26-heimdal <!pkg.samba.mitkrb5>
 Suggests: libnss-winbind, libpam-winbind
 # 4.16.6+dfsg-5 idmap_{script,rfc2307}.8 moved samba{,-libs} => winbind
-Breaks:   samba (<< 2:4.16.6+dfsg-5~), samba-libs (<< 2:4.16.6+dfsg-5~),
-Replaces: samba (<< 2:4.16.6+dfsg-5~), samba-libs (<< 2:4.16.6+dfsg-5~),
+# In Ubuntu, this was first done in 2:4.17.7+dfsg-1ubuntu1. See LP: #2024663
+Breaks:   samba (<< 2:4.17.7+dfsg-1ubuntu1~), samba-libs (<< 2:4.17.7+dfsg-1ubuntu1~),
+Replaces: samba (<< 2:4.17.7+dfsg-1ubuntu1~), samba-libs (<< 2:4.17.7+dfsg-1ubuntu1~),
 Description: service to resolve user and group information from Windows NT servers
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file sharing with Microsoft Windows, OS X,