diff options
| -rw-r--r-- | chapter03/packages.xml | 18 | ||||
| -rw-r--r-- | chapter03/patches.xml | 21 | ||||
| -rw-r--r-- | chapter06/man-db.xml | 4 | ||||
| -rw-r--r-- | chapter06/ncurses.xml | 2 | ||||
| -rw-r--r-- | chapter06/vim.xml | 4 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | patches.ent | 7 |
7 files changed, 33 insertions, 27 deletions
diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 52e8b75c5..8f3002c93 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -158,29 +158,23 @@ url="http://www.linuxfromscratch.org/lfs/download.html#ftp"/>.</para></note> </varlistentry> <varlistentry> -<term>Grep (&grep-version;) - 520 KB:</term> +<term>Glibc LibIDN add-on (&glibc-version;) - 100 KB:</term> <listitem> -<para><ulink url="&gnu;grep/"/></para> +<para><ulink url="&gnu;glibc/"/></para> </listitem> </varlistentry> <varlistentry> -<term>Groff (&groff-version;) - 2,260 KB:</term> +<term>Grep (&grep-version;) - 520 KB:</term> <listitem> -<para><ulink url="&gnu;groff/"/></para> +<para><ulink url="&gnu;grep/"/></para> </listitem> </varlistentry> <varlistentry> -<term>Groff Debian Patch - 129 KB:</term> +<term>Groff (&groff-version;) - 2,260 KB:</term> <listitem> -<para><ulink url="http://ftp.debian.org/debian/pool/main/g/groff/&groff-debian-patch;"/></para> -<note><para>Groff Debian Patch (&groff-version;-&groff-patchlevel;) -may no longer be available at the -listed location. The site administrators of the master download -location occasionally remove older versions when new ones are -released. There is no alternative download location yet.</para></note> -<!-- Actually there's snapshot.debian.net, but they have hardware problems --> +<para><ulink url="&gnu;groff/"/></para> </listitem> </varlistentry> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 239a4c58e..8fd745110 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -93,6 +93,19 @@ needed to build an LFS system:</para> </varlistentry> <varlistentry> +<term>Groff Debian Patch - 129 KB:</term> +<listitem> +<para><ulink url="http://ftp.debian.org/debian/pool/main/g/groff/&groff-debian-patch;"/></para> +<note><para>Groff Debian Patch (&groff-version;-&groff-patchlevel;) +may no longer be available at the +listed location. The site administrators of the master download +location occasionally remove older versions when new ones are +released. There is no alternative download location yet.</para></note> +<!-- Actually there's snapshot.debian.net, but they have hardware problems --> +</listitem> +</varlistentry> + +<varlistentry> <term>Gzip Security Patch - 2 KB:</term><listitem> <para><ulink url="&patches-root;&gzip-security_fix-patch;"/></para> </listitem> @@ -155,16 +168,16 @@ needed to build an LFS system:</para> </varlistentry> <varlistentry> -<term>Sysklogd 8-Bit Cleanness Patch - 1 KB:</term> +<term>Shadow Configure Script Patch - 1KB:</term> <listitem> -<para><ulink url="&lfs-root;patches/downloads/sysklogd/&sysklogd-8bit-patch;"/></para> +<para><ulink url="&patches-root;&shadow-configure-patch;"/></para> </listitem> </varlistentry> <varlistentry> -<term>Shadow Configure Script Patch - 1KB:</term> +<term>Sysklogd 8-Bit Cleanness Patch - 1 KB:</term> <listitem> -<para><ulink url="&patches-root;&shadow-configure-patch;"/></para> +<para><ulink url="&lfs-root;patches/downloads/sysklogd/&sysklogd-8bit-patch;"/></para> </listitem> </varlistentry> diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index 5d80c030a..c41b38cbc 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -180,9 +180,9 @@ while read F ; do done && cp -rv man? /usr/share/man/es</userinput></screen> -<note>The need to exclude the <filename>man7/iso_8859-7.7</filename> file +<note><para>The need to exclude the <filename>man7/iso_8859-7.7</filename> file from the conversion process because it is already in ISO-8859-1 is a packaging -bug in man-pages-es-1.55. Future versions should not require this workaround.</note> +bug in man-pages-es-1.55. Future versions should not require this workaround.</para></note> </sect2> diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index 2df394b7a..9e094c868 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -112,7 +112,7 @@ done && ln -sfv libncurses++w.a /usr/lib/libncurses++.a</userinput></screen> <para>Finally, make sure that old applications that look for -<filename class="libaryfile">-lcurses</filename> at build time are still +<filename class="libraryfile">-lcurses</filename> at build time are still buildable:</para> <screen><userinput>echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so && diff --git a/chapter06/vim.xml b/chapter06/vim.xml index aecbe3ac8..bd21f2f32 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -84,8 +84,8 @@ tutorials. An English tutorial will be used instead.</para> <!-- Removal is used instead of conversion in order for the user to be able to painlessly revert his UTF-8 locale choice. --> -<screen><userinput>rm -f /usr/share/vim/vim63/tutor/tutor.{gr,pl,ru,sk} -rm -f /usr/share/vim/vim63/tutor/tutor.??.*</userinput></screen> +<screen><userinput>rm -f /usr/share/vim/vim64/tutor/tutor.{gr,pl,ru,sk} +rm -f /usr/share/vim/vim64/tutor/tutor.??.*</userinput></screen> <para>Many users are used to using <command>vi</command> instead of <command>vim</command>. To allow execution of <command>vim</command> diff --git a/general.ent b/general.ent index a3d990ae2..f3836dd93 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!ENTITY version "SVN-20060105"> -<!ENTITY releasedate "January 5, 2006"> +<!ENTITY version "SVN-20060107"> +<!ENTITY releasedate "January 7, 2006"> <!ENTITY milestone "6.2"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/patches.ent b/patches.ent index 1f4fafa50..fff66b690 100644 --- a/patches.ent +++ b/patches.ent @@ -39,16 +39,15 @@ <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch"> -<!ENTITY sysklogd-8bit-patch "sysklogd-&sysklogd-version;-8bit-1.patch"> - <!ENTITY shadow-configure-patch "shadow-&shadow-version;-configure_fix-1.patch"> +<!ENTITY sysklogd-8bit-patch "sysklogd-&sysklogd-version;-8bit-1.patch"> <!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-1.patch"> <!ENTITY tar-gcc4_fix-patch "tar-&tar-version;-gcc4_fix_tests-1.patch"> <!ENTITY tar-sparse_fix-patch "tar-&tar-version;-sparse_fix-1.patch"> -<!ENTITY texinfo-multibyte-patch "texinfo-&texinfo-version;-multibyte-2.patch"> -<!ENTITY texinfo-tempfile_fix-patch "texinfo-&texinfo-version;-tempfile_fix-1.patch"> +<!ENTITY texinfo-multibyte-patch "texinfo-&texinfo-version;-multibyte-1.patch"> +<!ENTITY texinfo-tempfile_fix-patch "texinfo-&texinfo-version;-tempfile_fix-2.patch"> <!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch"> |