Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: debian-archive-keyr...@packages.debian.org,
debian-b...@lists.debian.org, k...@debian.org, j...@debian.org
Control: affects -1 + src:debian-archive-keyring
[ Reason ]
The latest bullseye package places three keyrings in /etc/apt/trusted.gpg.d
in the (old) usual way:
/etc/apt/trusted.gpg.d/debian-archive-bookworm-stable.gpg
/etc/apt/trusted.gpg.d/debian-archive-bookworm-security-automatic.gpg
/etc/apt/trusted.gpg.d/debian-archive-bookworm-automatic.gpg
These files were superceded with asc fragments in bookworm, but the old
keyrings were not removed. Users upgrading straight from bullseye
to bookworm will have duplicate files left over.
There is no bug tracking this but I have just fixed it in sid with 2023.4.
[ Impact ]
Users will have leftover keyring files left in apt's trusted directory.
[ Tests ]
Manual tests only. The affected files are correctly removed.
[ Risks ]
This is a straightforward change and a very small patch with a
well-tested code path. If users have altered the installed keyring
files their changes will be lost, but there is no reason for a
user to have done so.
[ 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
[ Changes ]
Just adds calls to dpkg-maintscript-helper to remove the
redundant files. The fix was cherry-picked from sid
so some version number chages were also required.
[ Other info ]
I will make a presumptive upload shortly. The package generates a udeb.
diff -Nru debian-archive-keyring-2023.3/debian/changelog
debian-archive-keyring-2023.3+deb12u1/debian/changelog
--- debian-archive-keyring-2023.3/debian/changelog 2023-03-28
21:31:07.000000000 +0100
+++ debian-archive-keyring-2023.3+deb12u1/debian/changelog 2023-07-30
20:30:54.000000000 +0100
@@ -1,3 +1,10 @@
+debian-archive-keyring (2023.3+deb12u1) bookworm; urgency=medium
+
+ * Clean up leftover keyrings in trusted.gpg.d
+ * Adjust keyring cleanup versions for a stable update
+
+ -- Jonathan Wiltshire <j...@debian.org> Sun, 30 Jul 2023 20:30:54 +0100
+
debian-archive-keyring (2023.3) unstable; urgency=medium
* Reinstate cleanup of the APT keyrings for buster (Closes: #1033153)
diff -Nru
debian-archive-keyring-2023.3/debian/debian-archive-keyring.maintscript
debian-archive-keyring-2023.3+deb12u1/debian/debian-archive-keyring.maintscript
--- debian-archive-keyring-2023.3/debian/debian-archive-keyring.maintscript
2023-03-28 21:23:44.000000000 +0100
+++
debian-archive-keyring-2023.3+deb12u1/debian/debian-archive-keyring.maintscript
2023-07-30 20:30:54.000000000 +0100
@@ -15,3 +15,7 @@
rm_conffile /etc/apt/trusted.gpg.d/debian-archive-bullseye-automatic.gpg
2022.1~~
rm_conffile
/etc/apt/trusted.gpg.d/debian-archive-bullseye-security-automatic.gpg 2022.1~~
rm_conffile /etc/apt/trusted.gpg.d/debian-archive-bullseye-stable.gpg 2022.1~~
+# These get left over from the bullseye version, after which they became
fragments
+rm_conffile /etc/apt/trusted.gpg.d/debian-archive-bookworm-stable.gpg
2023.3+deb12u1~~
+rm_conffile
/etc/apt/trusted.gpg.d/debian-archive-bookworm-security-automatic.gpg
2023.3+deb12u1~~
+rm_conffile /etc/apt/trusted.gpg.d/debian-archive-bookworm-automatic.gpg
2023.3+deb12u1~~
