Bug#1031783: bullseye-pu: package command-not-found/20.10.1-1+deb11u1

[Paul Gevers <elbrus@debian.org>]

Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: command-not-found@packages.debian.org
Control: affects -1 + src:command-not-found

[ Reason ]

Bug #1029803: command-not-found in bullseye doesn't know the
non-free-firmware component and will fail during the $(apt update) run
after changing the APT sources lists.

[ Impact ]

Without the fix users have to figure out how to unstuck apt, probably
by uninstalling command-not-found.

[ Tests ]

I have manually upgraded several clean VM's while confirming the
problem and confirming the solution.

The autopkgtest of command-not-found is broken in bullseye, I have
cherry-picked the fix from the unstable branch.

[ Risks ]

The fix is trivial, I consider the risk low.

[ 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 ]

I added non-free-firmware to the list of known components. I
cherry-picked the fix for the autopkgtest.

I don't expect the fix to be controversial and have uploaded it to
bullseye.

[ Other ]

The maintainer approved the fix.

Paul

diff --git a/debian/changelog b/debian/changelog
index da6aa89..15f7177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+command-not-found (20.10.1-1+deb11u1) bullseye; urgency=medium
+
+  * creator.py: add new non-free-firmware component (Closes: #1029803)
+  * debian/tests: Add adduser dependency, fix test to not assume vim-tiny
+    matches for vim. (from bookworm branch)
+
+ -- Paul Gevers <elbrus@debian.org>  Wed, 22 Feb 2023 16:09:19 +0100
+
 command-not-found (20.10.1-1) unstable; urgency=medium
 
   * Trim trailing whitespace.
diff --git a/debian/patches/0001-creator.py-add-new-non-free-firmware-component.patch b/debian/patches/0001-creator.py-add-new-non-free-firmware-component.patch
new file mode 100644
index 0000000..ad4b3d8
--- /dev/null
+++ b/debian/patches/0001-creator.py-add-new-non-free-firmware-component.patch
@@ -0,0 +1,25 @@
+From 95e94853f4abff33f576e58ebeab795f6cb1a62e Mon Sep 17 00:00:00 2001
+From: Paul Gevers <elbrus@debian.org>
+Date: Sun, 19 Feb 2023 21:45:07 +0100
+Subject: [PATCH] creator.py: add new non-free-firmware component
+
+Closes: #1029803
+---
+ CommandNotFound/db/creator.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CommandNotFound/db/creator.py b/CommandNotFound/db/creator.py
+index 75d01f1..8f6ef70 100755
+--- a/CommandNotFound/db/creator.py
++++ b/CommandNotFound/db/creator.py
+@@ -20,6 +20,7 @@ component_priorities = {
+     'universe': 100,
+     'contrib': 80,
+     'restricted': 60,
++    'non-free-firmware': 50,
+     'non-free': 40,
+     'multiverse': 20,
+ }
+-- 
+2.39.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 28cdfac..a459c03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 bts.diff
 0003-cnf-update-db-Add-support-for-Contents-files.patch
+0001-creator.py-add-new-non-free-firmware-component.patch
diff --git a/debian/tests/control b/debian/tests/control
index 4062764..956933f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
 Tests: smoke
 Restrictions: needs-root
-Depends: command-not-found
+Depends: command-not-found, adduser
 
diff --git a/debian/tests/smoke b/debian/tests/smoke
index 4f0e5ae..7236ab2 100755
--- a/debian/tests/smoke
+++ b/debian/tests/smoke
@@ -10,7 +10,7 @@ apt-get update
 
 echo "Ensure we have results from c-n-f"
 /usr/lib/command-not-found --ignore-installed vim 2>&1 | grep vim
-/usr/lib/command-not-found --ignore-installed vim 2>&1 | grep vim-tiny
+/usr/lib/command-not-found --ignore-installed vim 2>&1 | grep "command '.*' from deb "
 
 
 echo "Add testuser"