aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter01/whatsnew.xml4
-rw-r--r--chapter03/patches.xml25
-rw-r--r--chapter05/binutils-pass1.xml5
-rw-r--r--chapter05/binutils-pass2.xml5
-rw-r--r--chapter06/binutils.xml5
-rw-r--r--chapter06/texinfo.xml15
-rw-r--r--packages.ent6
-rw-r--r--patches.ent13
9 files changed, 38 insertions, 44 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8355f9ed7..26c93e724 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
<para>2007-12-08</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Upgraded to Texinfo-4.11. Fixes
+ <ulink url="&lfs-ticket-root;2074">#2074</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Upgraded to Psmisc-22.6. Fixes
<ulink url="&lfs-ticket-root;2104">#2104</ulink>.</para>
</listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 6d241bc4f..55583c90a 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -176,9 +176,9 @@
<listitem>
<para>TCL &tcl-version;</para>
</listitem>
- <!--<listitem>
+ <listitem>
<para>Texinfo &texinfo-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Udev &udev-version;</para>
</listitem>-->
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 321030b31..e0c6712cb 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -27,6 +27,14 @@
</varlistentry>
<varlistentry>
+ <term>Binutils Texinfo Version Patch - <token>&binutils-configure-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&binutils-configure-patch;"/></para>
+ <para>MD5 sum: <literal>&binutils-configure-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&bzip2-docs-patch;"/></para>
@@ -170,23 +178,6 @@
</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>
- <para>MD5 sum: <literal>&texinfo-multibyte-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
-
- <varlistentry>
- <term>Texinfo Tempfile Fix Patch - <token>&texinfo-tempfile_fix-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink url="&patches-root;&texinfo-tempfile_fix-patch;"/></para>
- <para>MD5 sum: <literal>&texinfo-tempfile_fix-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
<varlistentry>
<term>Udev usb_id Segfault Patch - <token>&udev-usbid-patch-size;</token>:</term>
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 09c2e0a30..805f7c996 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -48,6 +48,11 @@
linker and assembler to determine which of their own features to
enable.</para>
+ <para>Binutils does not recognize versions of Texinfo newer than 4.9. Fix
+ this issue by applying the following patch:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-configure-patch;</userinput></screen>
+
<para>The Binutils documentation recommends building Binutils outside of the
source directory in a dedicated build directory:</para>
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index d0c7a5ac5..7cfcb6421 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -43,6 +43,11 @@
<sect2 role="installation">
<title>Re-installation of Binutils</title>
+ <para>Binutils does not recognize versions of Texinfo newer than 4.9. Fix
+ this issue by applying the following patch:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-configure-patch;</userinput></screen>
+
<para>Create a separate build directory again:</para>
<screen><userinput remap="pre">mkdir -v ../binutils-build
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 24770bb17..b747c97ce 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -56,6 +56,11 @@ Ask your system administrator to create more.</computeroutput></screen>
<para>This issue needs to be resolved before running the test suites
for Binutils and GCC.</para>
+ <para>Binutils does not recognize versions of Texinfo newer than 4.9. Fix
+ this issue by applying the following patch:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-configure-patch;</userinput></screen>
+
<para>The Binutils documentation recommends building Binutils outside of the
source directory in a dedicated build directory:</para>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 69916295a..447580764 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -41,19 +41,6 @@
<sect2 role="installation">
<title>Installation of Texinfo</title>
- <para>The <command>info</command> program makes assumptions such as that
- a string occupies the same number of character cells on the screen and
- bytes in memory and that one can break the string anywhere, which fail
- in UTF-8 based locales. The patch below makes them valid by falling back
- to English messages when a multibyte locale is in use:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&texinfo-multibyte-patch;</userinput></screen>
-
- <para>Texinfo allows local users to overwrite arbitrary files via a symlink
- attack on temporary files. Apply the following patch to fix this:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&texinfo-tempfile_fix-patch;</userinput></screen>
-
<para>Prepare Texinfo for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
@@ -64,7 +51,7 @@
<para>To test the results, issue:</para>
-<screen><userinput remap="test">make check</userinput></screen>
+<screen><userinput remap="test">make -k check</userinput></screen>
<para>Install the package:</para>
diff --git a/packages.ent b/packages.ent
index 7c288dc79..5e2ccf2ae 100644
--- a/packages.ent
+++ b/packages.ent
@@ -475,10 +475,10 @@
<!ENTITY tcl-ch5-du "24 MB">
<!ENTITY tcl-ch5-sbu "0.3 SBU">
-<!ENTITY texinfo-version "4.9">
-<!ENTITY texinfo-size "1,489 KB">
+<!ENTITY texinfo-version "4.11">
+<!ENTITY texinfo-size "1,621 KB">
<!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.bz2">
-<!ENTITY texinfo-md5 "f4458e4b81e5469fa0815c35654141ab">
+<!ENTITY texinfo-md5 "c6bf13df4fbeff8ce874aacd6a51e814">
<!ENTITY texinfo-home "&gnu-software;texinfo/">
<!ENTITY texinfo-ch5-du "16.3 MB">
<!ENTITY texinfo-ch5-sbu "0.2 SBU">
diff --git a/patches.ent b/patches.ent
index dae9b6796..418b74694 100644
--- a/patches.ent
+++ b/patches.ent
@@ -6,6 +6,11 @@
<!ENTITY bash-fixes-patch-size "24 KB">
+<!ENTITY binutils-configure-patch "binutils-&binutils-version;-configure-1.patch">
+<!ENTITY binutils-configure-patch-md5 "83877c299e3e3080952214e479396f23">
+<!ENTITY binutils-configure-patch-size "1 KB">
+
+
<!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
<!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
<!ENTITY bzip2-docs-patch-size "1.6 KB">
@@ -91,14 +96,6 @@
<!ENTITY shadow-useradd-patch-size "6.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">
-
-<!ENTITY texinfo-tempfile_fix-patch "texinfo-&texinfo-version;-tempfile_fix-1.patch">
-<!ENTITY texinfo-tempfile_fix-patch-md5 "559bda136a2ac7777ecb67511227af85">
-<!ENTITY texinfo-tempfile_fix-patch-size "2.2 KB">
-
<!ENTITY udev-usbid-patch "udev-&udev-version;-usb_id-1.patch">
<!ENTITY udev-usbid-md5 "247614818827422b99672ea8bf3909ec">
<!ENTITY udev-usbid-patch-size "3.2 KB">