Author: matthew
Date: 2006-02-19 14:24:03 -0700 (Sun, 19 Feb 2006)
New Revision: 7385
Modified:
branches/udev_update/BOOK/chapter01/changelog.xml
branches/udev_update/BOOK/chapter01/whatsnew.xml
branches/udev_update/BOOK/chapter03/packages.xml
branches/udev_update/BOOK/chapter03/patches.xml
branches/udev_update/BOOK/chapter06/bash.xml
branches/udev_update/BOOK/chapter06/coreutils.xml
branches/udev_update/BOOK/chapter06/db.xml
branches/udev_update/BOOK/chapter06/linux-libc-headers.xml
branches/udev_update/BOOK/chapter06/perl.xml
branches/udev_update/BOOK/chapter06/readline.xml
branches/udev_update/BOOK/chapter06/sed.xml
branches/udev_update/BOOK/general.ent
branches/udev_update/BOOK/patches.ent
Log:
Merge package upgrades from trunk r7377-r7384
Modified: branches/udev_update/BOOK/chapter01/changelog.xml
===================================================================
--- branches/udev_update/BOOK/chapter01/changelog.xml 2006-02-19 21:19:54 UTC
(rev 7384)
+++ branches/udev_update/BOOK/chapter01/changelog.xml 2006-02-19 21:24:03 UTC
(rev 7385)
@@ -40,6 +40,37 @@
<para>February 19, 2006</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Install Sed's HTML documentation by using
+ --enable-html instead of editing the Makefile. Thanks to Greg
Schafer
+ for the report and the fix.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Add upstream fixes 001-002 for Readline.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Add upstream fixes 001-008 for Bash.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Upgrade to Sed 4.1.5.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Upgrade to Man-pages 2.23.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Upgrade to Coreutils-5.94.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Upgrade to DB-4.4.20.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Upgrade to Perl-5.8.8, removing the now unneeded
+ vulnerability and DB module patches.</para>
+ </listitem>
+ <listitem>
+ <para>[matthew] - Add the verbose parameter to a couple of commands
in
+ Linux-Libc-Headers and DB.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Create udev specific directories in udev's
instructions instead of the more generic creatingdirs.xml. Add
"pts" and "shm" directories to
Modified: branches/udev_update/BOOK/chapter01/whatsnew.xml
===================================================================
--- branches/udev_update/BOOK/chapter01/whatsnew.xml 2006-02-19 21:19:54 UTC
(rev 7384)
+++ branches/udev_update/BOOK/chapter01/whatsnew.xml 2006-02-19 21:24:03 UTC
(rev 7385)
@@ -154,9 +154,9 @@
<listitem>
<para>Readline &readline-version;</para>
</listitem>
- <!--<listitem>
+ <listitem>
<para>Sed &sed-version;</para>
- </listitem>-->
+ </listitem>
<listitem>
<para>Shadow &shadow-version;</para>
</listitem>
@@ -202,6 +202,9 @@
<title>Added:</title>
<listitem>
+ <para>&bash-fixes-patch;</para>
+ </listitem>
+ <listitem>
<para>&bzip2-bzgrep-patch;</para>
</listitem>
<listitem>
@@ -232,10 +235,10 @@
<para>&mktemp-tempfile-patch;</para>
</listitem>
<listitem>
- <para>&perl-db_file-patch;</para>
+ <para>&perl-libc-patch;</para>
</listitem>
<listitem>
- <para>&perl-libc-patch;</para>
+ <para>&readline-fixes-patch;</para>
</listitem>
<listitem>
<para>&tar-gcc4_fix-patch;</para>
Modified: branches/udev_update/BOOK/chapter03/packages.xml
===================================================================
--- branches/udev_update/BOOK/chapter03/packages.xml 2006-02-19 21:19:54 UTC
(rev 7384)
+++ branches/udev_update/BOOK/chapter03/packages.xml 2006-02-19 21:24:03 UTC
(rev 7385)
@@ -43,7 +43,7 @@
</varlistentry>
<varlistentry>
- <term>Berkeley DB (&db-version;) - 7,925 KB:</term>
+ <term>Berkeley DB (&db-version;) - 6,578 KB:</term>
<listitem>
<para><ulink url="http://dev.sleepycat.com/"/></para>
</listitem>
@@ -71,7 +71,7 @@
</varlistentry>
<varlistentry>
- <term>Coreutils (&coreutils-version;) - 4,782 KB:</term>
+ <term>Coreutils (&coreutils-version;) - 4,929 KB:</term>
<listitem>
<para><ulink url="&gnu;coreutils/"/></para>
</listitem>
@@ -284,7 +284,7 @@
</varlistentry>
<varlistentry>
- <term>Man-pages (&man-pages-version;) - 1,705 KB:</term>
+ <term>Man-pages (&man-pages-version;) - 1,709 KB:</term>
<listitem>
<para><ulink url="&kernel;linux/docs/manpages/"/></para>
</listitem>
@@ -335,7 +335,7 @@
</varlistentry>
<varlistentry>
- <term>Perl (&perl-version;) - 9,628 KB:</term>
+ <term>Perl (&perl-version;) - 9,886 KB:</term>
<listitem>
<para><ulink url="http://ftp.funet.fi/pub/CPAN/src/"/></para>
</listitem>
@@ -363,7 +363,7 @@
</varlistentry>
<varlistentry>
- <term>Sed (&sed-version;) - 632 KB:</term>
+ <term>Sed (&sed-version;) - 631 KB:</term>
<listitem>
<para><ulink url="&gnu;sed/"/></para>
</listitem>
Modified: branches/udev_update/BOOK/chapter03/patches.xml
===================================================================
--- branches/udev_update/BOOK/chapter03/patches.xml 2006-02-19 21:19:54 UTC
(rev 7384)
+++ branches/udev_update/BOOK/chapter03/patches.xml 2006-02-19 21:24:03 UTC
(rev 7385)
@@ -19,6 +19,13 @@
<variablelist role="materials">
<varlistentry>
+ <term>Bash Upstream Fixes Patch - 118 KB:</term>
+ <listitem>
+ <para><ulink url="&patches-root;&bash-fixes-patch;"/></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Bzip2 Bzgrep Security Fixes Patch - 1 KB:</term>
<listitem>
<para><ulink url="&patches-root;&bzip2-bzgrep-patch;"/></para>
@@ -175,13 +182,6 @@
</varlistentry>
<varlistentry>
- <term>Perl DB_File Module Update patch - 6 KB:</term>
- <listitem>
- <para><ulink url="&patches-root;&perl-db_file-patch;"/></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>Perl Libc Patch - 1 KB:</term>
<listitem>
<para><ulink url="&patches-root;&perl-libc-patch;"/></para>
@@ -189,9 +189,9 @@
</varlistentry>
<varlistentry>
- <term>Perl Sprintf Vulnerability Patch - 9 KB:</term>
+ <term>Readline Upstream Fixes Patch - 2 KB:</term>
<listitem>
- <para><ulink url="&patches-root;&perl-sprintf-patch;"/></para>
+ <para><ulink url="&patches-root;&readline-fixes-patch;"/></para>
</listitem>
</varlistentry>
Modified: branches/udev_update/BOOK/chapter06/bash.xml
===================================================================
--- branches/udev_update/BOOK/chapter06/bash.xml 2006-02-19 21:19:54 UTC
(rev 7384)
+++ branches/udev_update/BOOK/chapter06/bash.xml 2006-02-19 21:24:03 UTC
(rev 7385)
@@ -50,6 +50,11 @@
sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
Makefile.in</userinput></screen>
+ <para>Upstream developers have fixed several issues since the initial
+ release of Bash-&bash-version;. Apply those fixes:</para>
+
+<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
+
<para>Prepare Bash for compilation:</para>
<screen><userinput>./configure --prefix=/usr --bindir=/bin \
Modified: branches/udev_update/BOOK/chapter06/coreutils.xml
===================================================================
--- branches/udev_update/BOOK/chapter06/coreutils.xml 2006-02-19 21:19:54 UTC
(rev 7384)
+++ branches/udev_update/BOOK/chapter06/coreutils.xml 2006-02-19 21:24:03 UTC
(rev 7385)
@@ -25,8 +25,8 @@
<segtitle>&diskspace;</segtitle>
<seglistitem>
- <seg>0.9 SBU</seg>
- <seg>52.8 MB</seg>
+ <seg>1.1 SBU</seg>
+ <seg>58.0 MB</seg>
</seglistitem>
</segmentedlist>
Modified: branches/udev_update/BOOK/chapter06/db.xml
===================================================================
--- branches/udev_update/BOOK/chapter06/db.xml 2006-02-19 21:19:54 UTC (rev
7384)
+++ branches/udev_update/BOOK/chapter06/db.xml 2006-02-19 21:24:03 UTC (rev
7385)
@@ -108,9 +108,9 @@
<para>Fix the ownerships of the installed files:</para>
-<screen><userinput>chown root:root /usr/bin/db_* \
+<screen><userinput>chown -v root:root /usr/bin/db_* \
/usr/lib/libdb* /usr/include/db* &&
-chown -R root:root /usr/share/doc/db-&db-version;</userinput></screen>
+chown -Rv root:root /usr/share/doc/db-&db-version;</userinput></screen>
</sect2>
Modified: branches/udev_update/BOOK/chapter06/linux-libc-headers.xml
===================================================================
--- branches/udev_update/BOOK/chapter06/linux-libc-headers.xml 2006-02-19
21:19:54 UTC (rev 7384)
+++ branches/udev_update/BOOK/chapter06/linux-libc-headers.xml 2006-02-19
21:24:03 UTC (rev 7385)
@@ -53,7 +53,7 @@
<para>Install the header files:</para>
-<screen><userinput>install -d /usr/include/asm
+<screen><userinput>install -dv /usr/include/asm
cp -Rv include/asm-i386/* /usr/include/asm
cp -Rv include/linux /usr/include</userinput></screen>
Modified: branches/udev_update/BOOK/chapter06/perl.xml
===================================================================
--- branches/udev_update/BOOK/chapter06/perl.xml 2006-02-19 21:19:54 UTC
(rev 7384)
+++ branches/udev_update/BOOK/chapter06/perl.xml 2006-02-19 21:24:03 UTC
(rev 7385)
@@ -44,17 +44,6 @@
<sect2 role="installation">
<title>Installation of Perl</title>
- <para>A security vulnerability exists in Perl's sprintf function. Apply the
- following patch to fix it.</para>
-
-<screen><userinput>patch -Np1 -i ../&perl-sprintf-patch;</userinput></screen>
-
- <para>The DB_File module that comes with Perl-&perl-version; is
incompatible
- with Berkeley DB-&db-version; (the testsuite fails if this module gets
built).
- Apply the following patch in order to update the DB_File module:</para>
-
-<screen><userinput>patch -Np1 -i ../&perl-db_file-patch;</userinput></screen>
-
<para>First create a basic <filename>/etc/hosts</filename> file which will
be
referenced in one of Perl's configuration files as well as being used used
by
the testsuite if you run that.</para>
Modified: branches/udev_update/BOOK/chapter06/readline.xml
===================================================================
--- branches/udev_update/BOOK/chapter06/readline.xml 2006-02-19 21:19:54 UTC
(rev 7384)
+++ branches/udev_update/BOOK/chapter06/readline.xml 2006-02-19 21:24:03 UTC
(rev 7385)
@@ -44,6 +44,11 @@
<sect2 role="installation">
<title>Installation of Readline</title>
+ <para>Upstream developers have fixed several issues since the initial
+ release of Readline-&readline-version;. Apply those fixes:</para>
+
+<screen><userinput>patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
+
<para>Prepare Readline for compilation:</para>
<screen><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
Modified: branches/udev_update/BOOK/chapter06/sed.xml
===================================================================
--- branches/udev_update/BOOK/chapter06/sed.xml 2006-02-19 21:19:54 UTC (rev
7384)
+++ branches/udev_update/BOOK/chapter06/sed.xml 2006-02-19 21:24:03 UTC (rev
7385)
@@ -25,7 +25,7 @@
<seglistitem>
<seg>0.2 SBU</seg>
- <seg>8.4 MB</seg>
+ <seg>7.9 MB</seg>
</seglistitem>
</segmentedlist>
@@ -43,16 +43,20 @@
<sect2 role="installation">
<title>Installation of Sed</title>
- <para>By default, Sed installs its HTML documentation in
- <filename class="directory">/usr/share/doc</filename>. Alter this to
- <filename class="directory">/usr/share/doc/sed-&sed-version;</filename> by
- applying the following <command>sed</command>:</para>
+ <para>Prepare Sed for compilation:</para>
-<screen><userinput>sed -i 's@/doc@&/sed-&sed-version;@'
doc/Makefile.in</userinput></screen>
+<screen><userinput>./configure --prefix=/usr --bindir=/bin
--enable-html</userinput></screen>
- <para>Prepare Sed for compilation:</para>
+ <variablelist>
+ <title>The meaning of the new configure option:</title>
-<screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
+ <varlistentry>
+ <term><parameter>--enable-html</parameter></term>
+ <listitem>
+ <para>This builds the HTML documentation.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
<para>Compile the package:</para>
Modified: branches/udev_update/BOOK/general.ent
===================================================================
--- branches/udev_update/BOOK/general.ent 2006-02-19 21:19:54 UTC (rev
7384)
+++ branches/udev_update/BOOK/general.ent 2006-02-19 21:24:03 UTC (rev
7385)
@@ -33,8 +33,8 @@
<!ENTITY binutils-version "2.16.1">
<!ENTITY bison-version "2.1">
<!ENTITY bzip2-version "1.0.3">
-<!ENTITY coreutils-version "5.93">
-<!ENTITY db-version "4.4.16">
+<!ENTITY coreutils-version "5.94">
+<!ENTITY db-version "4.4.20">
<!ENTITY dejagnu-version "1.4.4">
<!ENTITY diffutils-version "2.8.1">
<!ENTITY e2fsprogs-version "1.38">
@@ -65,17 +65,17 @@
<!ENTITY m4-version "1.4.4">
<!ENTITY make-version "3.80">
<!ENTITY man-db-version "2.4.3">
-<!ENTITY man-pages-version "2.21">
+<!ENTITY man-pages-version "2.23">
<!ENTITY mktemp-version "1.5">
<!ENTITY module-init-tools-version "3.2.2">
<!ENTITY ncurses-version "5.5">
<!-- <!ENTITY ncurses-date "20050319"> -->
<!ENTITY patch-version "2.5.4">
-<!ENTITY perl-version "5.8.7">
+<!ENTITY perl-version "5.8.8">
<!ENTITY procps-version "3.2.6">
<!ENTITY psmisc-version "22.1">
<!ENTITY readline-version "5.1">
-<!ENTITY sed-version "4.1.4">
+<!ENTITY sed-version "4.1.5">
<!ENTITY shadow-version "4.0.14">
<!ENTITY sysklogd-version "1.4.1">
<!ENTITY sysvinit-version "2.86">
Modified: branches/udev_update/BOOK/patches.ent
===================================================================
--- branches/udev_update/BOOK/patches.ent 2006-02-19 21:19:54 UTC (rev
7384)
+++ branches/udev_update/BOOK/patches.ent 2006-02-19 21:24:03 UTC (rev
7385)
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- Start of Common Patches -->
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-3.patch">
+
<!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch">
<!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
-<!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-2.patch">
+<!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
<!ENTITY coreutils-suppress-patch
"coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch">
<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
@@ -39,10 +41,10 @@
<!ENTITY ncurses-fixes-patch "ncurses-&ncurses-version;-fixes-1.patch">
<!-- <!ENTITY ncurses-rollup-patch
"ncurses-&ncurses-version;-&ncurses-date;-patch.sh.bz2"> -->
-<!ENTITY perl-db_file-patch "perl-&perl-version;-update_db_file-1.patch">
<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
-<!ENTITY perl-sprintf-patch
"perl-&perl-version;-sprintf_vulnerability-1.patch">
+<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-2.patch">
+
<!ENTITY sysklogd-8bit-patch "sysklogd-&sysklogd-version;-8bit-1.patch">
<!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-1.patch">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page