From 888103db3c656fea2352b29c0ea55c62da150613 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sat, 31 Dec 2022 11:14:04 -0600 Subject: [PATCH 1/3] PAckage updates. Update to iana-etc-20221220. Update to sysvinit-3.06. Update to mpc-1.3.1. Update to meson-1.0.0. Update to man-pages-6.02. Update to linux-6.1.1. Update to file-5.44. Update to bc-6.2.1. --- chapter01/changelog.xml | 38 ++++++++++++++++++++++++++++++++ packages.ent | 48 ++++++++++++++++++++--------------------- patches.ent | 4 ++-- 3 files changed, 64 insertions(+), 26 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index b3f9f5c5a..e65ee12b7 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,44 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2022-12-31 + + + [bdubbs] - Update to iana-etc-20221220. Addresses + #5006. + + + [bdubbs] - Update to sysvinit-3.06. Fixes + #5186. + + + [bdubbs] - Update to mpc-1.3.1. Fixes + #5185. + + + [bdubbs] - Update to meson-1.0.0. Fixes + #5190. + + + [bdubbs] - Update to man-pages-6.02. Fixes + #5188. + + + [bdubbs] - Update to linux-6.1.1. Fixes + #5179. + + + [bdubbs] - Update to file-5.44. Fixes + #5191. + + + [bdubbs] - Update to bc-6.2.1. Fixes + #5189. + + + + 2022-12-15 diff --git a/packages.ent b/packages.ent index e4dca15f2..79584c097 100644 --- a/packages.ent +++ b/packages.ent @@ -58,10 +58,10 @@ - - + + - + @@ -179,10 +179,10 @@ - - + + - + @@ -317,10 +317,10 @@ - - + + - + @@ -423,13 +423,13 @@ - - + + - + - + - - + + - - 2022-12-28 - - - [renodr] - Patch systemd against CVE-2022-4415. Fixes - #5187. - - - - 2022-12-31 @@ -87,6 +77,16 @@ + + 2022-12-28 + + + [renodr] - Patch systemd against CVE-2022-4415. Fixes + #5187. + + + + 2022-12-15 From aea43840d87afb7bcc702d4c407e5d4cd1637d66 Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Sun, 1 Jan 2023 09:34:12 +0100 Subject: [PATCH 3/3] Remove obsolete sed no longer required in mpc-1.3.1 --- chapter01/changelog.xml | 9 +++++++++ chapter08/mpc.xml | 12 ------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 4c82512f5..196c32fe5 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,15 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2023-01-01 + + + [thomas] - Remove an obsolete sed from mpc. + + + + 2022-12-31 diff --git a/chapter08/mpc.xml b/chapter08/mpc.xml index 5bcfd0292..ad46b7e43 100644 --- a/chapter08/mpc.xml +++ b/chapter08/mpc.xml @@ -42,18 +42,6 @@ Installation of MPC - First, make a fix identified upstream: - -sed -i '273{ h; d; }; 274,286 { H; d; }; 287 G' src/mpc.h - - - This sed is a little complex and needs some explanation. It holds - the line 273 in a buffer, adds lines 274-286 to it. It then writes the - buffer out after line 287 is read. The result is that the line 287 is - moved upwards from an incorrect location to its correct location in an - #ifdef block. - - Prepare MPC for compilation: ./configure --prefix=/usr \