Both patches are now upstream. Here's an updated debdiff.

diff -Nru manpages-5.10/debian/changelog manpages-5.10/debian/changelog
--- manpages-5.10/debian/changelog      2020-12-22 06:25:08.000000000 -0700
+++ manpages-5.10/debian/changelog      2021-06-10 13:13:28.000000000 -0600
@@ -1,3 +1,10 @@
+manpages (5.10-2) UNRELEASED; urgency=medium
+
+  * kernel_lockdown.7: Remove description of unsupported lockdown lift
+    mechanism via SysRq. (Closes: #989580) (LP: #1931171)
+
+ -- dann frazier <da...@debian.org>  Thu, 10 Jun 2021 13:13:28 -0600
+
 manpages (5.10-1) unstable; urgency=medium
 
   * New upstream version 5.10
diff -Nru manpages-5.10/debian/patches/0014-kernel_lockdown.7.patch 
manpages-5.10/debian/patches/0014-kernel_lockdown.7.patch
--- manpages-5.10/debian/patches/0014-kernel_lockdown.7.patch   1969-12-31 
17:00:00.000000000 -0700
+++ manpages-5.10/debian/patches/0014-kernel_lockdown.7.patch   2021-06-10 
13:07:18.000000000 -0600
@@ -0,0 +1,47 @@
+From a9896777774d441617fe8fb9570dfb395867ff42 Mon Sep 17 00:00:00 2001
+From: dann frazier <dann.fraz...@canonical.com>
+Date: Thu, 27 May 2021 09:13:42 +0200
+Subject: [PATCH 1/2] kernel_lockdown.7: Remove description of lifting via
+ SysRq (not upstream)
+
+The patch that implemented lockdown lifting via SysRq ended up
+getting dropped[*] before the feature was merged upstream. Having
+the feature documented but unsupported has caused some confusion
+for our users.
+
+[*] 
http://archive.lwn.net:8080/linux-kernel/cacdnjuuxam06tcnczoa6nwxhnmqueqqm3ma8btukzpucs+d...@mail.gmail.com/
+
+Signed-off-by: dann frazier <dann.fraz...@canonical.com>
+Cc: Heinrich Schuchardt <xypron.g...@gmx.de>
+Cc: David Howells <dhowe...@redhat.com>
+Cc: Pedro Principeza <pedro.princip...@canonical.com>
+Cc: Randy Dunlap <rdun...@infradead.org>
+Cc: Kyle McMartin <k...@redhat.com>
+Cc: Matthew Garrett <mj...@google.com>
+Signed-off-by: Alejandro Colomar <alx.manpa...@gmail.com>
+Signed-off-by: Michael Kerrisk <mtk.manpa...@gmail.com>
+
+Bug-Debian: https://bugs.debian.org/989580
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1931171
+Origin: 
https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/?id=a9896777774d441617fe8fb9570dfb395867ff42
+Last-Update: 2021-06-10
+
+diff --git a/man7/kernel_lockdown.7 b/man7/kernel_lockdown.7
+index 30863de62..b0442b3b6 100644
+--- a/man7/kernel_lockdown.7
++++ b/man7/kernel_lockdown.7
+@@ -33,11 +33,6 @@ where X indicates the process name and Y indicates what is 
restricted.
+ .PP
+ On an EFI-enabled x86 or arm64 machine, lockdown will be automatically enabled
+ if the system boots in EFI Secure Boot mode.
+-.PP
+-If the kernel is appropriately configured, lockdown may be lifted by typing
+-the appropriate sequence on a directly attached physical keyboard.
+-For x86 machines, this is
+-.IR SysRq+x .
+ .\"
+ .SS Coverage
+ When lockdown is in effect, a number of features are disabled or have their
+-- 
+2.32.0
+
diff -Nru manpages-5.10/debian/patches/0015-kernel_lockdown.7.patch 
manpages-5.10/debian/patches/0015-kernel_lockdown.7.patch
--- manpages-5.10/debian/patches/0015-kernel_lockdown.7.patch   1969-12-31 
17:00:00.000000000 -0700
+++ manpages-5.10/debian/patches/0015-kernel_lockdown.7.patch   2021-06-10 
13:09:09.000000000 -0600
@@ -0,0 +1,35 @@
+From 9d39058523043353681a8daa0c59531118ddf06f Mon Sep 17 00:00:00 2001
+From: dann frazier <dann.fraz...@canonical.com>
+Date: Mon, 7 Jun 2021 16:19:43 -0600
+Subject: [PATCH 2/2] kernel_lockdown.7: Remove additional text alluding to
+ lifting via SysRq
+
+My previous patch intended to drop the docs for the lockdown lift
+SysRq, but it missed this other section that refers to lifting it
+via a keyboard - an allusion to that same SysRq.
+
+Signed-off-by: dann frazier <dann.fraz...@canonical.com>
+Signed-off-by: Michael Kerrisk <mtk.manpa...@gmail.com>
+
+Bug-Debian: https://bugs.debian.org/989580
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1931171
+Origin: 
https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/?id=9d39058523043353681a8daa0c59531118ddf06f
+Last-Update: 2021-06-10
+
+diff --git a/man7/kernel_lockdown.7 b/man7/kernel_lockdown.7
+index b0442b3b6..0c0a9500d 100644
+--- a/man7/kernel_lockdown.7
++++ b/man7/kernel_lockdown.7
+@@ -19,9 +19,6 @@ modification of the kernel image and to prevent access to 
security and
+ cryptographic data located in kernel memory, whilst still permitting driver
+ modules to be loaded.
+ .PP
+-Lockdown is typically enabled during boot and may be terminated, if 
configured,
+-by typing a special key combination on a directly attached physical keyboard.
+-.PP
+ If a prohibited or restricted feature is accessed or used, the kernel will 
emit
+ a message that looks like:
+ .PP
+-- 
+2.32.0
+
diff -Nru manpages-5.10/debian/patches/series 
manpages-5.10/debian/patches/series
--- manpages-5.10/debian/patches/series 2020-12-22 06:18:53.000000000 -0700
+++ manpages-5.10/debian/patches/series 2021-06-10 13:05:50.000000000 -0600
@@ -10,3 +10,5 @@
 0010-tzfile.5.patch
 0011-man.7.patch
 0013-rtnetlink.7.patch
+0014-kernel_lockdown.7.patch
+0015-kernel_lockdown.7.patch

Reply via email to