From aa196b1e7217f6d807348d788af54ada2d465aa4 Mon Sep 17 00:00:00 2001
From: Thomas Trepl <thomas@linuxfromscratch.org>
Date: Fri, 19 Apr 2019 05:07:48 +0000
Subject: [PATCH] Apply upstream changes Fix invalid name in 5.7 at mx32 sanity
 check

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11579 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml    | 22 ++++++++++++++++++++++
 chapter01/whatsnew.xml     |  8 ++++----
 chapter05/glibc.xml        |  2 +-
 chapter06/createfiles.xml  |  4 ----
 chapter06/creatingdirs.xml |  7 +++++--
 general.ent                |  6 +++---
 packages.ent               | 20 ++++++++++----------
 7 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9228a1d83..2de9bcfe8 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -45,6 +45,28 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2019-04-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update bzip2 url. Fixes
+          <ulink url="&lfs-ticket-root;4450">#4450</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.33.2. Fixes
+          <ulink url="&lfs-ticket-root;4454">#4454</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.0.7. Fixes
+          <ulink url="&lfs-ticket-root;4449">#4449</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gawk-5.0.0. Fixes
+          <ulink url="&lfs-ticket-root;4455">#4455</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2019-03-27</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index c77d5dfbe..52f3c9f3c 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -89,9 +89,9 @@
     <!--<listitem>
       <para>Flex-&flex-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Gawk-&gawk-version;</para>
-   </listitem>-->
+   </listitem>
    <listitem>
       <para>GCC-&gcc-version;</para>
    </listitem>
@@ -242,9 +242,9 @@
    <listitem>
       <para>Tzdata-&tzdata-version;</para>
    </listitem>
-   <!--<listitem>
+   <listitem>
       <para>Util-Linux-&util-linux-version;</para>
-   </listitem>-->
+   </listitem>
     <!--<listitem>
       <para>Vim-&vim-version;</para>
     </listitem>-->
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 5fda52645..9ed9afa39 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -297,7 +297,7 @@ readelf -l a.out | grep ': /tools'</userinput></screen>
 
     <para>Output should be like:</para>
 
-<screen><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux-x32.so.2]</computeroutput></screen>
+<screen><computeroutput>[Requesting program interpreter: /tools/libx32/ld-linux-x32.so.2]</computeroutput></screen>
 
     <para>If the output is not shown as above or there was no output at all,
     then something is wrong. Investigate and retrace the steps to find out
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 7a9f203b5..26dd32542 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -44,20 +44,16 @@ ln -sv /tools/bin/{env,install,perl,printf}         /usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1}                  /usr/lib
 ln -sv /tools/lib/libstdc++.{a,so{,.6}}             /usr/lib
 
-install -vdm755 /usr/lib/pkgconfig
-
 ln -sv bash /bin/sh</userinput></screen>
 
 <screen arch="ml_32,ml_x32,ml_all"><userinput arch="ml_32,ml_all">
 ln -sv /tools/lib32/libgcc_s.so{,.1}               /usr/lib32
 ln -sv /tools/lib32/libstdc++.{a,so{,.6}}          /usr/lib32
-install -vdm755 /usr/lib32/pkgconfig
 </userinput>
 <userinput arch="ml_x32,ml_all">
 ln -sv /tools/libx32/libgcc_s.so{,.1}              /usr/libx32
 ln -sv /tools/libx32/libstdc++.{a,so{,.6}}         /usr/libx32
 ln -sv /usr/libx32 /
-install -vdm755 /usr/libx32/pkgconfig
 </userinput></screen>
 
 <!--for lib in blkid lzma mount uuid
diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml
index d930e909e..c080752ea 100644
--- a/chapter06/creatingdirs.xml
+++ b/chapter06/creatingdirs.xml
@@ -22,6 +22,7 @@ mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man}
 mkdir -v  /usr/{,local/}share/{misc,terminfo,zoneinfo}
 mkdir -v  /usr/libexec
 mkdir -pv /usr/{,local/}share/man/man{1..8}
+mkdir -v  /usr/lib/pkgconfig
 
 case $(uname -m) in
  x86_64) mkdir -v /lib64 ;;
@@ -45,8 +46,10 @@ mkdir -v /var/{log,mail,spool}
 ln -sv /run /var/run
 ln -sv /run/lock /var/lock
 mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}</userinput>
-<userinput arch="ml_32,ml_all">mkdir -pv /usr/lib32</userinput>
-<userinput arch="ml_x32,ml_all">mkdir -pv /usr/libx32</userinput></screen>
+<userinput arch="ml_32,ml_all">mkdir -pv /usr/lib32
+install -vdm755 /usr/lib32/pkgconfig</userinput>
+<userinput arch="ml_x32,ml_all">mkdir -pv /usr/libx32
+install -vdm755 /usr/libx32/pkgconfig</userinput></screen>
 
   <para>Directories are, by default, created with permission mode 755, but
   this is not desirable for all directories. In the commands above, two
diff --git a/general.ent b/general.ent
index 5dd21d3b8..95421d613 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20190327">
+<!ENTITY version         "SVN-20190415">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20190327-systemd">
+<!ENTITY versiond        "20190415-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "March 27, 2019">
+<!ENTITY releasedate     "April 15, 2019">
 
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.5">
diff --git a/packages.ent b/packages.ent
index e5957a14c..43d3fea47 100644
--- a/packages.ent
+++ b/packages.ent
@@ -82,7 +82,7 @@
 
 <!ENTITY bzip2-version "1.0.6">
 <!ENTITY bzip2-size "764 KB">
-<!ENTITY bzip2-url "&anduin-sources;/bzip2-&bzip2-version;.tar.gz">
+<!ENTITY bzip2-url "https://www.sourceware.org/pub/bzip2/bzip2-&bzip2-version;.tar.gz">
 <!ENTITY bzip2-md5 "00b516f4704d4a7cb50a1d97e6e8e15b">
 <!--<!ENTITY bzip2-home "http://www.bzip.org/">-->
 <!ENTITY bzip2-ch5-du "5.5 MB">
@@ -212,10 +212,10 @@
 <!ENTITY flex-ch6-du "35 MB">
 <!ENTITY flex-ch6-sbu "0.4 SBU">
 
-<!ENTITY gawk-version "4.2.1">
-<!ENTITY gawk-size "2,916 KB">
+<!ENTITY gawk-version "5.0.0">
+<!ENTITY gawk-size "2,931 KB">
 <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz">
-<!ENTITY gawk-md5 "95cf553f50ec9f386b5dfcd67f30180a">
+<!ENTITY gawk-md5 "129d061e362778cad070d1bbfe2b1183">
 <!ENTITY gawk-home "&gnu-software;gawk/">
 <!ENTITY gawk-ch5-du "43 MB">
 <!ENTITY gawk-ch5-sbu "0.2 SBU">
@@ -431,12 +431,12 @@
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "0">
-<!ENTITY linux-patch-version "4">
+<!ENTITY linux-patch-version "7">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "102,784 KB">
+<!ENTITY linux-size "102,779 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "8753b1dc0a3946c41b8d628f6fa18e42">
+<!ENTITY linux-md5 "e4eb618cafb57cf25b8ff28f923d0319">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -704,10 +704,10 @@
 <!ENTITY udev-lfs-home    " ">
 
 <!ENTITY util-linux-minor "2.33">
-<!ENTITY util-linux-version "2.33.1"> <!-- 2.33.x -->
-<!ENTITY util-linux-size "4,542 KB">
+<!ENTITY util-linux-version "2.33.2"> <!-- 2.33.x -->
+<!ENTITY util-linux-size "4,597 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "6fcfea2043b5ac188fd3eed56aeb5d90">
+<!ENTITY util-linux-md5 "91653b90fcbe9c161153e39b8cc69fb5">
 <!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
 <!ENTITY util-linux-ch5-du "147 MB">
 <!ENTITY util-linux-ch5-sbu "1 SBU">