Changeset ecf55d8


Ignore:
Timestamp:
07/09/2021 06:29:57 AM (3 years ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
ml-11.0, multilib
Children:
aea9d3b
Parents:
d49a0358 (diff), 87119fd (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:
9 edited

Legend:

Unmodified
Added
Removed

  • appendices/dependencies.xml

    rd49a0358 recf55d8  
    13371337      </segmentedlist>
    13381338
     1339<!-- Begin Jinja2 dependency info -->
     1340  <bridgehead renderas="sect2" id="jinja2-dep">Jinja2</bridgehead>
     1341
     1342      <segmentedlist>
     1343        <segtitle>&dependencies;</segtitle>
     1344
     1345        <seglistitem>
     1346         <seg>MarkupSafe and Python</seg>
     1347        </seglistitem>
     1348      </segmentedlist>
     1349
     1350      <segmentedlist>
     1351        <segtitle>&testsuites;</segtitle>
     1352
     1353        <seglistitem>
     1354          <seg>No test suite available</seg>
     1355        </seglistitem>
     1356      </segmentedlist>
     1357
     1358      <segmentedlist>
     1359        <segtitle>&before;</segtitle>
     1360
     1361        <seglistitem>
     1362          <seg>Systemd</seg>
     1363        </seglistitem>
     1364      </segmentedlist>
     1365
     1366      <segmentedlist>
     1367        <segtitle>&external;</segtitle>
     1368
     1369        <seglistitem>
     1370          <seg>None</seg>
     1371        </seglistitem>
     1372      </segmentedlist>
     1373
    13391374<!-- Begin Kbd dependency info -->
    13401375  <bridgehead renderas="sect2" id="kbd-dep">Kbd</bridgehead>
    … …  
    17911826        <seglistitem>
    17921827          <seg>None</seg>
     1828        </seglistitem>
     1829      </segmentedlist>
     1830
     1831      <segmentedlist>
     1832        <segtitle>&external;</segtitle>
     1833
     1834        <seglistitem>
     1835          <seg>None</seg>
     1836        </seglistitem>
     1837      </segmentedlist>
     1838
     1839<!-- Begin MarkupSafe dependency info -->
     1840  <bridgehead renderas="sect2" id="markupsafe-dep">MarkupSafe</bridgehead>
     1841
     1842      <segmentedlist>
     1843        <segtitle>&dependencies;</segtitle>
     1844
     1845        <seglistitem>
     1846         <seg>Python</seg>
     1847        </seglistitem>
     1848      </segmentedlist>
     1849
     1850      <segmentedlist>
     1851        <segtitle>&testsuites;</segtitle>
     1852
     1853        <seglistitem>
     1854          <seg>No test suite available</seg>
     1855        </seglistitem>
     1856      </segmentedlist>
     1857
     1858      <segmentedlist>
     1859        <segtitle>&before;</segtitle>
     1860
     1861        <seglistitem>
     1862          <seg>Jinja2</seg>
    17931863        </seglistitem>
    17941864      </segmentedlist>

  • chapter01/changelog.xml

    rd49a0358 recf55d8  
    4646    -->
    4747    <listitem>
     48      <para>2021-07-08</para>
     49      <itemizedlist>
     50        <listitem revision="systemd">
     51          <para>[renodr] - Added Jinja2-3.0.1.</para>
     52        </listitem>
     53        <listitem revision="systemd">
     54          <para>[renodr] - Added MarkupSafe-2.0.1.</para>
     55        </listitem>
     56        <listitem>
     57          <para>[renodr] - Update to texinfo-6.8. Fixes
     58          <ulink url="&lfs-ticket-root;4880">#4880</ulink>.</para>
     59        </listitem>
     60        <listitem>
     61          <para>[renodr] - Update to iproute2-5.13.0. Fixes
     62          <ulink url="&lfs-ticket-root;4879">#4879</ulink>.</para>
     63        </listitem>
     64        <listitem>
     65          <para>[renodr] - Update to Python-3.9.6 (Security Update). Fixes
     66          <ulink url="&lfs-ticket-root;4878">#4878</ulink>.</para>
     67        </listitem>
     68        <listitem revision="systemd">
     69          <para>[renodr] - Update to systemd-249 (Security Update). Fixes
     70          <ulink url="&lfs-ticket-root;4882">#4882</ulink>.</para>
     71        </listitem>
     72        <listitem>
     73          <para>[renodr] - Update to Linux-5.13.1. Fixes
     74          <ulink url="&lfs-ticket-root;4873">#4873</ulink>.</para>
     75        </listitem>
     76      </itemizedlist>
     77    </listitem>
     78
     79    <listitem>
    4880      <para>2021-07-01</para>
    4981      <itemizedlist>

  • chapter01/whatsnew.xml

    rd49a0358 recf55d8  
    139139      <para>IPRoute2-&iproute2-version;</para>
    140140    </listitem>
     141    <!--<listitem revision="systemd">
     142      <para>Jinja2-&jinja2-version;</para>
     143    </listitem>-->
    141144    <!--<listitem>
    142145      <para>Kbd-&kbd-version;</para>
    … …  
    181184      <para>Man-pages-&man-pages-version;</para>
    182185    </listitem>
     186    <!--<listitem revision="systemd">
     187      <para>MarkupSafe-&markupsafe-version;</para>
     188    </listitem>-->
    183189    <listitem>
    184190      <para>Meson-&meson-version;</para>
    … …  
    241247      <para>Tcl-&tcl-version;</para>
    242248    </listitem>-->
    243     <!--<listitem>
     249    <listitem>
    244250      <para>Texinfo-&texinfo-version;</para>
    245     </listitem>-->
     251    </listitem>
    246252    <!--<listitem>
    247253      <para>Tzdata-&tzdata-version;</para>
    … …  
    285291      <para>gcc-11.1.0-upstream_fixes-1.patch</para>
    286292    </listitem>
    287     <listitem>
    288       <para>systemd-247-upstream_fixes-2.patch</para>
    289     </listitem>
    290     <listitem>
    291       <para>systemd-247-upstream_fixes-1.patch</para>
     293    <listitem revision="systemd">
     294      <para>MarkupSafe-&markupsafe-version;</para>
     295    </listitem>
     296    <listitem revision="systemd">
     297      <para>Jinja2-&jinja2-version;</para>
    292298    </listitem>
    293299

  • chapter03/packages.xml

    rd49a0358 recf55d8  
    356356    </varlistentry>
    357357
     358    <varlistentry revision="systemd">
     359      <term>Jinja2 (&jinja2-version;) - <token>&jinja2-size;</token>:</term>
     360      <listitem>
     361        <para>Home page: <ulink url="&jinja2-home;"/></para>
     362        <para>Download: <ulink url="&jinja2-url;"/></para>
     363        <para>MD5 sum: <literal>&jinja2-md5;</literal></para>
     364      </listitem>
     365    </varlistentry>
     366
    358367    <varlistentry>
    359368      <term>Kbd (&kbd-version;) - <token>&kbd-size;</token>:</term>
    … …  
    484493        <para>Download: <ulink url="&man-pages-url;"/></para>
    485494        <para>MD5 sum: <literal>&man-pages-md5;</literal></para>
     495      </listitem>
     496    </varlistentry>
     497
     498    <varlistentry revision="systemd">
     499      <term>MarkupSafe (&markupsafe-version;) - <token>&markupsafe-size;</token>:</term>
     500      <listitem>
     501        <para>Home page: <ulink url="&markupsafe-home;"/></para>
     502        <para>Download: <ulink url="&markupsafe-url;"/></para>
     503        <para>MD5 sum: <literal>&markupsafe-md5;</literal></para>
    486504      </listitem>
    487505    </varlistentry>

  • chapter03/patches.xml

    rd49a0358 recf55d8  
    111111    </varlistentry>
    112112
     113<!--
    113114    <varlistentry revision="systemd">
    114115      <term>Systemd Upstream Fixes Patch - <token>&systemd-upstream-fixes-patch-size;</token>:</term>
    … …  
    118119      </listitem>
    119120    </varlistentry>
     121-->
    120122
    121123  </variablelist>

  • chapter08/chapter08.xml

    rd49a0358 recf55d8  
    8585
    8686  <!-- systemd only -->
     87  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="markupsafe.xml"/>
     88  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jinja2.xml"/>
    8789  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
    8890  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>

  • chapter08/systemd.xml

    rd49a0358 recf55d8  
    4747-->
    4848
    49     <!-- For linux-5.11's API headers changing the rfkill_event structure -->
     49    <!-- For linux-5.11's API headers changing the rfkill_event structure
    5050    <para>First, apply a patch to fix some build issues:</para>
    5151
    5252<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
     53-->
    5354
    5455<!-- Seems to be not needed anymore with 248
    … …  
    5859-->
    5960
    60     <para>Remove an unneeded group,
    61     <systemitem class="groupname">render</systemitem>, from the default udev
     61    <para>Remove two unneeded groups,
     62    <systemitem class="groupname">render</systemitem> and
     63    <systemitem class="groupname">sgx</systemitem>, from the default udev
    6264    rules:</para>
    6365
    64 <screen><userinput remap="pre">sed -i 's/GROUP="render"/GROUP="video"/' rules.d/50-udev-default.rules.in</userinput></screen>
     66 <screen><userinput remap="pre"> sed -i -e 's/GROUP="render"/GROUP="video"/' \
     67        -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
    6568
    6669    <para>Prepare systemd for compilation:</para>

  • packages.ent

    rd49a0358 recf55d8  
    344344<!ENTITY intltool-fin-sbu "less than 0.1 SBU">
    345345
    346 <!ENTITY iproute2-version "5.12.0">
    347 <!ENTITY iproute2-size "820 KB">
     346<!ENTITY iproute2-version "5.13.0">
     347<!ENTITY iproute2-size "828 KB">
    348348<!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
    349 <!ENTITY iproute2-md5 "bbebacdabd4628ff86453ef4771a242a">
     349<!ENTITY iproute2-md5 "15fc3786303a173a14e180afe4cd2ecd">
    350350<!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
    351351<!ENTITY iproute2-fin-du "15 MB">
    … …  
    360360<!ENTITY isl-fin-sbu "0.1 SBU">
    361361
     362<!ENTITY jinja2-version "3.0.1">
     363<!ENTITY jinja2-size "264 KB">
     364<!ENTITY jinja2-url "https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-&jinja2-version;.tar.gz">
     365<!ENTITY jinja2-md5 "25ba6ef98c164878acff1036fbd72a1d">
     366<!ENTITY jinja2-home "https://jinja.palletsprojects.com/en/3.0.x/">
     367<!ENTITY jinja2-fin-du "2.3 MB">
     368<!ENTITY jinja2-fin-sbu "less than 0.1 SBU">
     369
    362370<!ENTITY kbd-version "2.4.0">
    363371<!ENTITY kbd-size "1,095 KB">
    … …  
    425433
    426434<!ENTITY linux-major-version "5">
    427 <!ENTITY linux-minor-version "12">
    428 <!ENTITY linux-patch-version "10">
     435<!ENTITY linux-minor-version "13">
     436<!ENTITY linux-patch-version "1">
    429437<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
    430438<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
    431 <!ENTITY linux-size "115,379 KB">
     439<!ENTITY linux-size "116,496 KB">
    432440<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    433 <!ENTITY linux-md5 "7a3d78b97103f2b64c8c8592c1dfbe8d">
     441<!ENTITY linux-md5 "6499bdaa4ee1ef873ffd6533492140e7">
    434442<!ENTITY linux-home "https://www.kernel.org/">
    435443<!-- measured for 5.8.3 / gcc-10.2.0 on x86_64 : minimum is
    … …  
    480488<!ENTITY man-pages-fin-du "4.7 MB">
    481489<!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
     490
     491<!ENTITY markupsafe-version "2.0.1">
     492<!ENTITY markupsafe-size "20 KB">
     493<!ENTITY markupsafe-url "https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-&markupsafe-version;.tar.gz">
     494<!ENTITY markupsafe-md5 "892e0fefa3c488387e5cc0cad2daa523">
     495<!ENTITY markupsafe-home "https://markupsafe.palletsprojects.com/en/2.0.x/">
     496<!ENTITY markupsafe-fin-du "360 KB">
     497<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
    482498
    483499<!ENTITY meson-version "0.58.1">
    … …  
    582598     meson pages will be needed: python3.6 and python3.6m -->
    583599
    584 <!ENTITY python-version "3.9.5">
     600<!ENTITY python-version "3.9.6">
    585601<!ENTITY python-minor "3.9">
    586 <!ENTITY python-size "18,612 KB">
     602<!ENTITY python-size "18,608 KB">
    587603<!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
    588 <!ENTITY python-md5 "71f7ada6bec9cdbf4538adc326120cfd">
     604<!ENTITY python-md5 "ecc29a7688f86e550d29dba2ee66cf80">
    589605<!ENTITY python-home "https://www.python.org/">
    590606<!ENTITY python-tmp-du "374 MB">
    … …  
    593609<!ENTITY python-fin-sbu "2.8 SBU">
    594610<!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
    595 <!ENTITY python-docs-md5 "c594916b00cbb9796fa001dd2764ab0f">
    596 <!ENTITY python-docs-size "6,680 KB">
     611<!ENTITY python-docs-md5 "0dae29e4c38af1b6b1a86b35c9e48923">
     612<!ENTITY python-docs-size "6,692 KB">
    597613
    598614<!ENTITY readline-version "8.1">
    … …  
    630646<!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
    631647
    632 <!ENTITY systemd-version  "248">
     648<!ENTITY systemd-version  "249">
    633649<!--<!ENTITY systemd-stable   "6b4878d">-->
    634650<!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel
    635651     change that is incompatible, we will switch to the backport branch until the next stable release. -->
    636 <!ENTITY systemd-size     "10,068 KB">
     652<!ENTITY systemd-size     "10,344 KB">
    637653<!ENTITY systemd-url      "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
    638654<!--<!ENTITY systemd-url      "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
    639 <!ENTITY systemd-md5      "00131adf0e98c1fd8a7fde4eb47f10c8">
     655<!ENTITY systemd-md5      "8e8adf909c255914dfc10709bd372e69">
    640656<!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
    641 <!ENTITY systemd-man-version "248">
     657<!ENTITY systemd-man-version "249">
    642658<!ENTITY systemd-man-size "584 KB">
    643659<!--<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
    644660<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz">
    645 <!ENTITY systemd-man-md5  "82cc641742df67128df8b6a55fbcbabc">
     661<!ENTITY systemd-man-md5  "d9f2508d6b114b1c02476cd79b8fc786">
    646662<!ENTITY systemd-fin-du   "264 MB">
    647663<!ENTITY systemd-fin-sbu  "1.8 SBU">
    … …  
    677693<!ENTITY tcl-tmp-sbu "3.8 SBU">
    678694
    679 <!ENTITY texinfo-version "6.7">
    680 <!ENTITY texinfo-size "4,237 KB">
     695<!ENTITY texinfo-version "6.8">
     696<!ENTITY texinfo-size "4,848 KB">
    681697<!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.xz">
    682 <!ENTITY texinfo-md5 "d4c5d8cc84438c5993ec5163a59522a6">
     698<!ENTITY texinfo-md5 "a91b404e30561a5df803e6eb3a53be71">
    683699<!ENTITY texinfo-home "&gnu-software;texinfo/">
    684700<!ENTITY texinfo-tmp-du "105 MB">

  • patches.ent

    rd49a0358 recf55d8  
    6868<!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
    6969
     70<!--
    7071<!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-1.patch">
    7172<!ENTITY systemd-upstream-fixes-patch-md5 "6819d49562ac48b551d15d2dd0123055">
    7273<!ENTITY systemd-upstream-fixes-patch-size "8 KB">
     74-->
Note: See TracChangeset for help on using the changeset viewer.