Custom Search
|
commit: r3259 - in /trunk: BOOK/ BOOK/final-system/common/ BOOK/final-system/multilib/ BOOK/introduction/common/ BOOK/materials/common/ patches/
Date: December 12, 2006 Author: jim
Date: Tue Dec 12 23:09:26 2006
New Revision: 3259
Log:
Added Readline Upstream Patch
Added:
trunk/patches/readline-5.2-fixes-1.patch
Modified:
trunk/BOOK/final-system/common/readline.xml
trunk/BOOK/final-system/multilib/readline-64bit.xml
trunk/BOOK/final-system/multilib/readline-n32.xml
trunk/BOOK/final-system/multilib/readline.xml
trunk/BOOK/introduction/common/changelog.xml
trunk/BOOK/materials/common/patches.xml
trunk/BOOK/patches.ent
Modified: trunk/BOOK/final-system/common/readline.xml
==============================================================================
--- trunk/BOOK/final-system/common/readline.xml (original)
+++ trunk/BOOK/final-system/common/readline.xml Tue Dec 12 23:09:26 2006
@@ -25,15 +25,20 @@
<sect2 role="installation">
<title>Installation of Readline</title>
- <para os="c">Prepare Readline for compilation:</para>
+ <para os="p1">The following patch contains updates from the maintainer. The
+ maintainer of Readline only releases these patches to fix serious
issues:</para>
-<screen os="d"><userinput>./configure --prefix=/usr
--libdir=/lib</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i
../&readline-fixes-patch;</userinput></screen>
- <para os="e">Compile the package:</para>
+ <para os="a">Prepare Readline for compilation:</para>
-<screen os="f"><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr
--libdir=/lib</userinput></screen>
- <variablelist os="g">
+ <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
+
+ <variablelist os="e">
<title>The meaning of the make option:</title>
<varlistentry>
@@ -45,26 +50,26 @@
</varlistentry>
</variablelist>
- <para os="h">This package does not come with a test suite.</para>
+ <para os="f">This package does not come with a test suite.</para>
- <para os="i">Install the package:</para>
+ <para os="g">Install the package:</para>
-<screen os="j"><userinput>make install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
- <para os="k">Give Readline's dynamic libraries more appropriate
+ <para os="i">Give Readline's dynamic libraries more appropriate
permissions:</para>
-<screen os="l"><userinput>chmod -v 755
/lib/lib{readline,history}.so*</userinput></screen>
+<screen os="j"><userinput>chmod -v 755
/lib/lib{readline,history}.so*</userinput></screen>
- <para os="m">Now move the static libraries to a more appropriate
location:</para>
+ <para os="k">Now move the static libraries to a more appropriate
location:</para>
-<screen os="n"><userinput>mv -v /lib/lib{readline,history}.a
/usr/lib</userinput></screen>
+<screen os="l"><userinput>mv -v /lib/lib{readline,history}.a
/usr/lib</userinput></screen>
- <para os="o">Next, remove the <filename class="extension">.so</filename>
+ <para os="m">Next, remove the <filename class="extension">.so</filename>
files in <filename class="directory">/lib</filename> and relink them into
<filename class="directory">/usr/lib</filename>.</para>
-<screen os="p"><userinput>rm -v /lib/lib{readline,history}.so
+<screen os="n"><userinput>rm -v /lib/lib{readline,history}.so
ln -svf ../../lib/libreadline.so.5 /usr/lib/libreadline.so
ln -svf ../../lib/libhistory.so.5 /usr/lib/libhistory.so</userinput></screen>
Modified: trunk/BOOK/final-system/multilib/readline-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/readline-64bit.xml (original)
+++ trunk/BOOK/final-system/multilib/readline-64bit.xml Tue Dec 12 23:09:26 2006
@@ -23,10 +23,26 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="readline.xml"
+ xpointer="xpointer(//*[@os='p1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="readline.xml"
+ xpointer="xpointer(//*[@os='p2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="readline.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+ ./configure --prefix=/usr --libdir=/lib64</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="readline.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="d"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
- ./configure --prefix=/usr --libdir=/lib64</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="readline.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="readline.xml"
@@ -48,27 +64,19 @@
href="readline.xml"
xpointer="xpointer(//*[@os='i'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="readline.xml"
- xpointer="xpointer(//*[@os='j'])"/>
+<screen os="j"><userinput>chmod -v 755
/lib64/lib{readline,history}.so*</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="readline.xml"
xpointer="xpointer(//*[@os='k'])"/>
-<screen os="l"><userinput>chmod -v 755
/lib64/lib{readline,history}.so*</userinput></screen>
+<screen os="l"><userinput>mv -v /lib64/lib{readline,history}.a
/usr/lib64</userinput></screen>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="readline.xml"
- xpointer="xpointer(//*[@os='m'])"/>
-
-<screen os="n"><userinput>mv -v /lib64/lib{readline,history}.a
/usr/lib64</userinput></screen>
-
- <para os="o">Next, remove the <filename class="extension">.so</filename>
+ <para os="m">Next, remove the <filename class="extension">.so</filename>
files in <filename class="directory">/lib64</filename> and relink them into
<filename class="directory">/usr/lib64</filename>.</para>
-<screen os="p"><userinput>rm -v /lib64/lib{readline,history}.so
+<screen os="n"><userinput>rm -v /lib64/lib{readline,history}.so
ln -svf ../../lib64/libreadline.so.5 /usr/lib64/libreadline.so
ln -svf ../../lib64/libhistory.so.5
/usr/lib64/libhistory.so</userinput></screen>
Modified: trunk/BOOK/final-system/multilib/readline-n32.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/readline-n32.xml (original)
+++ trunk/BOOK/final-system/multilib/readline-n32.xml Tue Dec 12 23:09:26 2006
@@ -24,14 +24,34 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="readline.xml"
- xpointer="xpointer(//*[@os='c'])"/>
+ xpointer="xpointer(//*[@os='p1'])"/>
-<screen os="d"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="readline.xml"
+ xpointer="xpointer(//*[@os='p2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="readline.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
./configure --prefix=/usr --libdir=/lib32</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="readline.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="readline.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="readline.xml"
xpointer="xpointer(//*[@os='e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="readline.xml"
+ xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="readline.xml"
@@ -45,28 +65,19 @@
href="readline.xml"
xpointer="xpointer(//*[@os='i'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="readline.xml"
- xpointer="xpointer(//*[@os='j'])"/>
+<screen os="j"><userinput>chmod -v 755
/lib32/lib{readline,history}.so*</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="readline.xml"
xpointer="xpointer(//*[@os='k'])"/>
+<screen os="l"><userinput>mv -v /lib32/lib{readline,history}.a
/usr/lib32</userinput></screen>
-<screen os="k"><userinput>chmod -v 755
/lib32/lib{readline,history}.so*</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="readline.xml"
- xpointer="xpointer(//*[@os='m'])"/>
-
-<screen os="m"><userinput>mv -v /lib32/lib{readline,history}.a
/usr/lib32</userinput></screen>
-
- <para os="n">Next, remove the <filename class="extension">.so</filename>
+ <para os="m">Next, remove the <filename class="extension">.so</filename>
files in <filename class="directory">/lib32</filename> and relink them into
<filename class="directory">/usr/lib32</filename>.</para>
-<screen os="o"><userinput>rm -v /lib32/lib{readline,history}.so
+<screen os="n"><userinput>rm -v /lib32/lib{readline,history}.so
ln -svf ../../lib32/libreadline.so.5 /usr/lib32/libreadline.so
ln -svf ../../lib32/libhistory.so.5
/usr/lib32/libhistory.so</userinput></screen>
Modified: trunk/BOOK/final-system/multilib/readline.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/readline.xml (original)
+++ trunk/BOOK/final-system/multilib/readline.xml Tue Dec 12 23:09:26 2006
@@ -24,10 +24,26 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../common/readline.xml"
+ xpointer="xpointer(//*[@os='p1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/readline.xml"
+ xpointer="xpointer(//*[@os='p2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/readline.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
+ ./configure --prefix=/usr --libdir=/lib</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/readline.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="d"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
- ./configure --prefix=/usr --libdir=/lib</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/readline.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../common/readline.xml"
@@ -68,14 +84,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../common/readline.xml"
xpointer="xpointer(//*[@os='n'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/readline.xml"
- xpointer="xpointer(//*[@os='o'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/readline.xml"
- xpointer="xpointer(//*[@os='p'])"/>
</sect2>
<sect2 role="content">
Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Tue Dec 12 23:09:26 2006
@@ -45,6 +45,9 @@
<listitem>
<para>[jim] - Updated to Linux Headers 2.6.19.1-12122006.</para>
</listitem>
+ <listitem>
+ <para>[jim] - Added Readline Upstream Patch.</para>
+ </listitem>
</itemizedlist>
</listitem>
Modified: trunk/BOOK/materials/common/patches.xml
==============================================================================
--- trunk/BOOK/materials/common/patches.xml (original)
+++ trunk/BOOK/materials/common/patches.xml Tue Dec 12 23:09:26 2006
@@ -208,6 +208,15 @@
</varlistentry>
<varlistentry>
+ <term>Readline Fixes - <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>Shadow Useradd Patch -
<token>&shadow-useradd_fix-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
Modified: trunk/BOOK/patches.ent
==============================================================================
--- trunk/BOOK/patches.ent (original)
+++ trunk/BOOK/patches.ent Tue Dec 12 23:09:26 2006
@@ -88,9 +88,9 @@
<!ENTITY perl-libc-patch-md5 "3bf8aef1fb6eb6110405e699e4141f99">
<!ENTITY perl-libc-patch-size "4 KB">
-<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-3.patch">
-<!ENTITY readline-fixes-patch-md5 "e30963cd5c6f6a11a23344af36cfa38c">
-<!ENTITY readline-fixes-patch-size "2.1 KB">
+<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-1.patch">
+<!ENTITY readline-fixes-patch-md5 "c3483d9d4e44614a740e190d25100cdf">
+<!ENTITY readline-fixes-patch-size "4 KB">
<!ENTITY shadow-useradd_fix-patch
"shadow-&shadow-version;-useradd_fix-1.patch">
<!ENTITY shadow-useradd_fix-patch-md5 "272eb8ef4b9b7ad859292150526ea5fa">
|