Merge ~ahasenack/ubuntu/+source/samba:mantic-fix-breaks-replaces-for-kinetic-upgrade into ubuntu/+source/samba:ubuntu/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).

I'm unsure how to test mantic specifically, since kinetic can only upgrade to lunar, and not to mantic directly. And upgrades from lunar are unaffected because the version in lunar is already past the original B/R.

To test lunar:
- 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) ...

[Andreas Hasenack (ahasenack)]

I'm going to bundle this together with the 4.18.6 merge that I'm working on and intend to upload today.

[Andreas Hasenack (ahasenack)]

Superseeded by https://code.launchpad.net/~ahasenack/ubuntu/+source/samba/+git/samba/+merge/449354

review: Disapprove

Unmerged commits

e06fb09... by Andreas Hasenack on 2023-08-16

changelog

d343139... by Andreas Hasenack on 2023-07-05

  * 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)

diff --git a/debian/changelog b/debian/changelog
index fd89c42..5857240 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+samba (2:4.18.5+dfsg-1ubuntu3) mantic; 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]>  Wed, 16 Aug 2023 10:34:03 -0300
+
 samba (2:4.18.5+dfsg-1ubuntu2) mantic; urgency=medium
 
   * Add changes to fix uncaught exception when updating old password
diff --git a/debian/control b/debian/control
index ea59fa3..253c183 100644
--- a/debian/control
+++ b/debian/control
@@ -396,8 +396,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,