From 74f9697fdd649307ecd89ae99a7189e5fc387583 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 27 Feb 2024 17:43:47 +0800 Subject: [PATCH 1/6] changelog: Mark procps-4.0.4 as a security fix It contains a fix for CVE-2023-4016, rated low and only affecting 32-bit systems. --- chapter01/changelog.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 43423619c..72ef95ea8 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -697,7 +697,8 @@ #5330. - [bdubbs] - Update to procps-ng-4.0.4. Fixes + [bdubbs] - Update to procps-ng-4.0.4 (security fix + for 32-bit systems). Fixes #5335. From 4e486a2efc09142cc3b56d34e8254b729651e062 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 20 Feb 2024 14:54:50 -0600 Subject: [PATCH 2/6] Typo (cherry picked from commit 0c06e1e04885602e3eda558edb6ea1b6885cf277) --- chapter10/kernel.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml index cf0b30f35..6eafeaf27 100644 --- a/chapter10/kernel.xml +++ b/chapter10/kernel.xml @@ -87,7 +87,7 @@ un-tarring. There are several ways to configure the kernel options. Usually, - This is done through a menu-driven interface, for example: + this is done through a menu-driven interface, for example: make menuconfig From 283f7119a0d5cc3c433159b3dbcdb8d9ab5c3e99 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sun, 18 Feb 2024 13:44:30 -0600 Subject: [PATCH 3/6] Typos (cherry picked from commit a2808be815801c0b3bb2d7c1919b1623bb19c12e) --- appendices/dependencies.xml | 2 +- chapter08/glibc.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index d3fd94707..9d92de448 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -2480,7 +2480,7 @@ &testsuites; - Iana-Etc, Less. and Procps-ng + Iana-Etc, Less, and Procps-ng diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index 49eeceb1c..39923c03b 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -535,7 +535,7 @@ unset ZONEINFO zic ... -p ... This creates the posixrules file. We use - New York because POSIX requires the daylight savings time rules + New York because POSIX requires the daylight saving time rules to be in accordance with US rules. From 23f436750e4bf87e802b9b6015197db4ec2561cc Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 27 Feb 2024 20:53:38 +0800 Subject: [PATCH 4/6] procps: Add "-k" for make check and document two additional failures --- chapter08/procps.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/chapter08/procps.xml b/chapter08/procps.xml index 9b014face..3f229c713 100644 --- a/chapter08/procps.xml +++ b/chapter08/procps.xml @@ -72,12 +72,20 @@ To run the test suite, run: -make check +make -k check One test named ps with output flag bsdtime,cputime,etime,etimes is known to fail if the host kernel is not built with - CONFIG_BSD_PROCESS_ACCT enabled. + CONFIG_BSD_PROCESS_ACCT enabled. + + Two tests named + pmap X with unreachable process and + pmap XX with unreachable process are known to + fail occasionally. Install the package: From cf6fe33ceed1b98cda11a90d2e3a8a45ed47dc92 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 27 Feb 2024 12:05:21 -0600 Subject: [PATCH 5/6] Fix some external URLs --- chapter09/networkd.xml | 10 +++++----- packages.ent | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chapter09/networkd.xml b/chapter09/networkd.xml index 6c2935de1..9d6f9d549 100644 --- a/chapter09/networkd.xml +++ b/chapter09/networkd.xml @@ -50,11 +50,11 @@ .netdev and .network files. For detailed descriptions and example contents of these configuration files, consult - the systemd-link(5), - systemd-netdev(5), - and systemd-network(5) manual - pages. + the + systemd.link.5, + systemd.netdev.5, and + systemd.network.5 + manual pages. Network Device Naming diff --git a/packages.ent b/packages.ent index b085c0c5e..a17fd6871 100644 --- a/packages.ent +++ b/packages.ent @@ -583,7 +583,7 @@ - + From 95753824898bfad50cb0c4d0e99a5a4a63d39154 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Tue, 27 Feb 2024 12:29:43 -0600 Subject: [PATCH 6/6] Minor text changes --- chapter09/networkd.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chapter09/networkd.xml b/chapter09/networkd.xml index 9d6f9d549..eb348ec1e 100644 --- a/chapter09/networkd.xml +++ b/chapter09/networkd.xml @@ -51,9 +51,9 @@ .network files. For detailed descriptions and example contents of these configuration files, consult the - systemd.link.5, - systemd.netdev.5, and - systemd.network.5 + systemd.link(5), + systemd.netdev(5), and + systemd.network(5) manual pages.