# Sent upstream: <https://lore.kernel.org/selinux/260cd39c55ff2d13f5ac916b508f023bedecfce9.1692025627.git.mirai@makinata.eu/>

From 260cd39c55ff2d13f5ac916b508f023bedecfce9 Mon Sep 17 00:00:00 2001
Message-Id: <260cd39c55ff2d13f5ac916b508f023bedecfce9.1692827278.git.mirai@makinata.eu>
From: Bruno Victal <mirai@makinata.eu>
Date: Mon, 14 Aug 2023 15:51:05 +0100
Subject: [PATCH] secilc: Use versioned DocBook public identifier.

Fix xml validation issues that often crop up since the XML catalogs
for DocBook often only contain versioned public identifiers.

Signed-off-by: Bruno Victal <mirai@makinata.eu>
---
 secilc/secil2conf.8.xml | 2 +-
 secilc/secil2tree.8.xml | 2 +-
 secilc/secilc.8.xml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/secilc/secil2conf.8.xml b/secilc/secil2conf.8.xml
index 33646f97..330b6a07 100644
--- a/secilc/secil2conf.8.xml
+++ b/secilc/secil2conf.8.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML//EN"
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <refentry>
diff --git a/secilc/secil2tree.8.xml b/secilc/secil2tree.8.xml
index e95a8947..d7bb177e 100644
--- a/secilc/secil2tree.8.xml
+++ b/secilc/secil2tree.8.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML//EN"
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <refentry>
diff --git a/secilc/secilc.8.xml b/secilc/secilc.8.xml
index e9a121e2..5c0680a8 100644
--- a/secilc/secilc.8.xml
+++ b/secilc/secilc.8.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML//EN"
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <refentry>

base-commit: f6dc6acfa00707ce25c6357169111937f12512dd
-- 
2.40.1

3e2711f2d5c7ca894da555d07d44388cf75'>root</a>/<a href='/guix/log/gnu?id=2bc733e2711f2d5c7ca894da555d07d44388cf75'>gnu</a>/<a href='/guix/log/gnu/tests?id=2bc733e2711f2d5c7ca894da555d07d44388cf75'>tests</a>/<a href='/guix/log/gnu/tests/reconfigure.scm?id=2bc733e2711f2d5c7ca894da555d07d44388cf75'>reconfigure.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/tests/reconfigure.scm?id=2bc733e2711f2d5c7ca894da555d07d44388cf75&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-04-26 19:41:56 +0100'>2020-04-26</span></td><td><a href='/guix/commit/gnu/tests/reconfigure.scm?id=53aa66c3dff8a59b5c596691d9126db6a2327983'>reconfigure: Don't call build-derivations for upgrade-services test</a><span class='msg-avail'>...<span class='msg-tooltip'>This commit adjusts the upgrade-services system test to not build anything
when computing the derivation for the system test.  I came across this when
looking at issues computing the system test derivations to store in the Guix
Data Service.

* gnu/tests/reconfigure.scm (run-upgrade-services-test): Remove the use of,
and definition for ensure-service-file.
</span></span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2020-02-09 23:16:45 +0100'>2020-02-09</span></td><td><a href='/guix/commit/gnu/tests/reconfigure.scm?id=e81344428726f3dae5d2a2e7bb296f46fcde6cc5'>Update e-mail address for Jakob L. Kreuze.</a><span class='msg-avail'>...<span class='msg-tooltip'>As requested here:
&lt;https://lists.gnu.org/archive/html/guix-devel/2020-02/msg00128.html&gt;.

* .mailmap: Add an entry for Jakob.
* gnu/machine.scm, gnu/machine/digital-ocean.scm, gnu/machine/ssh.scm,
gnu/packages/admin.scm, gnu/packages/i2p.scm, gnu/packages/music.scm,
gnu/packages/web.scm, gnu/tests/reconfigure.scm, guix/scripts/deploy.scm,
guix/scripts/system/reconfigure.scm: Update their e-mail address.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-08-07 15:27:09 -0400'>2019-08-07</span></td><td><a href='/guix/commit/gnu/tests/reconfigure.scm?id=ec12235ce207821027971c9d5f47b660b29f5ed5'>reconfigure: Improve tests for system activation.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests/reconfigure.scm (run-switch-to-system-test): Assert that
'/run/current-system' points to the activated system, and that new user
accounts specified in the operating system declaration are created.
</span></span></td><td>Jakob L. Kreuze</td></tr>
<tr><td><span title='2019-07-26 19:19:49 +0200'>2019-07-26</span></td><td><a href='/guix/commit/gnu/tests/reconfigure.scm?id=d23a00b599be56694065bd274184b9289fb8b85c'>tests: Add reconfigure system test.</a><span class='msg-avail'>...<span class='msg-tooltip'>[[PGP Signed Part:No public key for F506FD169D8FD95A created at 2019-07-24T18:35:10+0200 using RSA]]
* gnu/tests/reconfigure.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Jakob L. Kreuze</td></tr>