Author: matthew
Date: 2009-11-15 08:10:40 -0700 (Sun, 15 Nov 2009)
New Revision: 9104
Modified:
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter01/whatsnew.xml
trunk/BOOK/chapter03/patches.xml
trunk/BOOK/chapter05/patch.xml
trunk/BOOK/chapter06/patch.xml
trunk/BOOK/packages.ent
trunk/BOOK/patches.ent
Log:
Upgrade to Patch-2.6. Fixes #2513.
Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml 2009-11-15 15:10:10 UTC (rev 9103)
+++ trunk/BOOK/chapter01/changelog.xml 2009-11-15 15:10:40 UTC (rev 9104)
@@ -41,6 +41,10 @@
<para>2009-11-15</para>
<itemizedlist>
<listitem>
+ <para>[matthew] Upgraded to Patch-2.6. Fixes
+ <ulink url="&lfs-ticket-root;2513">#2513</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] Upgraded to Udev-147. Fixes
<ulink url="&lfs-ticket-root;2512">#2512</ulink>.</para>
</listitem>
Modified: trunk/BOOK/chapter01/whatsnew.xml
===================================================================
--- trunk/BOOK/chapter01/whatsnew.xml 2009-11-15 15:10:10 UTC (rev 9103)
+++ trunk/BOOK/chapter01/whatsnew.xml 2009-11-15 15:10:40 UTC (rev 9104)
@@ -145,9 +145,9 @@
<!--<listitem>
<para>Ncurses &ncurses-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Patch &patch-version;</para>
- </listitem>-->
+ </listitem>
<listitem>
<para>Perl &perl-version;</para>
</listitem>
@@ -243,6 +243,9 @@
<para>coreutils-7.1-uname-1.patch</para>
</listitem>
+ <listitem>
+ <para>patch-2.5.9-fixes-1.patch</para>
+ </listitem>
</itemizedlist>
</sect1>
Modified: trunk/BOOK/chapter03/patches.xml
===================================================================
--- trunk/BOOK/chapter03/patches.xml 2009-11-15 15:10:10 UTC (rev 9103)
+++ trunk/BOOK/chapter03/patches.xml 2009-11-15 15:10:40 UTC (rev 9104)
@@ -146,14 +146,6 @@
</listitem>
</varlistentry>
- <varlistentry>
- <term>Patch Carriage Return Fix Patch -
<token>&patch-fixes-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink url="&patches-root;&patch-fixes-patch;"/></para>
- <para>MD5 sum: <literal>&patch-fixes-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
<!-- <varlistentry>
<term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
<listitem>
Modified: trunk/BOOK/chapter05/patch.xml
===================================================================
--- trunk/BOOK/chapter05/patch.xml 2009-11-15 15:10:10 UTC (rev 9103)
+++ trunk/BOOK/chapter05/patch.xml 2009-11-15 15:10:40 UTC (rev 9104)
@@ -43,12 +43,6 @@
<sect2 role="installation">
<title>Installation of Patch</title>
- <para>Apply a patch that fixes a bug whereby <command>patch</command>
- fails to apply patches whose lines contain trailing carriage return
- characters:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i
../&patch-fixes-patch;</userinput></screen>
-
<para>Prepare Patch for compilation:</para>
<screen><userinput remap="configure">./configure
--prefix=/tools</userinput></screen>
@@ -57,8 +51,12 @@
<screen><userinput remap="make">make</userinput></screen>
- <para>This package does not come with a test suite.</para>
+ <para>Compilation is now complete. As discussed earlier, running the test
+ suite is not mandatory for the temporary tools here in this chapter. To run
+ the Patch test suite anyway, issue the following command:</para>
+<screen><userinput remap="test">make check</userinput></screen>
+
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>
Modified: trunk/BOOK/chapter06/patch.xml
===================================================================
--- trunk/BOOK/chapter06/patch.xml 2009-11-15 15:10:10 UTC (rev 9103)
+++ trunk/BOOK/chapter06/patch.xml 2009-11-15 15:10:40 UTC (rev 9104)
@@ -42,12 +42,6 @@
<sect2 role="installation">
<title>Installation of Patch</title>
- <para>Apply a patch that fixes a bug whereby <command>patch</command>
- fails to apply patches whose lines contain trailing carriage return
- characters:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i
../&patch-fixes-patch;</userinput></screen>
-
<para>Prepare Patch for compilation:</para>
<screen><userinput remap="configure">./configure
--prefix=/usr</userinput></screen>
@@ -56,8 +50,10 @@
<screen><userinput remap="make">make</userinput></screen>
- <para>This package does not come with a test suite.</para>
+ <para>To test the results, issue:</para>
+<screen><userinput remap="test">make check</userinput></screen>
+
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>
Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent 2009-11-15 15:10:10 UTC (rev 9103)
+++ trunk/BOOK/packages.ent 2009-11-15 15:10:40 UTC (rev 9104)
@@ -383,10 +383,10 @@
<!ENTITY ncurses-ch6-du "35 MB">
<!ENTITY ncurses-ch6-sbu "0.8 SBU">
-<!ENTITY patch-version "2.5.9">
-<!ENTITY patch-size "197 KB">
-<!ENTITY patch-url "&alpha-gnu;diffutils/patch-&patch-version;.tar.gz">
-<!ENTITY patch-md5 "dacfb618082f8d3a2194601193cf8716">
+<!ENTITY patch-version "2.6">
+<!ENTITY patch-size "244 KB">
+<!ENTITY patch-url "&alpha-gnu;diffutils/patch-&patch-version;.tar.bz2">
+<!ENTITY patch-md5 "5729b1430ba6c2216e0f3eb18f213c81">
<!ENTITY patch-home "http://directory.fsf.org/project/patch/";>
<!ENTITY patch-ch5-du "1.9 MB">
<!ENTITY patch-ch5-sbu "less than 0.1 SBU">
Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent 2009-11-15 15:10:10 UTC (rev 9103)
+++ trunk/BOOK/patches.ent 2009-11-15 15:10:40 UTC (rev 9104)
@@ -79,11 +79,6 @@
<!ENTITY kbd-backspace-patch-size "12 KB">
-<!ENTITY patch-fixes-patch "patch-&patch-version;-fixes-1.patch">
-<!ENTITY patch-fixes-patch-md5 "a2f0901f42e87ad3d5fefbccee6a09f4">
-<!ENTITY patch-fixes-patch-size "1.7 KB">
-
-
<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
<!ENTITY perl-libc-patch-md5 "800dfd3c9618731ee5cf57f77a7942b4">
<!ENTITY perl-libc-patch-size "1 KB">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
