diff options
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 7 | ||||
| -rw-r--r-- | chapter03/patches.xml | 8 | ||||
| -rw-r--r-- | chapter05/patch.xml | 12 | ||||
| -rw-r--r-- | chapter06/patch.xml | 10 | ||||
| -rw-r--r-- | packages.ent | 8 | ||||
| -rw-r--r-- | patches.ent | 5 |
7 files changed, 21 insertions, 33 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 311d06556..78f6fc2dd 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -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> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 450e0bba8..71e34c7db 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -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> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 971987ea8..272b5a3a2 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -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> diff --git a/chapter05/patch.xml b/chapter05/patch.xml index 263feffac..9ea3f39f9 100644 --- a/chapter05/patch.xml +++ b/chapter05/patch.xml @@ -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,7 +51,11 @@ <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> diff --git a/chapter06/patch.xml b/chapter06/patch.xml index a2213f867..da7fcb3f7 100644 --- a/chapter06/patch.xml +++ b/chapter06/patch.xml @@ -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,7 +50,9 @@ <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> diff --git a/packages.ent b/packages.ent index 6683004dc..238c5f7c7 100644 --- a/packages.ent +++ b/packages.ent @@ -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"> diff --git a/patches.ent b/patches.ent index 55aa239c1..eb6b7e812 100644 --- a/patches.ent +++ b/patches.ent @@ -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"> |