Merged trunk. Updated to dbus-1.8.20, systemd-222.

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

13 files changed, 170 insertions, 69 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a1b5928d2..ffc42dbe7 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,93 @@
 -->
 
     <listitem>
+      <para>2015-07-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Fixed a warning in the intltool-update
+          perl script caused by perl-5.22.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Updated to dbus-1.8.20.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Updated to systemd-222.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-07-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gcc-5.2.0. Fixes
+          <ulink url="&lfs-ticket-root;3819">*3819</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.19.5.1. Fixes
+          <ulink url="&lfs-ticket-root;3818">*3818</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kbd-2.0.3. Fixes
+          <ulink url="&lfs-ticket-root;3815">#3815</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-07-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-4.1.1. Fixes
+          <ulink url="&lfs-ticket-root;3811">*3811</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to file-5.24. Fixes
+          <ulink url="&lfs-ticket-root;3812">*3812</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.1.2. Fixes
+          <ulink url="&lfs-ticket-root;3814">#3814</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.19.5. Fixes
+          <ulink url="&lfs-ticket-root;3813">#3813</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Fix a warning in the installed automake 
+          perl script.
+          <ulink url="&lfs-ticket-root;3809">#3809</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-07-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-4.1.0. Fixes
+          <ulink url="&lfs-ticket-root;3802">*3802</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to texinfo-6.0. Fixes
+          <ulink url="&lfs-ticket-root;3803">*3803</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.1.1. Fixes
+          <ulink url="&lfs-ticket-root;3805">#3805</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to coreutils-8.24. Fixes
+          <ulink url="&lfs-ticket-root;3806">#3806</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update perl installed files. Fixes
+          <ulink url="&lfs-ticket-root;3804">#3804</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2015-06-28</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 8986cb858..7ed750be0 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -52,9 +52,9 @@
     <!--<listitem>
       <para>Check &check-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Coreutils &coreutils-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>D-Bus-&dbus-version;</para>
     </listitem>
@@ -91,9 +91,9 @@
     <!--<listitem>
       <para>GDBM &gdbm-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Gettext &gettext-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Glibc &glibc-version;</para>
     </listitem>-->
@@ -127,9 +127,9 @@
     <listitem>
       <para>IPRoute2 &iproute2-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Kbd &kbd-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Kmod &kmod-version;</para>
     </listitem>
@@ -202,9 +202,9 @@
     <!--<listitem>
       <para>Tcl-core-&tcl-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Texinfo &texinfo-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Tzdata &tzdata-version;</para>
     </listitem>
@@ -241,11 +241,11 @@
     <listitem>
       <para>&bash-fixes-patch;</para>
     </listitem>
-
+<!--
     <listitem>
       <para>&gcc-upstream-patch;</para>
     </listitem>
-
+-->
     <listitem>
       <para>&ncurses-gcc5-buildfixes-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 92b21ff90..a8d6f5389 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -91,6 +91,8 @@
       </listitem>
     </varlistentry>
 -->
+
+<!--
     <varlistentry>
       <term>Gcc Upstream Patch - <token>&gcc-upstream-patch-size;</token>:</term>
       <listitem>
@@ -98,7 +100,7 @@
         <para>MD5 sum: <literal>&gcc-upstream-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 9c8132d2b..761755018 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -41,6 +41,10 @@
   <sect2 role="installation">
     <title>Installation of Automake</title>
 
+    <para>First fix a warning that is caused by perl-5.22 and later:</para>
+
+<screen><userinput remap="pre">sed -i 's:/\\\${:/\\\$\\{:' bin/automake.in</userinput></screen>
+
     <para>Prepare Automake for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 7721830ad..3715ea8dd 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -49,12 +49,15 @@
     <para>POSIX requires that programs from Coreutils recognize character
     boundaries correctly even in multibyte locales. The following patch fixes
     this non-compliance and other internationalization-related bugs.
-    Afterwards make sure the timestamp for <filename>Makefile.in</filename> is
+    <!--Afterwards make sure the timestamp for <filename>Makefile.in</filename> is
     later than all other files to prevent a <command>make</command>
-    error:</para>
+    error:</para>-->
+    Afterwards disable a test that fails with the current version of perl.</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch; 
-touch Makefile.in</userinput></screen>
+sed -i '/tests\/misc\/sort.pl/ d' Makefile.in</userinput></screen>
+
+<!--touch Makefile.in</userinput></screen>-->
 
     <note>
       <para>In the past, many bugs were found in this patch. When reporting new
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 406bf26f7..bf381204d 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -40,11 +40,11 @@
 
   <sect2 role="installation">
     <title>Installation of GCC</title>
-
+<!--
     <para>First apply some fixes from the upstream repository:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-patch;</userinput></screen>
-
+-->
     <para>The GCC documentation recommends building GCC outside of the source
     directory in a dedicated build directory:</para>
 
diff --git a/chapter06/intltool.xml b/chapter06/intltool.xml
index af71ca422..9e9ebad20 100644
--- a/chapter06/intltool.xml
+++ b/chapter06/intltool.xml
@@ -41,6 +41,10 @@
   <sect2 role="installation">
     <title>Installation of Intltool</title>
 
+    <para>First fix a warning that is caused by perl-5.22 and later:</para>
+
+<screen><userinput remap="pre">sed -i 's:\\\${:\\\$\\{:' intltool-update.in</userinput></screen>
+
     <para>Prepare Intltool for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 2a6cbf637..9d286210f 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -56,8 +56,17 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
 <!-- Save as comments for now    
     <para>Remove a compiler flag that causes the compilation to fail:</para>
 <screen><userinput remap="pre">sed -i 's/-Werror//' Makefile</userinput></screen>
+
 -->
+<!--
+
+    <para>Do not build the unneeded tipc program.  Transparent Inter-process
+    Communication (TIPC) is a network communications protocol for Inter-process
+    communication (IPC) that was designed for intra-cluster
+    communication.</para>
 
+<screen><userinput remap="pre">sed -i 's/tipc //' Makefile</userinput></screen>
+-->
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
@@ -88,8 +97,8 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
         <seg>bridge, ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
         nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
         and tc</seg>
-        <seg>/etc/iproute2, /usr/lib/tc, /usr/share/doc/iproute2-&iproute2-version;,
-        and /usr/lib/tc</seg>
+        <seg>/etc/iproute2, /usr/lib/tc, and /usr/share/doc/iproute2-&iproute2-version;,
+        </seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 9d023e09d..1085712b5 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -135,7 +135,7 @@ unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>
-        <seg>a2p, c2ph, config_data, corelist, cpan, cpan2dist, cpanp,
+        <seg>a2p, c2ph, corelist, cpan, cpan2dist, cpanp,
         cpanp-run-perl, enc2xs, find2perl, h2ph, h2xs,
         instmodsh, json_pp, libnetcfg, perl, perl&perl-version; (link to perl),
         perlbug, perldoc, perlivp, perlthanks (link to perlbug), piconv, pl2pm,
@@ -173,16 +173,6 @@ unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="config_data">
-        <term><command>config_data</command></term>
-        <listitem>
-          <para>Queries or changes configuration of Perl modules</para>
-          <indexterm zone="ch-system-perl config_data">
-            <primary sortas="b-config_data">config_data</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="corelist">
         <term><command>corelist</command></term>
         <listitem>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 3c5eab72f..8a86cb385 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -129,8 +129,8 @@ EOF</userinput></screen>
         <term><parameter>--without-python</parameter></term>
         <listitem>
           <para>This switch prevents <command>configure</command>
-          from trying to use Python since it's not part
-          of LFS.</para>
+          from trying to use Python which isn't built
+          in LFS.</para>
         </listitem>
       </varlistentry>
 
diff --git a/general.ent b/general.ent
index 57101ae40..295226f38 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20150628-systemd">
+<!ENTITY version         "20150723-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "June 28, 2015">
+<!ENTITY releasedate     "July 23, 2015">
 <!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.8">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 885f53adc..b8236e102 100644
--- a/packages.ent
+++ b/packages.ent
@@ -95,22 +95,22 @@
 <!ENTITY check-ch5-du "11 MB">
 <!ENTITY check-ch5-sbu "0.1 SBU">
 
-<!ENTITY coreutils-version "8.23">
-<!ENTITY coreutils-size "5,250 KB">
+<!ENTITY coreutils-version "8.24">
+<!ENTITY coreutils-size "5,518 KB">
 <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
-<!ENTITY coreutils-md5 "abed135279f87ad6762ce57ff6d89c41">
+<!ENTITY coreutils-md5 "40efdbce865d2458d8da0a9dcee7c16c">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
 <!ENTITY coreutils-ch5-du "162 MB">
 <!ENTITY coreutils-ch5-sbu "0.6 SBU">
 <!ENTITY coreutils-ch6-du "193 MB">
 <!ENTITY coreutils-ch6-sbu "2.5 SBU">
 
-<!ENTITY dbus-version "1.8.18">
+<!ENTITY dbus-version "1.8.20">
 <!ENTITY dbus-size "1,828 KB">
 <!ENTITY dbus-url "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
-<!ENTITY dbus-md5 "83e607e9ccb1c921d5b6bbea2376a36c">
+<!ENTITY dbus-md5 "b49890bbabedab3a1c3f4f73c7ff8b2b">
 <!ENTITY dbus-home "http://www.freedesktop.org/wiki/Software/dbus">
-<!ENTITY dbus-ch6-du "43 MB">
+<!ENTITY dbus-ch6-du "35 MB">
 <!ENTITY dbus-ch6-sbu "0.4 SBU">
 
 <!ENTITY dejagnu-version "1.5.3">
@@ -159,10 +159,10 @@
 <!ENTITY expect-ch5-du "4.6 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
 
-<!ENTITY file-version "5.23">
+<!ENTITY file-version "5.24">
 <!ENTITY file-size "721 KB">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "61db35209ce71a6d576392ce6e1d2f80">
+<!ENTITY file-md5 "ec161b5a0d2aef147fb046e5630b1408">
 <!ENTITY file-home "http://www.darwinsys.com/file/">
 <!ENTITY file-ch5-du "16.9 MB">
 <!ENTITY file-ch5-sbu "0.1 SBU">
@@ -197,10 +197,10 @@
 <!ENTITY gawk-ch6-du "39 MB">
 <!ENTITY gawk-ch6-sbu "0.3 SBU">
 
-<!ENTITY gcc-version "5.1.0">
-<!ENTITY gcc-size "92,736 KB">
+<!ENTITY gcc-version "5.2.0">
+<!ENTITY gcc-size "92,990 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "d5525b1127d07d215960e6051c5da35e">
+<!ENTITY gcc-md5 "a51bcfeb3da7dd4c623e27207ed43467">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "2.5 GB">
 <!ENTITY gcc-ch5p1-sbu "7.6 SBU">
@@ -220,10 +220,10 @@
 <!ENTITY gdbm-ch6-du "12.6 MB">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
 
-<!ENTITY gettext-version "0.19.4">
-<!ENTITY gettext-size "6,501 KB">
+<!ENTITY gettext-version "0.19.5.1">
+<!ENTITY gettext-size "6,713 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "997c9070354eff5517115feaea6038f0">
+<!ENTITY gettext-md5 "9b7c37e410df4bd1bf854e8c897cf937">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-ch5-du "153 MB">
 <!ENTITY gettext-ch5-sbu "1.0 SBU">
@@ -317,18 +317,18 @@
 <!ENTITY intltool-ch6-du "1.3 MB">
 <!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY iproute2-version "4.0.0">
-<!ENTITY iproute2-size "449 KB">
+<!ENTITY iproute2-version "4.1.1">
+<!ENTITY iproute2-size "485 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "3adc263ade4ee76c35032e8f50b54108">
+<!ENTITY iproute2-md5 "39290cb3a55d38dd8d10e19a3094109f">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-ch6-du "10.6 MB">
 <!ENTITY iproute2-ch6-sbu "0.1 SBU">
 
-<!ENTITY kbd-version "2.0.2">
-<!ENTITY kbd-size "1000 KB">
+<!ENTITY kbd-version "2.0.3">
+<!ENTITY kbd-size "1,013 KB">
 <!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.xz">
-<!ENTITY kbd-md5 "87475eb78b1d6e6ab06686dd323ad4ba">
+<!ENTITY kbd-md5 "231b46e7142eb41ea3ae06d2ded3c208">
 <!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd">
 <!ENTITY kbd-ch6-du "34 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
@@ -375,12 +375,12 @@
 
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "1">
-<!ENTITY linux-patch-version "">
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
-<!ENTITY linux-size "81,073 KB">
+<!ENTITY linux-patch-version "2">
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
+<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
+<!ENTITY linux-size "81,072 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "fe9dc0f6729f36400ea81aa41d614c37">
+<!ENTITY linux-md5 "26879db288cd9ffa17c9fd5db213b272">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -525,12 +525,12 @@
 <!ENTITY shadow-ch6-du "52 MB">
 <!ENTITY shadow-ch6-sbu "0.2 SBU">
 
-<!ENTITY systemd-version "221">
-<!ENTITY systemd-size    "3,920 KB">
-<!ENTITY systemd-url     "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5     "b4d5a253841cf28a98b7ec99c45e3716">
+<!ENTITY systemd-version "222">
+<!ENTITY systemd-size    "3,516 KB">
+<!ENTITY systemd-url     "http://anduin.linuxfromscratch.org/sources/other/systemd/systemd-&systemd-version;.tar.xz">
+<!ENTITY systemd-md5     "8f69ebc4f93a1deddaacc06fefc37d62">
 <!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-ch6-du  "965 MB">
+<!ENTITY systemd-ch6-du  "920 MB">
 <!ENTITY systemd-ch6-sbu "2.2 SBU">
 
 <!ENTITY tar-version "1.28">
@@ -552,10 +552,10 @@
 <!ENTITY tcl-ch5-du "67 MB">
 <!ENTITY tcl-ch5-sbu "0.8 SBU">
 
-<!ENTITY texinfo-version "5.2">
-<!ENTITY texinfo-size "3,724 KB">
+<!ENTITY texinfo-version "6.0">
+<!ENTITY texinfo-size "3,991 KB">
 <!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.xz">
-<!ENTITY texinfo-md5 "cb489df8a7ee9d10a236197aefdb32c5">
+<!ENTITY texinfo-md5 "02818e62a5b8ae0213a7ff572991bb50">
 <!ENTITY texinfo-home "&gnu-software;texinfo/">
 <!ENTITY texinfo-ch5-du "100 MB">
 <!ENTITY texinfo-ch5-sbu "0.2 SBU">
diff --git a/patches.ent b/patches.ent
index d49ea98b6..6a75c761e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -15,12 +15,14 @@
 <!ENTITY bzip2-docs-patch-size "1.6 KB">
 
 <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
-<!ENTITY coreutils-i18n-patch-md5 "587051bc411e0da9b3bf8984b49b364e">
-<!ENTITY coreutils-i18n-patch-size "138 KB">
+<!ENTITY coreutils-i18n-patch-md5 "c6a5ccda1ca61de7c93b09d27a9a26d5">
+<!ENTITY coreutils-i18n-patch-size "141 KB">
 
+<!--
 <!ENTITY gcc-upstream-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
 <!ENTITY gcc-upstream-patch-md5 "f4d9c1a9c73c542a79e24780b1318533">
 <!ENTITY gcc-upstream-patch-size "72 KB">
+-->
 
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
@@ -51,5 +53,5 @@
 <!ENTITY readline-fixes-patch-size "8 KB">
 
 <!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
-<!ENTITY systemd-compat-patch-md5 "5b629e00a1a501a103b5561df3ccf148">
+<!ENTITY systemd-compat-patch-md5 "b9e6819a98debc1f10ba7b8112fc2a0e">
 <!ENTITY systemd-compat-patch-size "12 KB">