Changeset abc22f0

Timestamp:

May 4, 2017, 4:42:29 PM (8 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

master, systemd

Children:

e161321

Parents:

e202e3d

Message:

Update Readline to 7.0 and add the two seds for a possible linking bug with ldconfig when reinstalling.

Files:

• BOOK/final-system/common/readline.xml (modified) (1 diff)
• BOOK/final-system/multilib/readline-64bit.xml (modified) (1 diff)
• BOOK/final-system/multilib/readline-n32.xml (modified) (1 diff)
• BOOK/final-system/multilib/readline.xml (modified) (1 diff)
• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/packages.ent (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/readline-6.3-branch_update-4.patch (deleted)
• patches/readline-7.0-branch_update-1.patch (added)

BOOK/final-system/common/readline.xml

@@ -30 +30 @@
 
 <screen os="p2"><userinput>patch -Np1 -i ../&readline-branch_update-patch;</userinput></screen>
+
+<para os="s1">Reinstalling Readline moves the old libraries to
+    &lt;libraryname&gt; and a linking bug may occur in 
+    <command>ldconfig</command>. Prevent this with the following seds:</para>
+
+<screen os="s2"><userinput>sed -i '/MV.*old/d' Makefile.in
+sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
 
     <para os="a">Prepare Readline for compilation:</para>

BOOK/final-system/multilib/readline-64bit.xml

@@ -29 +29 @@
     href="readline.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/readline-n32.xml

@@ -30 +30 @@
     href="readline.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/readline.xml

@@ -30 +30 @@
     href="../common/readline.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/introduction/common/changelog.xml

@@ -37 +37 @@
 -->
     <listitem>
+      <para>04 May 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Upgrade Readline to 7.0. Fixes
+          ticket <ulink url="&clfs-ticket-root;1105">#1086.</ulink></para> 
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>03 May 2017</para>
       <itemizedlist>

BOOK/packages.ent

@@ -412 +412 @@
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net">
 
-<!ENTITY readline-version "6.3">
-<!ENTITY readline-size "2,469 KB">
+<!ENTITY readline-version "7.0">
+<!ENTITY readline-size "2,910 KB">
 <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
-<!ENTITY readline-md5 "33c8fb279e981274f485fd91da77e94a">
+<!ENTITY readline-md5 "205b03a87fc83dab653b628c59b9fc91">
 <!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
 

BOOK/patches.ent

@@ -64 +64 @@
 -->
 
-<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-4.patch">
-<!ENTITY readline-branch_update-patch-md5 "bb8d37fd00abc74a81563ebfcf64af4c">
-<!ENTITY readline-branch_update-patch-size "5.733 KB">
+<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-1.patch">
+<!ENTITY readline-branch_update-patch-md5 "8b429202ce52362ae927f36a48461c23">
+<!ENTITY readline-branch_update-patch-size "3.049 KB">
 
 <!ENTITY sysvinit-tools_updates-patch "sysvinit-&sysvinit-version;-tools_updates-1.patch">