Changeset 146620c

Timestamp:

02/07/2015 12:34:45 AM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.7-systemd, 7.8-systemd, 7.9-systemd

Children:

6658e86

Parents:

930578e4

Message:

Merged latest change from trunk.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/systemd@10831 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (1 diff)
• chapter03/patches.xml (modified) (2 diffs)
• chapter06/bash.xml (modified) (1 diff)
• patches.ent (modified) (2 diffs)

chapter01/changelog.xml

@@ -40 +40 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Add bash patches through patch-033.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update mpfr patches through patch-11.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to util-linux-2.26-rc2. Intermediate 
           fix prior to stable util-linux-2.26.</para>

chapter01/whatsnew.xml

@@ -240 +240 @@
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
-    <!--
     <listitem>
       <para>&bash-fixes-patch;</para>
     </listitem>
-    -->
+
+    <listitem>
+      <para>&mpfr-fixes-patch;</para>
+    </listitem>
 
     <listitem>

chapter03/patches.xml

@@ -18 +18 @@
 
   <variablelist role="materials">
-<!--
+
     <varlistentry>
       <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
@@ -26 +26 @@
       </listitem>
     </varlistentry>
--->
+
     <varlistentry>
       <term>Bc Memory Leak Patch - <token>&bc-memory-leak-patch-size;</token>:</term>

chapter06/bash.xml

@@ -40 +40 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
-<!--
+
     <para>First, apply the following patch to fix various bugs that have been
     addressed upstream:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
--->
+
     <para>Prepare Bash for compilation:</para>
 

patches.ent

@@ -2 +2 @@
 
 <!-- Start of Common Patches -->
+
+<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-1.patch">
+<!ENTITY bash-fixes-patch-md5 "e2571929a43fdf76ae1eb683fe86b5c0">
+<!ENTITY bash-fixes-patch-size "8.8 KB">
 
 <!ENTITY bc-memory-leak-patch "bc-&bc-version;-memory_leak-1.patch">
@@ -23 +27 @@
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
-<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-upstream_fixes-2.patch">
-<!ENTITY mpfr-fixes-patch-md5 "2b2aa4371a4e848411639356fd82becf">
-<!ENTITY mpfr-fixes-patch-size "40 KB">
+<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-upstream_fixes-3.patch">
+<!ENTITY mpfr-fixes-patch-md5 "5ba8bafe42920d6e570567529629bc59">
+<!ENTITY mpfr-fixes-patch-size "38 KB">
 
 <!ENTITY perl-fix-patch "perl-&perl-version;-infinite_recurse_fix-1.patch">