Changeset f18f2d6

Timestamp:

07/24/2021 03:45:09 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

3388c22

Parents:

cfb8eea (diff), 9f84752 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (1 diff)
• chapter03/patches.xml (modified) (2 diffs)
• chapter08/systemd.xml (modified) (1 diff)
• packages.ent (modified) (3 diffs)
• patches.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -46 +46 @@
     -->
     <listitem>
+      <para>2021-07-23</para>
+      <itemizedlist>
+        <listitem revision="systemd">
+          <para>[renodr] - Guard systemd against CVE-2021-33910. Fixes
+          <ulink url="&lfs-ticket-root;4889">#4889</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to meson-0.59.0. Fixes
+          <ulink url="&lfs-ticket-root;4888">#4888</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to binutils-2.37. Fixes
+          <ulink url="&lfs-ticket-root;4887">#4887</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to less-590. Fixes
+          <ulink url="&lfs-ticket-root;4884">#4884</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-07-22</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -49 +49 @@
       <para>Bc &bc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Binutils-&binutils-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Bison-&bison-version;</para>

chapter03/patches.xml

@@ -120 +120 @@
     </varlistentry>
 
-<!--
     <varlistentry revision="systemd">
       <term>Systemd Upstream Fixes Patch - <token>&systemd-upstream-fixes-patch-size;</token>:</term>
@@ -128 +127 @@
       </listitem>
     </varlistentry>
--->
 
   </variablelist>

chapter08/systemd.xml

@@ -41 +41 @@
     <title>Installation of systemd</title>
 
-<!--
-    <para>First, apply a patch to fix the build with GCC-10 and fix a segfault:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-gcc_10-fixes-2.patch</userinput></screen>
--->
-
-    <!-- For linux-5.11's API headers changing the rfkill_event structure
-    <para>First, apply a patch to fix some build issues:</para>
+    <!--Fix CVE-2021-33910 -->
+    <para>First, apply a patch to fix a security vulnerability:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
--->
 
 <!-- Seems to be not needed anymore with 248

packages.ent

@@ -66 +66 @@
 <!ENTITY bc-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY binutils-version "2.36.1">
-<!ENTITY binutils-size "22,239 KB">
+<!ENTITY binutils-version "2.37">
+<!ENTITY binutils-size "22,390 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.xz">
-<!ENTITY binutils-md5 "628d490d976d8957279bbbff06cf29d4">
+<!ENTITY binutils-md5 "e78d9ff2976b745a348f4c1f27c77cb1">
 <!ENTITY binutils-home "&gnu-software;binutils/">
 <!ENTITY binutils-tmpp1-du "640 MB">
@@ -384 +384 @@
 <!ENTITY kmod-fin-sbu "0.1 SBU">
 
-<!ENTITY less-version "581">
-<!ENTITY less-size "341 KB">
+<!ENTITY less-version "590">
+<!ENTITY less-size "348 KB">
 <!ENTITY less-url "https://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
-<!ENTITY less-md5 "6201df5b9dae2af9767fc220471471b3">
+<!ENTITY less-md5 "f029087448357812fba450091a1172ab">
 <!ENTITY less-home "https://www.greenwoodsoftware.com/less/">
 <!ENTITY less-fin-du "4.1 MB">
@@ -497 +497 @@
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.58.1">
-<!ENTITY meson-size "1,852 KB">
+<!ENTITY meson-version "0.59.0">
+<!ENTITY meson-size "1,896 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "7e10667e08159a61c4f524b148799ec8">
+<!ENTITY meson-md5 "bb8bf3898afefc8272989e4be8ff0a5b">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "37 MB">

patches.ent

@@ -73 +73 @@
 <!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
 
-<!--
 <!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-1.patch">
-<!ENTITY systemd-upstream-fixes-patch-md5 "6819d49562ac48b551d15d2dd0123055">
-<!ENTITY systemd-upstream-fixes-patch-size "8 KB">
--->
+<!ENTITY systemd-upstream-fixes-patch-md5 "a4449dedf514486b8995ee501d1bb8cc">
+<!ENTITY systemd-upstream-fixes-patch-size "4 KB">