瀏覽代碼

Import trunk.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10770 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Krejzi 10 年之前
父節點
當前提交
a90bdb6025
共有 11 個文件被更改,包括 101 次插入42 次删除
  1. 1 1
      INSTALL
  2. 45 2
      chapter01/changelog.xml
  3. 17 4
      chapter01/whatsnew.xml
  4. 1 1
      chapter03/introduction.xml
  5. 8 0
      chapter03/patches.xml
  6. 9 14
      chapter06/glibc.xml
  7. 0 4
      chapter06/grub.xml
  8. 0 4
      chapter06/man-db.xml
  9. 4 0
      chapter06/perl.xml
  10. 9 9
      packages.ent
  11. 7 3
      patches.ent

+ 1 - 1
INSTALL

@@ -41,7 +41,7 @@ If you want to convert the XML to PDF, install the items listed above (except
 lynx) and then install the following:
 lynx) and then install the following:
 
 
 * JDK
 * JDK
-  - http://www.linuxfromscratch.org/blfs/view/svn/general/jdk.html
+  - http://www.linuxfromscratch.org/blfs/view/svn/general/openjdk.html
 
 
 * FOP and JAI
 * FOP and JAI
   - http://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html
   - http://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html

+ 45 - 2
chapter01/changelog.xml

@@ -35,12 +35,55 @@
       </itemizedlist>
       </itemizedlist>
     </listitem>
     </listitem>
 -->
 -->
+    <listitem>
+      <para>2014-10-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Added perl patch to fix CVE-2014-4330.
+          to prevent infinite recursion in Data::Dumper.  Fixes
+          <ulink url="&lfs-ticket-root;3681">#3681</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to grub-2.02~beta2.  It's been
+          in beta for over 9 months and a 'stable' does not seem
+          to be forthcoming.  Fixes 
+          <ulink url="&lfs-ticket-root;3450">#3450</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update glibc tests known to sometimes fail.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-09-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update bash upstream patches and added fixes for
+          CVE-2014-6271, CVE-2014-7169, and CVE-2014-7187 (through upstream
+          patch bash43-027).</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata-2014h. Fixes 
+          <ulink url="&lfs-ticket-root;3682">#3682</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-db-2.7.0.2. Fixes 
+          <ulink url="&lfs-ticket-root;3683">#3683</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Improved wget command line in Section 3.1. Fixes 
+          <ulink url="&lfs-ticket-root;3684">#3684</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
     <listitem>
       <para>2014-09-26</para>
       <para>2014-09-26</para>
       <itemizedlist>
       <itemizedlist>
         <listitem>
         <listitem>
-          <para>[krejzi] - Updated bash upstream patches
-          and added fixes for CVE-2014-7169. Fixes <ulink
+          <para>[krejzi] - Updated bash upstream patches and added fixes for
+          CVE-2014-7169. Fixes <ulink
           url="&lfs-ticket-root;3680">#3680</ulink>.</para>
           url="&lfs-ticket-root;3680">#3680</ulink>.</para>
         </listitem>
         </listitem>
       </itemizedlist>
       </itemizedlist>

+ 17 - 4
chapter01/whatsnew.xml

@@ -109,9 +109,9 @@
     <!--<listitem>
     <!--<listitem>
       <para>Groff &groff-version;</para>
       <para>Groff &groff-version;</para>
     </listitem>-->
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>GRUB &grub-version;</para>
       <para>GRUB &grub-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
     <!--<listitem>
       <para>Gzip &gzip-version;</para>
       <para>Gzip &gzip-version;</para>
     </listitem>-->
     </listitem>-->
@@ -205,9 +205,9 @@
     <!--<listitem>
     <!--<listitem>
       <para>Texinfo &texinfo-version;</para>
       <para>Texinfo &texinfo-version;</para>
     </listitem>-->
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Tzdata &tzdata-version;</para>
       <para>Tzdata &tzdata-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
     <!--<listitem>
       <para>Util-Linux &util-linux-version;</para>
       <para>Util-Linux &util-linux-version;</para>
     </listitem>-->
     </listitem>-->
@@ -237,11 +237,24 @@
   <itemizedlist>
   <itemizedlist>
     <title>Added:</title>
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
     <listitem><para></para></listitem>  <!-- satisfy build -->
+
+    <listitem>
+      <para>&bash-fixes-patch;</para>
+    </listitem>
+
+    <listitem>
+      <para>&perl-fix-patch;</para>
+    </listitem>
   </itemizedlist>
   </itemizedlist>
 
 
   <itemizedlist>
   <itemizedlist>
     <title>Removed:</title>
     <title>Removed:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
     <listitem><para></para></listitem>  <!-- satisfy build -->
+
+    <listitem>
+      <para>bash-4.3-upstream_fixes-3.patch</para>
+    </listitem>
+
   </itemizedlist>
   </itemizedlist>
 
 
 </sect1>
 </sect1>

+ 1 - 1
chapter03/introduction.xml

@@ -53,7 +53,7 @@
   <ulink url="../wget-list">wget-list</ulink> as an input to
   <ulink url="../wget-list">wget-list</ulink> as an input to
   <command>wget</command>. For example:</para>
   <command>wget</command>. For example:</para>
 
 
-<screen role="nodump"><userinput>wget -i wget-list -P $LFS/sources</userinput></screen>
+<screen role="nodump"><userinput>wget --input-file=wget-list --continue --directory-prefix=$LFS/sources</userinput></screen>
 
 
   <para>Additionally, starting with LFS-7.0, there is a separate file,
   <para>Additionally, starting with LFS-7.0, there is a separate file,
   <ulink url="../md5sums">md5sums</ulink>, which can be used to verify that all
   <ulink url="../md5sums">md5sums</ulink>, which can be used to verify that all

+ 8 - 0
chapter03/patches.xml

@@ -116,6 +116,14 @@
       </listitem>
       </listitem>
     </varlistentry>
     </varlistentry>
 
 
+    <varlistentry>
+      <term>Perl Data::Dumper Patch - <token>&perl-fix-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&perl-fix-patch;"/></para>
+        <para>MD5 sum: <literal>&perl-fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
     <varlistentry>
       <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
       <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
       <listitem>
       <listitem>

+ 9 - 14
chapter06/glibc.xml

@@ -115,15 +115,11 @@ cd ../glibc-build</userinput></screen>
     issues seen for this version of LFS:</para>
     issues seen for this version of LFS:</para>
 
 
     <itemizedlist>
     <itemizedlist>
-<!--
+
       <listitem>
       <listitem>
-        <para>The <emphasis>nptl/tst-clock2</emphasis>,
-        <emphasis>nptl/tst-attr3</emphasis>,
-        <emphasis>tst/tst-cputimer1</emphasis>, and
-        <emphasis>rt/tst-cpuclock2</emphasis>
-        tests have been known to fail.  The
-        reason is not completely understood, but indications are that minor
-        timing issues can trigger these failures.</para>
+        <para>The <emphasis>tst/tst-cputimer1</emphasis> test has been known to
+        fail.  The reason is not completely understood, but indications are
+        that minor timing issues can trigger this failure.</para>
       </listitem>
       </listitem>
 
 
       <listitem>
       <listitem>
@@ -131,7 +127,7 @@ cd ../glibc-build</userinput></screen>
         systems where the CPU is not a relatively new genuine Intel or
         systems where the CPU is not a relatively new genuine Intel or
         authentic AMD processor.</para>
         authentic AMD processor.</para>
       </listitem>
       </listitem>
-
+<!--
       <listitem>
       <listitem>
         <para>When running on older and slower hardware or on systems under
         <para>When running on older and slower hardware or on systems under
         load, some tests can fail because of test timeouts being exceeded.
         load, some tests can fail because of test timeouts being exceeded.
@@ -149,13 +145,12 @@ cd ../glibc-build</userinput></screen>
         <para>libio/tst-ftell-partial-wide.out fails because it needs a locale
         <para>libio/tst-ftell-partial-wide.out fails because it needs a locale
         that has not yet been generated.</para>
         that has not yet been generated.</para>
       </listitem>
       </listitem>
-
+-->
       <listitem>
       <listitem>
-        <para>Other tests known to fail on some architectures are posix/bug-regex32,
-        misc/tst-writev, elf/check-textrel, nptl/tst-getpid2, nptl/tst-robust8,
-        and stdio-common/bug22.</para>
+        <para>Other tests known to fail on some architectures are
+        malloc/tst-malloc-usable and  nptl/tst-cleanupx4. </para>
       </listitem>
       </listitem>
--->
+
     </itemizedlist>
     </itemizedlist>
 
 
     <para>Though it is a harmless message, the install stage of Glibc will
     <para>Though it is a harmless message, the install stage of Glibc will

+ 0 - 4
chapter06/grub.xml

@@ -40,10 +40,6 @@
   <sect2 role="installation">
   <sect2 role="installation">
     <title>Installation of GRUB</title>
     <title>Installation of GRUB</title>
 
 
-    <para>Fix an incompatibility between this package and Glibc-&glibc-version;:</para>
-
-<screen><userinput remap="pre">sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h</userinput></screen>
-
     <para>Prepare GRUB for compilation:</para>
     <para>Prepare GRUB for compilation:</para>
 
 
 <screen><userinput remap="configure">./configure --prefix=/usr          \
 <screen><userinput remap="configure">./configure --prefix=/usr          \

+ 0 - 4
chapter06/man-db.xml

@@ -41,10 +41,6 @@
   <sect2 role="installation">
   <sect2 role="installation">
     <title>Installation of Man-DB</title>
     <title>Installation of Man-DB</title>
 
 
-    <para>Disable two tests that fail:</para>
-
-<screen><userinput remap="pre">sed -i 's/mandb-2 mandb-3 mandb-4/mandb-3/' src/tests/Makefile.in</userinput></screen>
-    
     <para>Prepare Man-DB for compilation:</para>
     <para>Prepare Man-DB for compilation:</para>
 
 
 <screen><userinput remap="configure">./configure --prefix=/usr                          \
 <screen><userinput remap="configure">./configure --prefix=/usr                          \

+ 4 - 0
chapter06/perl.xml

@@ -56,6 +56,10 @@
 <screen><userinput remap="pre">export BUILD_ZLIB=False
 <screen><userinput remap="pre">export BUILD_ZLIB=False
 export BUILD_BZIP2=0</userinput></screen>
 export BUILD_BZIP2=0</userinput></screen>
 
 
+    <para>Fix a potential security problem:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&perl-fix-patch;</userinput></screen>
+
     <para>To have full control over the way Perl is set up, you can remove the
     <para>To have full control over the way Perl is set up, you can remove the
     <quote>-des</quote> options from the following command and hand-pick the way
     <quote>-des</quote> options from the following command and hand-pick the way
     this package is built. Alternatively, use the command exactly as below to
     this package is built. Alternatively, use the command exactly as below to

+ 9 - 9
packages.ent

@@ -275,10 +275,10 @@
 <!ENTITY groff-ch6-du "83 MB">
 <!ENTITY groff-ch6-du "83 MB">
 <!ENTITY groff-ch6-sbu "0.6 SBU">
 <!ENTITY groff-ch6-sbu "0.6 SBU">
 
 
-<!ENTITY grub-version "2.00">
-<!ENTITY grub-size "5,016 KB">
-<!ENTITY grub-url "&gnu;grub/grub-&grub-version;.tar.xz">
-<!ENTITY grub-md5 "a1043102fbc7bcedbf53e7ee3d17ab91">
+<!ENTITY grub-version "2.02~beta2">
+<!ENTITY grub-size "5,663 KB">
+<!ENTITY grub-url "http://alpha.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
+<!ENTITY grub-md5 "be62932eade308a364ea4bbc91295930">
 <!ENTITY grub-home "&gnu-software;grub/">
 <!ENTITY grub-home "&gnu-software;grub/">
 <!ENTITY grub-ch6-du "110 MB">
 <!ENTITY grub-ch6-du "110 MB">
 <!ENTITY grub-ch6-sbu "0.8 SBU">
 <!ENTITY grub-ch6-sbu "0.8 SBU">
@@ -413,10 +413,10 @@
 <!ENTITY make-ch6-du "11.8 MB">
 <!ENTITY make-ch6-du "11.8 MB">
 <!ENTITY make-ch6-sbu "0.5 SBU">
 <!ENTITY make-ch6-sbu "0.5 SBU">
 
 
-<!ENTITY man-db-version "2.7.0.1">
+<!ENTITY man-db-version "2.7.0.2">
 <!ENTITY man-db-size "1,457 KB">
 <!ENTITY man-db-size "1,457 KB">
 <!ENTITY man-db-url "&savannah;/releases/man-db/man-db-&man-db-version;.tar.xz">
 <!ENTITY man-db-url "&savannah;/releases/man-db/man-db-&man-db-version;.tar.xz">
-<!ENTITY man-db-md5 "7961179a2d8fb4c8f3947c92e80ee232">
+<!ENTITY man-db-md5 "8ea7be9daf7af7da0fcd619e3da3991c">
 <!ENTITY man-db-home "http://www.nongnu.org/man-db/">
 <!ENTITY man-db-home "http://www.nongnu.org/man-db/">
 <!ENTITY man-db-ch6-du "28 MB">
 <!ENTITY man-db-ch6-du "28 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
@@ -562,10 +562,10 @@
 <!ENTITY texinfo-ch6-du "99 MB">
 <!ENTITY texinfo-ch6-du "99 MB">
 <!ENTITY texinfo-ch6-sbu "0.6 SBU">
 <!ENTITY texinfo-ch6-sbu "0.6 SBU">
 
 
-<!ENTITY tzdata-version "2014g">
-<!ENTITY tzdata-size "279 KB">
+<!ENTITY tzdata-version "2014h">
+<!ENTITY tzdata-size "280 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "f9f59425e55b21d2e52bb3a95fc17b8d">
+<!ENTITY tzdata-md5 "ed05111948beba8a0f30956baa46b272">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 
 
 <!ENTITY util-linux-version "2.25.1">
 <!ENTITY util-linux-version "2.25.1">

+ 7 - 3
patches.ent

@@ -2,9 +2,9 @@
 
 
 <!-- Start of Common Patches -->
 <!-- Start of Common Patches -->
 
 
-<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-4.patch">
-<!ENTITY bash-fixes-patch-md5 "9233ba62610d4eb3f45ed57073d4273b">
-<!ENTITY bash-fixes-patch-size "40 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-5.patch">
+<!ENTITY bash-fixes-patch-md5 "65f72a5b5fc7c36970347a26ec0f0e99">
+<!ENTITY bash-fixes-patch-size "37 KB">
 
 
 <!ENTITY binutils-lto-patch "binutils-&binutils-version;-load_gcc_lto_plugin_by_default-1.patch">
 <!ENTITY binutils-lto-patch "binutils-&binutils-version;-load_gcc_lto_plugin_by_default-1.patch">
 <!ENTITY binutils-lto-patch-md5 "48e4e96a60bfed41804aaecf4944f5d9">
 <!ENTITY binutils-lto-patch-md5 "48e4e96a60bfed41804aaecf4944f5d9">
@@ -53,6 +53,10 @@
 <!ENTITY mpfr-fixes-patch-md5 "2b2aa4371a4e848411639356fd82becf">
 <!ENTITY mpfr-fixes-patch-md5 "2b2aa4371a4e848411639356fd82becf">
 <!ENTITY mpfr-fixes-patch-size "40 KB">
 <!ENTITY mpfr-fixes-patch-size "40 KB">
 
 
+<!ENTITY perl-fix-patch "perl-&perl-version;-infinite_recurse_fix-1.patch">
+<!ENTITY perl-fix-patch-md5 "579dfed34e97e0a2fe21b74aa53946ac">
+<!ENTITY perl-fix-patch-size "11 KB">
+
 <!ENTITY readline-fixes-patch "readline-6.3-upstream_fixes-2.patch">
 <!ENTITY readline-fixes-patch "readline-6.3-upstream_fixes-2.patch">
 <!ENTITY readline-fixes-patch-md5 "97f74f1c3c83008f268b32d36e9fd376">
 <!ENTITY readline-fixes-patch-md5 "97f74f1c3c83008f268b32d36e9fd376">
 <!ENTITY readline-fixes-patch-size "4 KB">
 <!ENTITY readline-fixes-patch-size "4 KB">