r6709 - in branches/cross-lfs/BOOK: . final-system/common final-system/multilib introduction/common materials/common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Thu Aug 18 12:14:52 PDT 2005


Author: manuel
Date: 2005-08-18 13:14:50 -0600 (Thu, 18 Aug 2005)
New Revision: 6709

Modified:
   branches/cross-lfs/BOOK/final-system/common/bzip2.xml
   branches/cross-lfs/BOOK/final-system/common/sed.xml
   branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/bzip2-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/bzip2.xml
   branches/cross-lfs/BOOK/final-system/multilib/sed.xml
   branches/cross-lfs/BOOK/introduction/common/changelog.xml
   branches/cross-lfs/BOOK/introduction/common/whatsnew.xml
   branches/cross-lfs/BOOK/materials/common/patches.xml
   branches/cross-lfs/BOOK/patches.ent
Log:
Added Bzip2 bzgrep patch.
Fixed the installation directory of Sed documentation.

Modified: branches/cross-lfs/BOOK/final-system/common/bzip2.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/bzip2.xml	2005-08-18 18:46:13 UTC (rev 6708)
+++ branches/cross-lfs/BOOK/final-system/common/bzip2.xml	2005-08-18 19:14:50 UTC (rev 6709)
@@ -52,6 +52,13 @@
 
 <screen os="k"><userinput>patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen>
 
+    <para os="l">The <command>bzgrep</command> command does not escape '|' and
+    '&' in filenames passed to it. This allows arbitrary commands to be
+    executed with the privileges of the user running <command>bzgrep</command>.
+    Apply the following patch to address this:</para>
+
+<screen os="m"><userinput>patch -Np1 -i ../&bzip2-bzgrep-patch;</userinput></screen>
+
     <para os="a">The Bzip2 package does not contain a <command>configure</command>
     script. Compile it with:</para>
 

Modified: branches/cross-lfs/BOOK/final-system/common/sed.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/sed.xml	2005-08-18 18:46:13 UTC (rev 6708)
+++ branches/cross-lfs/BOOK/final-system/common/sed.xml	2005-08-18 19:14:50 UTC (rev 6709)
@@ -45,6 +45,13 @@
   <sect2 id="install-sed" role="installation">
     <title>Installation of Sed</title>
 
+    <para os="a">By default, Sed installs its man page 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>
+
+<screen os="b"><userinput>sed -i 's@/doc@&/sed-&sed-version;@' doc/Makefile.in</userinput></screen>
+
     <para>Prepare Sed for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>

Modified: branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml	2005-08-18 18:46:13 UTC (rev 6708)
+++ branches/cross-lfs/BOOK/final-system/multilib/bzip2-64bit.xml	2005-08-18 19:14:50 UTC (rev 6709)
@@ -50,6 +50,14 @@
     href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
     <para os="ba">We need to remove the tests since they won't work on
     a multi-architecture build, and tell change the default lib path
     to <filename class="directory">lib64</filename>:</para>

Modified: branches/cross-lfs/BOOK/final-system/multilib/bzip2-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/bzip2-n32.xml	2005-08-18 18:46:13 UTC (rev 6708)
+++ branches/cross-lfs/BOOK/final-system/multilib/bzip2-n32.xml	2005-08-18 19:14:50 UTC (rev 6709)
@@ -42,6 +42,14 @@
   <sect2 role="installation">
     <title>Installation of Bzip2</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
     <para>We need to remove the tests since they won't work on
     a multi-architecture build, and tell change the default lib path
     to <filename class="directory">lib32</filename>:</para>

Modified: branches/cross-lfs/BOOK/final-system/multilib/bzip2.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/bzip2.xml	2005-08-18 18:46:13 UTC (rev 6708)
+++ branches/cross-lfs/BOOK/final-system/multilib/bzip2.xml	2005-08-18 19:14:50 UTC (rev 6709)
@@ -44,6 +44,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"

Modified: branches/cross-lfs/BOOK/final-system/multilib/sed.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/sed.xml	2005-08-18 18:46:13 UTC (rev 6708)
+++ branches/cross-lfs/BOOK/final-system/multilib/sed.xml	2005-08-18 19:14:50 UTC (rev 6709)
@@ -42,6 +42,14 @@
   <sect2 role="installation">
     <title>Installation of Sed</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sed.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sed.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
     <para>Prepare Sed for compilation:</para>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \

Modified: branches/cross-lfs/BOOK/introduction/common/changelog.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/common/changelog.xml	2005-08-18 18:46:13 UTC (rev 6708)
+++ branches/cross-lfs/BOOK/introduction/common/changelog.xml	2005-08-18 19:14:50 UTC (rev 6709)
@@ -42,8 +42,16 @@
       <para>August 18, 2005</para>
       <itemizedlist>
         <listitem>
-          <para>[jim] - Updates to temp-tools section for Pure 64 builds. Thanx to Doug Ronne.</para>
+          <para>[manuel] - Added Bzip2 bzgrep patch.</para>
         </listitem>
+        <listitem>
+          <para>[manuel] - Fixed the installation directory of Sed
+          documentation.</para>
+        </listitem>
+        <listitem>
+          <para>[jim] - Updates to temp-tools section for Pure 64 builds.
+          Thanx to Doug Ronne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 
@@ -91,7 +99,8 @@
           <para>[manuel] - Added Vim security fix patch.</para>
         </listitem>
         <listitem>
-          <para>[jim] - Updated to add Pure 64 bit build. Thanx Ryan Oliver and Ken Moffat.</para>
+          <para>[jim] - Updated to add Pure 64 bit build. Thanx Ryan Oliver
+          and Ken Moffat.</para>
         </listitem>
       </itemizedlist>
     </listitem>
@@ -121,7 +130,8 @@
       <para>July 23, 2005</para>
       <itemizedlist>
         <listitem>
-          <para>[jim] - Removed security patch to Zlib, not needed with new version.</para>
+          <para>[jim] - Removed security patch to Zlib, not needed with
+          new version.</para>
         </listitem>
       </itemizedlist>
     </listitem>
@@ -208,7 +218,8 @@
           <para>[jim] - Updated to iana-etc to 1.10.</para>
         </listitem>
         <listitem>
-          <para>[jim] - Downgraded to udev 058, build issue with non-x86 architectures.</para>
+          <para>[jim] - Downgraded to udev 058, build issue with non-x86
+          architectures.</para>
         </listitem>
       </itemizedlist>
     </listitem>
@@ -217,8 +228,8 @@
       <para>July 8, 2005</para>
       <itemizedlist>
         <listitem>
-          <para>[jim] - Updated flex build in final-system on 64 bit machines to create
-          libfl.a for all ABI's.</para>
+          <para>[jim] - Updated flex build in final-system on 64 bit machines
+          to create libfl.a for all ABI's.</para>
         </listitem>
         <listitem>
           <para>[jim] - Added security patch to zlib.</para>
@@ -236,8 +247,8 @@
       <para>July 7, 2005</para>
       <itemizedlist>
         <listitem>
-          <para>[jhuntwork] - Removed patch for ncurses in final-system build, only necessary
-          when cross-compiling.</para>
+          <para>[jhuntwork] - Removed patch for ncurses in final-system build,
+          only necessary when cross-compiling.</para>
         </listitem>
       </itemizedlist>
     </listitem>
@@ -246,8 +257,8 @@
       <para>July 6, 2005</para>
       <itemizedlist>
         <listitem>
-          <para>[jim] - Added missing binutils patch to final-system. Need multlib scripts patch for
-          all multiple ABI builds.</para>
+          <para>[jim] - Added missing binutils patch to final-system.
+          Need multlib scripts patch for all multiple ABI builds.</para>
         </listitem>
         <listitem>
           <para>[jim] - Upgraded to Linux-libc-headers 2.6.12.0.</para>
@@ -259,7 +270,8 @@
       <para>July 4, 2005</para>
       <itemizedlist>
         <listitem>
-          <para>[jim] - Put in correct Sparc CPU Names into the target-triplet table.</para>
+          <para>[jim] - Put in correct Sparc CPU Names into the target-triplet
+          table.</para>
         </listitem>
       </itemizedlist>
     </listitem>
@@ -299,7 +311,8 @@
           <para>[jim] - Added CPPFLAGS=-D_GNU_SOURCE to patch in temp-system.</para>
         </listitem>
         <listitem>
-          <para>[jim] - Added testing of adjusting the toolchain to all architectures.</para>
+          <para>[jim] - Added testing of adjusting the toolchain to all
+          architectures.</para>
         </listitem>
         <listitem>
           <para>[jim] - Updated ld.so.conf to see all multilib directories.</para>

Modified: branches/cross-lfs/BOOK/introduction/common/whatsnew.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/common/whatsnew.xml	2005-08-18 18:46:13 UTC (rev 6708)
+++ branches/cross-lfs/BOOK/introduction/common/whatsnew.xml	2005-08-18 19:14:50 UTC (rev 6709)
@@ -125,6 +125,9 @@
       <para>Bash-doc-&bash-doc-version;</para>
     </listitem>
     <listitem>
+      <para>&bzip2-bzgrep-patch;</para>
+    </listitem>
+    <listitem>
       <para>&bzip2-docs-patch;</para>
     </listitem>
     <listitem>

Modified: branches/cross-lfs/BOOK/materials/common/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/common/patches.xml	2005-08-18 18:46:13 UTC (rev 6708)
+++ branches/cross-lfs/BOOK/materials/common/patches.xml	2005-08-18 19:14:50 UTC (rev 6709)
@@ -37,6 +37,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Bzip2 Bzgrep Security Fixes Patch - 1 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;bzip2/&bzip2-bzgrep-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Bzip2 Documentation Patch - 1 KB:</term>
       <listitem>
         <para><ulink

Modified: branches/cross-lfs/BOOK/patches.ent
===================================================================
--- branches/cross-lfs/BOOK/patches.ent	2005-08-18 18:46:13 UTC (rev 6708)
+++ branches/cross-lfs/BOOK/patches.ent	2005-08-18 19:14:50 UTC (rev 6709)
@@ -5,6 +5,7 @@
 <!ENTITY bash-avoid_WCONTINUED-patch "bash-&bash-version;-avoid_WCONTINUED-1.patch">
 
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
+<!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch">
 
 <!ENTITY binutils-posix-patch "binutils-&binutils-version;-posix-1.patch">
 




More information about the lfs-book mailing list