diff options
| -rw-r--r-- | appendices/dependencies.xml | 70 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 32 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 18 | ||||
| -rw-r--r-- | chapter03/packages.xml | 18 | ||||
| -rw-r--r-- | chapter03/patches.xml | 2 | ||||
| -rw-r--r-- | chapter08/chapter08.xml | 2 | ||||
| -rw-r--r-- | chapter08/systemd.xml | 11 | ||||
| -rw-r--r-- | packages.ent | 56 | ||||
| -rw-r--r-- | patches.ent | 2 |
9 files changed, 181 insertions, 30 deletions
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index b6488d1e8..09449b1a7 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -1336,6 +1336,41 @@ </seglistitem> </segmentedlist> +<!-- Begin Jinja2 dependency info --> + <bridgehead renderas="sect2" id="jinja2-dep">Jinja2</bridgehead> + + <segmentedlist> + <segtitle>&dependencies;</segtitle> + + <seglistitem> + <seg>MarkupSafe and Python</seg> + </seglistitem> + </segmentedlist> + + <segmentedlist> + <segtitle>&testsuites;</segtitle> + + <seglistitem> + <seg>No test suite available</seg> + </seglistitem> + </segmentedlist> + + <segmentedlist> + <segtitle>&before;</segtitle> + + <seglistitem> + <seg>Systemd</seg> + </seglistitem> + </segmentedlist> + + <segmentedlist> + <segtitle>&external;</segtitle> + + <seglistitem> + <seg>None</seg> + </seglistitem> + </segmentedlist> + <!-- Begin Kbd dependency info --> <bridgehead renderas="sect2" id="kbd-dep">Kbd</bridgehead> @@ -1801,6 +1836,41 @@ </seglistitem> </segmentedlist> +<!-- Begin MarkupSafe dependency info --> + <bridgehead renderas="sect2" id="markupsafe-dep">MarkupSafe</bridgehead> + + <segmentedlist> + <segtitle>&dependencies;</segtitle> + + <seglistitem> + <seg>Python</seg> + </seglistitem> + </segmentedlist> + + <segmentedlist> + <segtitle>&testsuites;</segtitle> + + <seglistitem> + <seg>No test suite available</seg> + </seglistitem> + </segmentedlist> + + <segmentedlist> + <segtitle>&before;</segtitle> + + <seglistitem> + <seg>Jinja2</seg> + </seglistitem> + </segmentedlist> + + <segmentedlist> + <segtitle>&external;</segtitle> + + <seglistitem> + <seg>None</seg> + </seglistitem> + </segmentedlist> + <!-- Begin Meson dependency info --> <bridgehead renderas="sect2" id="meson-dep">Meson</bridgehead> diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 508b5fd88..f724ac916 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,38 @@ appropriate for the entry or if needed the entire day's listitem. --> <listitem> + <para>2021-07-08</para> + <itemizedlist> + <listitem revision="systemd"> + <para>[renodr] - Added Jinja2-3.0.1.</para> + </listitem> + <listitem revision="systemd"> + <para>[renodr] - Added MarkupSafe-2.0.1.</para> + </listitem> + <listitem> + <para>[renodr] - Update to texinfo-6.8. Fixes + <ulink url="&lfs-ticket-root;4880">#4880</ulink>.</para> + </listitem> + <listitem> + <para>[renodr] - Update to iproute2-5.13.0. Fixes + <ulink url="&lfs-ticket-root;4879">#4879</ulink>.</para> + </listitem> + <listitem> + <para>[renodr] - Update to Python-3.9.6 (Security Update). Fixes + <ulink url="&lfs-ticket-root;4878">#4878</ulink>.</para> + </listitem> + <listitem revision="systemd"> + <para>[renodr] - Update to systemd-249 (Security Update). Fixes + <ulink url="&lfs-ticket-root;4882">#4882</ulink>.</para> + </listitem> + <listitem> + <para>[renodr] - Update to Linux-5.13.1. Fixes + <ulink url="&lfs-ticket-root;4873">#4873</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2021-07-01</para> <itemizedlist> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 41d3879a8..f1427f3a8 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -138,6 +138,9 @@ <listitem> <para>IPRoute2-&iproute2-version;</para> </listitem> + <!--<listitem revision="systemd"> + <para>Jinja2-&jinja2-version;</para> + </listitem>--> <!--<listitem> <para>Kbd-&kbd-version;</para> </listitem>--> @@ -180,6 +183,9 @@ <listitem> <para>Man-pages-&man-pages-version;</para> </listitem> + <!--<listitem revision="systemd"> + <para>MarkupSafe-&markupsafe-version;</para> + </listitem>--> <listitem> <para>Meson-&meson-version;</para> </listitem> @@ -240,9 +246,9 @@ <!--<listitem> <para>Tcl-&tcl-version;</para> </listitem>--> - <!--<listitem> + <listitem> <para>Texinfo-&texinfo-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>Tzdata-&tzdata-version;</para> </listitem>--> @@ -284,11 +290,11 @@ <listitem> <para>gcc-11.1.0-upstream_fixes-1.patch</para> </listitem> - <listitem> - <para>systemd-247-upstream_fixes-2.patch</para> + <listitem revision="systemd"> + <para>MarkupSafe-&markupsafe-version;</para> </listitem> - <listitem> - <para>systemd-247-upstream_fixes-1.patch</para> + <listitem revision="systemd"> + <para>Jinja2-&jinja2-version;</para> </listitem> </itemizedlist> diff --git a/chapter03/packages.xml b/chapter03/packages.xml index bec479375..5ede31a02 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -346,6 +346,15 @@ </listitem> </varlistentry> + <varlistentry revision="systemd"> + <term>Jinja2 (&jinja2-version;) - <token>&jinja2-size;</token>:</term> + <listitem> + <para>Home page: <ulink url="&jinja2-home;"/></para> + <para>Download: <ulink url="&jinja2-url;"/></para> + <para>MD5 sum: <literal>&jinja2-md5;</literal></para> + </listitem> + </varlistentry> + <varlistentry> <term>Kbd (&kbd-version;) - <token>&kbd-size;</token>:</term> <listitem> @@ -477,6 +486,15 @@ </listitem> </varlistentry> + <varlistentry revision="systemd"> + <term>MarkupSafe (&markupsafe-version;) - <token>&markupsafe-size;</token>:</term> + <listitem> + <para>Home page: <ulink url="&markupsafe-home;"/></para> + <para>Download: <ulink url="&markupsafe-url;"/></para> + <para>MD5 sum: <literal>&markupsafe-md5;</literal></para> + </listitem> + </varlistentry> + <varlistentry> <term>Meson (&meson-version;) - <token>&meson-size;</token>:</term> <listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 3dd115094..803bf42bd 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -110,6 +110,7 @@ </listitem> </varlistentry> +<!-- <varlistentry revision="systemd"> <term>Systemd Upstream Fixes Patch - <token>&systemd-upstream-fixes-patch-size;</token>:</term> <listitem> @@ -117,6 +118,7 @@ <para>MD5 sum: <literal>&systemd-upstream-fixes-patch-md5;</literal></para> </listitem> </varlistentry> +--> </variablelist> diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml index 6e8ff3240..4202deea8 100644 --- a/chapter08/chapter08.xml +++ b/chapter08/chapter08.xml @@ -83,6 +83,8 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/> <!-- systemd only --> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="markupsafe.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jinja2.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/> diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index 002f6d749..c350dcf3a 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -46,10 +46,11 @@ <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 --> + <!-- For linux-5.11's API headers changing the rfkill_event structure <para>First, apply a patch to fix some build issues:</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 <para>Remove tests that cannot be built in chroot:</para> @@ -57,11 +58,13 @@ <screen><userinput remap="pre">sed '177,$ d' -i src/resolve/meson.build</userinput></screen> --> - <para>Remove an unneeded group, - <systemitem class="groupname">render</systemitem>, from the default udev + <para>Remove two unneeded groups, + <systemitem class="groupname">render</systemitem> and + <systemitem class="groupname">sgx</systemitem>, from the default udev rules:</para> -<screen><userinput remap="pre">sed -i 's/GROUP="render"/GROUP="video"/' rules.d/50-udev-default.rules.in</userinput></screen> + <screen><userinput remap="pre"> sed -i -e 's/GROUP="render"/GROUP="video"/' \ + -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen> <para>Prepare systemd for compilation:</para> diff --git a/packages.ent b/packages.ent index 00e116775..1606987cd 100644 --- a/packages.ent +++ b/packages.ent @@ -343,14 +343,22 @@ <!ENTITY intltool-fin-du "1.5 MB"> <!ENTITY intltool-fin-sbu "less than 0.1 SBU"> -<!ENTITY iproute2-version "5.12.0"> -<!ENTITY iproute2-size "820 KB"> +<!ENTITY iproute2-version "5.13.0"> +<!ENTITY iproute2-size "828 KB"> <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz"> -<!ENTITY iproute2-md5 "bbebacdabd4628ff86453ef4771a242a"> +<!ENTITY iproute2-md5 "15fc3786303a173a14e180afe4cd2ecd"> <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/"> <!ENTITY iproute2-fin-du "15 MB"> <!ENTITY iproute2-fin-sbu "0.2 SBU"> +<!ENTITY jinja2-version "3.0.1"> +<!ENTITY jinja2-size "264 KB"> +<!ENTITY jinja2-url "https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-&jinja2-version;.tar.gz"> +<!ENTITY jinja2-md5 "25ba6ef98c164878acff1036fbd72a1d"> +<!ENTITY jinja2-home "https://jinja.palletsprojects.com/en/3.0.x/"> +<!ENTITY jinja2-fin-du "2.3 MB"> +<!ENTITY jinja2-fin-sbu "less than 0.1 SBU"> + <!ENTITY kbd-version "2.4.0"> <!ENTITY kbd-size "1,095 KB"> <!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.xz"> @@ -416,13 +424,13 @@ <!ENTITY libtool-fin-sbu "1.6 SBU"> <!ENTITY linux-major-version "5"> -<!ENTITY linux-minor-version "12"> -<!ENTITY linux-patch-version "10"> +<!ENTITY linux-minor-version "13"> +<!ENTITY linux-patch-version "1"> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> -<!ENTITY linux-size "115,379 KB"> +<!ENTITY linux-size "116,496 KB"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> -<!ENTITY linux-md5 "7a3d78b97103f2b64c8c8592c1dfbe8d"> +<!ENTITY linux-md5 "6499bdaa4ee1ef873ffd6533492140e7"> <!ENTITY linux-home "https://www.kernel.org/"> <!-- measured for 5.8.3 / gcc-10.2.0 on x86_64 : minimum is allnoconfig extended for a hopefully-bootable build on desktop machine, @@ -472,6 +480,14 @@ <!ENTITY man-pages-fin-du "4.7 MB"> <!ENTITY man-pages-fin-sbu "less than 0.1 SBU"> +<!ENTITY markupsafe-version "2.0.1"> +<!ENTITY markupsafe-size "20 KB"> +<!ENTITY markupsafe-url "https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-&markupsafe-version;.tar.gz"> +<!ENTITY markupsafe-md5 "892e0fefa3c488387e5cc0cad2daa523"> +<!ENTITY markupsafe-home "https://markupsafe.palletsprojects.com/en/2.0.x/"> +<!ENTITY markupsafe-fin-du "360 KB"> +<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU"> + <!ENTITY meson-version "0.58.1"> <!ENTITY meson-size "1,852 KB"> <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz"> @@ -573,19 +589,19 @@ <!-- If python minor version changes, updates in python and meson pages will be needed: python3.6 and python3.6m --> -<!ENTITY python-version "3.9.5"> +<!ENTITY python-version "3.9.6"> <!ENTITY python-minor "3.9"> -<!ENTITY python-size "18,612 KB"> +<!ENTITY python-size "18,608 KB"> <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz"> -<!ENTITY python-md5 "71f7ada6bec9cdbf4538adc326120cfd"> +<!ENTITY python-md5 "ecc29a7688f86e550d29dba2ee66cf80"> <!ENTITY python-home "https://www.python.org/"> <!ENTITY python-tmp-du "374 MB"> <!ENTITY python-tmp-sbu "0.9 SBU"> <!ENTITY python-fin-du "294 MB"> <!ENTITY python-fin-sbu "2.8 SBU"> <!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2"> -<!ENTITY python-docs-md5 "c594916b00cbb9796fa001dd2764ab0f"> -<!ENTITY python-docs-size "6,680 KB"> +<!ENTITY python-docs-md5 "0dae29e4c38af1b6b1a86b35c9e48923"> +<!ENTITY python-docs-size "6,692 KB"> <!ENTITY readline-version "8.1"> <!ENTITY readline-size "2,924 KB"> @@ -621,20 +637,20 @@ <!ENTITY sysklogd-fin-du "0.6 MB"> <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU"> -<!ENTITY systemd-version "248"> +<!ENTITY systemd-version "249"> <!--<!ENTITY systemd-stable "6b4878d">--> <!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel change that is incompatible, we will switch to the backport branch until the next stable release. --> -<!ENTITY systemd-size "10,068 KB"> +<!ENTITY systemd-size "10,344 KB"> <!ENTITY systemd-url "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz"> <!--<!ENTITY systemd-url "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">--> -<!ENTITY systemd-md5 "00131adf0e98c1fd8a7fde4eb47f10c8"> +<!ENTITY systemd-md5 "8e8adf909c255914dfc10709bd372e69"> <!ENTITY systemd-home "https://www.freedesktop.org/wiki/Software/systemd/"> -<!ENTITY systemd-man-version "248"> +<!ENTITY systemd-man-version "249"> <!ENTITY systemd-man-size "584 KB"> <!--<!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">--> <!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz"> -<!ENTITY systemd-man-md5 "82cc641742df67128df8b6a55fbcbabc"> +<!ENTITY systemd-man-md5 "d9f2508d6b114b1c02476cd79b8fc786"> <!ENTITY systemd-fin-du "264 MB"> <!ENTITY systemd-fin-sbu "1.8 SBU"> @@ -668,10 +684,10 @@ <!ENTITY tcl-tmp-du "80 MB"> <!ENTITY tcl-tmp-sbu "3.8 SBU"> -<!ENTITY texinfo-version "6.7"> -<!ENTITY texinfo-size "4,237 KB"> +<!ENTITY texinfo-version "6.8"> +<!ENTITY texinfo-size "4,848 KB"> <!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.xz"> -<!ENTITY texinfo-md5 "d4c5d8cc84438c5993ec5163a59522a6"> +<!ENTITY texinfo-md5 "a91b404e30561a5df803e6eb3a53be71"> <!ENTITY texinfo-home "&gnu-software;texinfo/"> <!ENTITY texinfo-tmp-du "105 MB"> <!ENTITY texinfo-tmp-sbu "0.3 SBU"> diff --git a/patches.ent b/patches.ent index bf849b05e..9858f94ca 100644 --- a/patches.ent +++ b/patches.ent @@ -67,6 +67,8 @@ <!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc"> <!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"> +--> |