From e3f47a2f7a30ff5a720181dca2a6937f7b58d489 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sun, 9 Jun 2024 19:47:30 +0800
Subject: [PATCH 1/3] tcl: Get rid of rpath

---
 chapter08/tcl.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/chapter08/tcl.xml b/chapter08/tcl.xml
index fd920e2c9..bfb23c3a8 100644
--- a/chapter08/tcl.xml
+++ b/chapter08/tcl.xml
@@ -55,7 +55,23 @@
 <screen><userinput remap="configure">SRCDIR=$(pwd)
 cd unix
 ./configure --prefix=/usr           \
-            --mandir=/usr/share/man</userinput></screen>
+            --mandir=/usr/share/man \
+            --disable-rpath</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the new configure parameters:</title>
+
+      <varlistentry>
+        <term><parameter>--disable-rpath</parameter></term>
+        <listitem>
+          <para>This parameter prevents hard coding library search paths
+          (rpath) into the binary executable files and shared libraries.
+          This package does not need rpath for an installation into the
+          standard location, and rpath may sometimes cause unwanted effects
+          or even security issues.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
     <para>Build the package:</para>
 

From 4ef406e2fa454cf74ce0e5cd7aba0ae67f46a72b Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sun, 9 Jun 2024 19:51:57 +0800
Subject: [PATCH 2/3] expect: Get rid of rpath

---
 chapter08/expect.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chapter08/expect.xml b/chapter08/expect.xml
index 5b5047cda..d7c6341f4 100644
--- a/chapter08/expect.xml
+++ b/chapter08/expect.xml
@@ -76,6 +76,7 @@
 <screen><userinput remap="configure">./configure --prefix=/usr           \
             --with-tcl=/usr/lib     \
             --enable-shared         \
+            --disable-rpath         \
             --mandir=/usr/share/man \
             --with-tclinclude=/usr/include</userinput></screen>
 

From 2ef9beaf92b58f0812db1e9c30f709ecc8e7e501 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sun, 9 Jun 2024 20:03:35 +0800
Subject: [PATCH 3/3] readline: Get rid of rpath

---
 chapter08/readline.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/chapter08/readline.xml b/chapter08/readline.xml
index 1fb7474c1..d1c385bbc 100644
--- a/chapter08/readline.xml
+++ b/chapter08/readline.xml
@@ -49,6 +49,13 @@
 <screen><userinput remap="pre">sed -i '/MV.*old/d' Makefile.in
 sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
 
+    <para>Prevent hard coding library search paths (rpath) into
+    the shared libraries.  This package does not need rpath for an
+    installation into the standard location, and rpath may sometimes cause
+    unwanted effects or even security issues:</para>
+
+<screen><userinput>sed -i 's/-Wl,-rpath,[^ ]*//' support/shobj-conf</userinput></screen>
+
     <para>Now fix a problem identified upstream:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>