From 01a8a15a965a2dec4679c1734df0a03370189d34 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 15 Apr 2023 17:17:52 +0800
Subject: [PATCH 1/4] libelf: Add libelf.so.1 symlink into contents

---
 chapter08/libelf.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chapter08/libelf.xml b/chapter08/libelf.xml
index dab277dc6..f01c30031 100644
--- a/chapter08/libelf.xml
+++ b/chapter08/libelf.xml
@@ -75,7 +75,8 @@ rm /usr/lib/libelf.a</userinput></screen>
 
       <seglistitem>
         <seg>
-          libelf.so (symlink) and libelf-&elfutils-version;.so
+          libelf.so (symlink), libelf.so.1 (symlink),
+          and libelf-&elfutils-version;.so
         </seg>
         <seg>
           /usr/include/elfutils

From eee6a98c703356dd0c2227e70cb10181d3979ce5 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 15 Apr 2023 20:48:00 +0800
Subject: [PATCH 2/4] dependencies: Extend iproute2 external dependencies

"make" outputs messages for lacking libtirpc, libbpf, and libmnl
support, so document them.
---
 appendices/dependencies.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 6387743a7..204ef4c78 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1514,9 +1514,11 @@
         <segtitle>&external;</segtitle>
         <seglistitem>
           <seg>
-            <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>
-            and
-            <ulink url="&blfs-book;postlfs/iptables.html">iptables</ulink>
+            <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
+            <ulink url="&blfs-book;postlfs/iptables.html">iptables</ulink>,
+            <ulink url="https://github.com/libbpf/libbpf">libbpf</ulink>,
+            <ulink url="&blfs-book;basicnet/libmnl.html">libmnl</ulink>, and
+            <ulink url="&blfs-book;basicnet/libtirpc.html">libtirpc</ulink>
           </seg>
         </seglistitem>
       </segmentedlist>

From fb58db34a7a400e35d1d287606b7b5c889a6e1c3 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sun, 16 Apr 2023 00:59:27 +0800
Subject: [PATCH 3/4] Revert "libelf: Add libelf.so.1 symlink into contents"

This reverts commit 01a8a15a965a2dec4679c1734df0a03370189d34.

We don't list the versioned SONAME symlink for any shared libraries.

TODO: should we remove libelf-0.189.so from the list as well?  It sounds
like "libz.so.1.2.13" which is not listed too.
---
 chapter08/libelf.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/chapter08/libelf.xml b/chapter08/libelf.xml
index f01c30031..dab277dc6 100644
--- a/chapter08/libelf.xml
+++ b/chapter08/libelf.xml
@@ -75,8 +75,7 @@ rm /usr/lib/libelf.a</userinput></screen>
 
       <seglistitem>
         <seg>
-          libelf.so (symlink), libelf.so.1 (symlink),
-          and libelf-&elfutils-version;.so
+          libelf.so (symlink) and libelf-&elfutils-version;.so
         </seg>
         <seg>
           /usr/include/elfutils

From 5a98711aa4b832a8f4ab38d648f1d807a1f34bca Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 15 Apr 2023 14:34:07 -0500
Subject: [PATCH 4/4] Be consistent with library contents.

---
 chapter08/libelf.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chapter08/libelf.xml b/chapter08/libelf.xml
index dab277dc6..23b66222a 100644
--- a/chapter08/libelf.xml
+++ b/chapter08/libelf.xml
@@ -75,7 +75,7 @@ rm /usr/lib/libelf.a</userinput></screen>
 
       <seglistitem>
         <seg>
-          libelf.so (symlink) and libelf-&elfutils-version;.so
+          libelf.so 
         </seg>
         <seg>
           /usr/include/elfutils
@@ -90,7 +90,7 @@ rm /usr/lib/libelf.a</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libelf">
-        <term><filename class="libraryfile">libelf</filename></term>
+        <term><filename class="libraryfile">libelf.so</filename></term>
         <listitem>
           <para>Contains API functions to handle ELF object files</para>
           <indexterm zone="ch-system-libelf libelf">