diff options
| -rw-r--r-- | chapter01/changelog.xml | 2 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 3 | ||||
| -rw-r--r-- | chapter03/patches.xml | 8 | ||||
| -rw-r--r-- | chapter05/tar.xml | 8 | ||||
| -rw-r--r-- | chapter06/tar.xml | 7 | ||||
| -rw-r--r-- | packages.ent | 14 | ||||
| -rw-r--r-- | patches.ent | 5 |
7 files changed, 40 insertions, 7 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 33bf30937..f8051cc17 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -47,6 +47,8 @@ <ulink url="&lfs-ticket-root;2028">#2028</ulink>.</para> <para>[ken] - Upgrade to findutils-4.2.31, fixes <ulink url="&lfs-ticket-root;2025">#2025</ulink>.</para> + <para>[ken] - Upgrade to tar-1.17, fixes + <ulink url="&lfs-ticket-root;2029">#2029</ulink>.</para> </listitem> </itemizedlist> </listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 2dff7b2b5..1bea9cfdd 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -220,6 +220,9 @@ <para>&readline-fixes-patch;</para> </listitem> <listitem> + <para>&tar-sort-exclude-test-patch;</para> + </listitem> + <listitem> <para>&util-linux-lseek-patch;</para> </listitem> </itemizedlist> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 7478f8d43..e0f266b5d 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -219,6 +219,14 @@ </varlistentry> <varlistentry> + <term>Tar Sort Exclude Test Patch - <token>&tar-sort-exclude-test-patch-size;</token>:</term> + <listitem> + <para>Download: <ulink url="&patches-root;&tar-sort-exclude-test-patch;"/></para> + <para>MD5 sum: <literal>&tar-sort-exclude-test-patch-md5;</literal></para> + </listitem> + </varlistentry> + + <varlistentry> <term>Texinfo Multibyte Fixes Patch - <token>&texinfo-multibyte-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&texinfo-multibyte-patch;"/></para> diff --git a/chapter05/tar.xml b/chapter05/tar.xml index 87c627de8..335eefcd9 100644 --- a/chapter05/tar.xml +++ b/chapter05/tar.xml @@ -37,6 +37,14 @@ <sect2 role="installation"> <title>Installation of Tar</title> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../chapter06/tar.xml" + xpointer="xpointer(//*[@os='a'])"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../chapter06/tar.xml" + xpointer="xpointer(//*[@os='b'])"/> + <para>Prepare Tar for compilation:</para> <screen><userinput>./configure --prefix=/tools</userinput></screen> diff --git a/chapter06/tar.xml b/chapter06/tar.xml index 4d1d30767..7f8cd7c9e 100644 --- a/chapter06/tar.xml +++ b/chapter06/tar.xml @@ -34,6 +34,13 @@ <sect2 role="installation"> <title>Installation of Tar</title> + <para os="a">One of the tests in the testsuite (number 12, exclude) fails, + at least on recent linux systems, because the output needs to be sorted + before it is diffed. If you are going to run the testsuite, fix this by + applying the following patch before you configure: </para> + +<screen os="b"><userinput>patch -Np1 -i ../&tar-sort-exclude-test-patch;</userinput></screen> + <para>Prepare Tar for compilation:</para> <screen><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen> diff --git a/packages.ent b/packages.ent index d9ae5da30..ac8bb3bb8 100644 --- a/packages.ent +++ b/packages.ent @@ -454,15 +454,15 @@ <!ENTITY sysvinit-ch6-du "1 MB"> <!ENTITY sysvinit-ch6-sbu "less than 0.1 SBU"> -<!ENTITY tar-version "1.16.1"> -<!ENTITY tar-size "1,752 KB"> +<!ENTITY tar-version "1.17"> +<!ENTITY tar-size "1,839 KB"> <!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.bz2"> -<!ENTITY tar-md5 "d51593461c5ef1f7e37134f22338bb9e"> +<!ENTITY tar-md5 "c6c4f1c075dbf0f75c29737faa58f290"> <!ENTITY tar-home "&gnu-software;tar/"> -<!ENTITY tar-ch5-du "13.7 MB"> -<!ENTITY tar-ch5-sbu "0.2 SBU"> -<!ENTITY tar-ch6-du "13.7 MB"> -<!ENTITY tar-ch6-sbu "0.2 SBU"> +<!ENTITY tar-ch5-du "19.9 MB"> +<!ENTITY tar-ch5-sbu "0.3 SBU"> +<!ENTITY tar-ch6-du "19.9 MB"> +<!ENTITY tar-ch6-sbu "0.3 SBU"> <!ENTITY tcl-version "8.4.15"> <!ENTITY tcl-size "3,549 KB"> diff --git a/patches.ent b/patches.ent index 053300230..dfb709268 100644 --- a/patches.ent +++ b/patches.ent @@ -120,6 +120,11 @@ <!ENTITY sysklogd-fixes-patch-size "32 KB"> +<!ENTITY tar-sort-exclude-test-patch "tar-&tar-version;-sort_exclude_test-1.patch"> +<!ENTITY tar-sort-exclude-test-patch-md5 "69326a1d462dad67db495a42854a93c7"> +<!ENTITY tar-sort-exclude-test-patch-size "3.1 KB"> + + <!ENTITY texinfo-multibyte-patch "texinfo-&texinfo-version;-multibyte-1.patch"> <!ENTITY texinfo-multibyte-patch-md5 "6cb5b760cfdd2dd53a0430eb572a8aaa"> <!ENTITY texinfo-multibyte-patch-size "1.5 KB"> |