From 8a16c6b4ec7f995be6657bb109835e6559c2d535 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Tue, 13 Sep 2022 09:34:50 +0200
Subject: [PATCH 1/2] Restore gawk to working version

Revert an inadvertent commit, sorry
---
 packages.ent | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages.ent b/packages.ent
index 7f1f5bd3d..ce13ec456 100644
--- a/packages.ent
+++ b/packages.ent
@@ -207,10 +207,10 @@
 <!ENTITY flex-fin-du "33 MB">
 <!ENTITY flex-fin-sbu "0.4 SBU">
 
-<!ENTITY gawk-version "5.2.0">
-<!ENTITY gawk-size "3,306 KB">
+<!ENTITY gawk-version "5.1.1">
+<!ENTITY gawk-size "3,075 KB">
 <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz">
-<!ENTITY gawk-md5 "2f724d925873fc82f5e7b1d605ba9a42">
+<!ENTITY gawk-md5 "83650aa943ff2fd519b2abedf8506ace">
 <!ENTITY gawk-home "&gnu-software;gawk/">
 <!ENTITY gawk-tmp-du "45 MB">
 <!ENTITY gawk-tmp-sbu "0.2 SBU">

From fb5ad925884a5740da2f9f525570966d11f61054 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Tue, 13 Sep 2022 17:51:22 +0800
Subject: [PATCH 2/2] gcc: document that libssp is normally unused

We are enabling default SSP now, so if someone runs "ldd /usr/bin/true"
and see libssp is not used he/she may be puzzled.
---
 chapter08/gcc.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index 7a06cf461..65f502dde 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -589,7 +589,8 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
         <term><filename class="libraryfile">libssp</filename></term>
         <listitem>
           <para>Contains routines supporting GCC's stack-smashing protection
-          functionality</para>
+          functionality.  Normally it's unused because glibc also provides
+          those routines</para>
           <indexterm zone="ch-system-gcc libssp">
             <primary sortas="c-libssp">libssp</primary>
           </indexterm>