diff options
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 6 | ||||
| -rw-r--r-- | chapter03/patches.xml | 12 | ||||
| -rw-r--r-- | chapter06/bash.xml | 4 | ||||
| -rw-r--r-- | chapter06/readline.xml | 5 | ||||
| -rw-r--r-- | patches.ent | 8 |
6 files changed, 40 insertions, 5 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 6d107da82..b11b53c6d 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,8 +39,16 @@ <para>2014-04-18</para> <itemizedlist> <listitem> + <para>[bdubbs] - Added readline upstream patch. Fixes + <ulink url="&lfs-ticket-root;3532">#3532</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Added bash upstream patch. Fixes + <ulink url="&lfs-ticket-root;3531">#3531</ulink>.</para> + </listitem> + <listitem> <para>[bdubbs] - Added bc patch to address memory leaks. Fixes - <ulink url="&lfs-ticket-root;3540">#3536</ulink>.</para> + <ulink url="&lfs-ticket-root;3536">#3536</ulink>.</para> </listitem> </itemizedlist> </listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 736132801..e121a7ea1 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -233,6 +233,9 @@ <para>attr-&attr-version;</para> </listitem> <listitem> + <para>&bash-fixes-patch;</para> + </listitem> + <listitem> <para>&bc-memory-leak-patch;</para> </listitem> <listitem> @@ -251,6 +254,9 @@ <para>libcap-&libcap-version;</para> </listitem> <listitem> + <para>&readline-fixes-patch;</para> + </listitem> + <listitem> <para>systemd-&systemd-version;</para> </listitem> <listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 0c3c3f913..6d7c0751a 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -17,7 +17,7 @@ needed to build an LFS system:</para> <variablelist role="materials"> -<!-- + <varlistentry> <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term> <listitem> @@ -25,7 +25,7 @@ <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para> </listitem> </varlistentry> ---> + <varlistentry> <term>Bc Memory Leak Patch - <token>&bc-memory-leak-patch-size;</token>:</term> <listitem> @@ -75,6 +75,14 @@ </varlistentry> <varlistentry> + <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term> + <listitem> + <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para> + <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para> + </listitem> + </varlistentry> + + <varlistentry> <term>Systemd Compat Patch - <token>&systemd-compat-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&systemd-compat-patch;"/></para> diff --git a/chapter06/bash.xml b/chapter06/bash.xml index d19ea1a25..12f063c1b 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -39,12 +39,12 @@ <sect2 role="installation"> <title>Installation of Bash</title> -<!-- + <para>First, apply the following patch to fix various bugs that have been addressed upstream:</para> <screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> ---> + <para>Prepare Bash for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr \ diff --git a/chapter06/readline.xml b/chapter06/readline.xml index 5c0e3caf2..dcf5ee065 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -41,6 +41,11 @@ <sect2 role="installation"> <title>Installation of Readline</title> + <para>First install some patches to fix various bugs that have been + addressed upstream:</para> + +<screen><userinput remap="pre">patch -Np1 -i ../&readline-fixes-patch;</userinput></screen> + <para>Reinstalling Readline will cause the old libraries to be moved to <libraryname>.old. While this is normally not a problem, in some cases it can trigger a linking bug in <command>ldconfig</command>. This can be diff --git a/patches.ent b/patches.ent index 1790f68ba..9dddd6a60 100644 --- a/patches.ent +++ b/patches.ent @@ -2,6 +2,10 @@ <!-- Start of Common Patches --> +<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-1.patch"> +<!ENTITY bash-fixes-patch-md5 "749b4b520708300b64f8166ba2b1b4a0"> +<!ENTITY bash-fixes-patch-size "14 KB"> + <!ENTITY bc-memory-leak-patch "bc-&bc-version;-memory_leak-1.patch"> <!ENTITY bc-memory-leak-patch-md5 "877e81fba316fe487ec23501059d54b8"> <!ENTITY bc-memory-leak-patch-size "1.4 KB"> @@ -26,6 +30,10 @@ <!ENTITY perl-libc-patch-md5 "daf5c64fd7311e924966842680535f8f"> <!ENTITY perl-libc-patch-size "1.6 KB"> +<!ENTITY readline-fixes-patch "readline-6.3-upstream_fixes-1.patch"> +<!ENTITY readline-fixes-patch-md5 "bbee7fad08474328b807e6828c26a961"> +<!ENTITY readline-fixes-patch-size "3.1 KB"> + <!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch"> <!ENTITY sysvinit-consolidated-patch-md5 "0b7b5ea568a878fdcc4057b2bf36e5cb"> <!ENTITY sysvinit-consolidated-patch-size "3.9 KB"> |