systemd/backport-CVE-2023-26604-man-document-all-pager-variables-for-systemctl.patch
2023-03-14 14:36:24 +08:00

48 lines
1.9 KiB
Diff

From 3d58bfc01c9283eded77736990ea09b0ee4f6e23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 24 Nov 2019 13:59:32 +0100
Subject: [PATCH] man: document all pager variables for systemctl and systemd
In those two pages, we need to include individual entries with xi:include to
merge the list less-variables.xml with the other entries, which is obviously
error prone. All variables are supported in both tools so add them.
---
man/systemctl.xml | 2 ++
man/systemd.xml | 7 +++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/man/systemctl.xml b/man/systemctl.xml
index fb0ca46620..3d86f7dffa 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -2161,6 +2161,8 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
<xi:include href="less-variables.xml" xpointer="pager"/>
<xi:include href="less-variables.xml" xpointer="less"/>
<xi:include href="less-variables.xml" xpointer="lesscharset"/>
+ <xi:include href="less-variables.xml" xpointer="colors"/>
+ <xi:include href="less-variables.xml" xpointer="urlify"/>
</refsect1>
<refsect1>
diff --git a/man/systemd.xml b/man/systemd.xml
index 9b2d5ac280..bde79d56fd 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -669,8 +669,11 @@
script runlevel link farms.</para></listitem>
</varlistentry>
- <xi:include href="less-variables.xml" xpointer="colors" />
- <xi:include href="less-variables.xml" xpointer="urlify" />
+ <xi:include href="less-variables.xml" xpointer="pager"/>
+ <xi:include href="less-variables.xml" xpointer="less"/>
+ <xi:include href="less-variables.xml" xpointer="lesscharset"/>
+ <xi:include href="less-variables.xml" xpointer="colors"/>
+ <xi:include href="less-variables.xml" xpointer="urlify"/>
<varlistentry>
<term><varname>$LISTEN_PID</varname></term>
--
2.33.0