Bug#1037182: bullseye-pu: package bmake/20200710-14+deb11u1

2023-06-29 Thread Jonathan Wiltshire
Control: tag -1 confirmed

On Wed, Jun 07, 2023 at 11:23:29AM +0200, Andreas Beckmann wrote:
> add Conflict against unfixed bsdowl versions, i.e. the version from
> buster that may have survived the upgrade to bullseye since bsdowl is
> not part of bullseye.

Please go ahead.

Thanks,


-- 
Jonathan Wiltshire  j...@debian.org
Debian Developer http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51
ed25519/0x196418AAEB74C8A1: CA619D65A72A7BADFC96D280196418AAEB74C8A1



Bug#1037182: bullseye-pu: package bmake/20200710-14+deb11u1

2023-06-07 Thread Andreas Beckmann
Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian@packages.debian.org
Usertags: pu

[ Reason ]
There is a directory vs. symlink conflict between bsdowl (buster, not in
bullseye) and bmake (buster), causing bsdowl files to and up in a
location behind a symlink from bmake.
bsdowl has been fixed in bookworm and sid, but that happened to late for
bullseye (was already autorm'ed, not reintroducible).
With the Conflicts against the unfixed bsdowl version added to bmake,
the old bsdowl package from buster gets removed on systems upgraded to
bullseye. If someone really need it, I can provide a backport of the
fixed bsdowl from bookworm in bullseye-backports.

[ Impact ]
QA tools warn about files installed over a directory symlink, maybe
silently overwriting other packages files.

[ Tests ]
manual piuparts tests
  buster -> bullseye + fix
  buster -> bullseye -> bullseye + fix
no longer fail with
  ERROR: installs objects over existing directory symlinks:
  /usr/share/mk/bps.autoconf.mk (bsdowl) != 
/usr/share/bmake/mk-bmake/bps.autoconf.mk (?)
/usr/share/mk -> bmake/mk-bmake
  ...

[ Risks ]
Low, only affects packages not part of bullseye.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable
  - bsdowl ships the files in the new canonical location
  - bmake verifies that no other package messes up its symlinks

[ Changes ]
add Conflict against unfixed bsdowl versions, i.e. the version from
buster that may have survived the upgrade to bullseye since bsdowl is
not part of bullseye.

[ Other info ]
n/a

Andreas
diff -Nru bmake-20200710/debian/changelog bmake-20200710/debian/changelog
--- bmake-20200710/debian/changelog 2021-04-02 12:53:47.0 +0200
+++ bmake-20200710/debian/changelog 2023-06-07 09:48:17.0 +0200
@@ -1,3 +1,11 @@
+bmake (20200710-14+deb11u1) bullseye; urgency=medium
+
+  * Non-maintainer upload.
+  * Add Conflicts: bsdowl (<< 2.2.2-1.2~) for directory vs. symlink conflict.
+(Closes: #985347)
+
+ -- Andreas Beckmann   Wed, 07 Jun 2023 09:48:17 +0200
+
 bmake (20200710-14) unstable; urgency=medium
 
   * Remove the bsd.*.mk autodetection now that we actually ship symlinks.
diff -Nru bmake-20200710/debian/control bmake-20200710/debian/control
--- bmake-20200710/debian/control   2021-04-02 12:53:47.0 +0200
+++ bmake-20200710/debian/control   2023-06-07 09:48:17.0 +0200
@@ -13,6 +13,7 @@
 Multi-Arch: foreign
 Replaces: pmake
 Provides: pmake
+Conflicts: bsdowl (<< 2.2.2-1.2~)
 Breaks: pmake (<< 20200710-2)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: NetBSD make