Changeset 6c4d9d0


Ignore:
Timestamp:
10/14/2022 10:30:10 PM (19 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
multilib
Children:
87f8108
Parents:
1308af8 (diff), efae039 (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:
7 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    r1308af8 r6c4d9d0  
    4141    -->
    4242    <listitem>
     43      <para>2022-10-15</para>
     44      <itemizedlist>
     45        <listitem>
     46          <para>[bdubbs] - Update to iana-etc-20221007. Addresses
     47          <ulink url="&lfs-ticket-root;5006">#5006</ulink>.</para>
     48        </listitem>
     49        <listitem>
     50          <para>[bdubbs] - Update to vim-9.0.0739. Addresses
     51          <ulink url="&lfs-ticket-root;5006">#5006</ulink>.</para>
     52        </listitem>
     53        <listitem>
     54          <para>[bdubbs] - Add upstream patches to readline and bash. Fixes
     55          <ulink url="&lfs-ticket-root;5135">#5131</ulink>.</para>
     56        </listitem>
     57        <listitem>
     58          <para>[bdubbs] - Update to zlib-1.2.13. Fixes
     59          <ulink url="&lfs-ticket-root;5137">#5137</ulink>.</para>
     60        </listitem>
     61        <listitem>
     62          <para>[bdubbs] - Update to man-pages-6.00. Fixes
     63          <ulink url="&lfs-ticket-root;5136">#5136</ulink>.</para>
     64        </listitem>
     65        <listitem>
     66          <para>[bdubbs] - Update to gettext-0.21.1. Fixes
     67          <ulink url="&lfs-ticket-root;5130">#5130</ulink>.</para>
     68        </listitem>
     69        <listitem>
     70          <para>[bdubbs] - Update to iproute2-6.0.0. Fixes
     71          <ulink url="&lfs-ticket-root;5127">#5127</ulink>.</para>
     72        </listitem>
     73        <listitem>
     74          <para>[bdubbs] - Update to meson-0.63.3. Fixes
     75          <ulink url="&lfs-ticket-root;5129">#5129</ulink>.</para>
     76        </listitem>
     77        <listitem>
     78          <para>[bdubbs] - Update to Python-3.10.8. Fixes
     79          <ulink url="&lfs-ticket-root;5133">#5133</ulink>.</para>
     80        </listitem>
     81        <listitem>
     82          <para>[bdubbs] - Update to xz-5.2.7. Fixes
     83          <ulink url="&lfs-ticket-root;5133">#5133</ulink>.</para>
     84        </listitem>
     85        <listitem>
     86          <para>[bdubbs] - Update to tzdata-2022e. Fixes
     87          <ulink url="&lfs-ticket-root;5119">#5134</ulink>.</para>
     88        </listitem>
     89        <listitem>
     90          <para>[bdubbs] - Update to linux-6.0.1. Fixes
     91          <ulink url="&lfs-ticket-root;5135">#5135</ulink>.</para>
     92        </listitem>
     93        <listitem revision="systemd">
     94          <para>[bdubbs] - Update to dbus-1.14.4. Fixes
     95          <ulink url="&lfs-ticket-root;5128">#5128</ulink>.</para>
     96        </listitem>
     97      </itemizedlist>
     98    </listitem>
     99
     100    <listitem>
    43101      <para>2022-10-04</para>
    44102      <itemizedlist>
    … …  
    77135        <listitem>
    78136          <para>[bdubbs] - Update to libcap-2.66. Fixes
    79           <ulink url="&lfs-ticket-root;512">#5120</ulink>.</para>
     137          <ulink url="&lfs-ticket-root;5120">#5120</ulink>.</para>
    80138        </listitem>
    81139        <listitem revision="systemd">

  • chapter01/whatsnew.xml

    r1308af8 r6c4d9d0  
    107107       <para>GDBM-&gdbm-version;</para>
    108108    </listitem>-->
    109     <!--<listitem>
     109    <listitem>
    110110      <para>Gettext-&gettext-version;</para>
    111     </listitem>-->
     111    </listitem>
    112112    <!--<listitem>
    113113      <para>Glibc-&glibc-version;</para>
    … …  
    140140      <para>Intltool-&intltool-version;</para>
    141141    </listitem>-->
    142     <!--<listitem>
     142    <listitem>
    143143      <para>IPRoute2-&iproute2-version;</para>
    144     </listitem>-->
     144    </listitem>
    145145    <!--<listitem revision="systemd">
    146146      <para>Jinja2-&jinja2-version;</para>
    … …  
    185185      <para>Man-DB-&man-db-version;</para>
    186186    </listitem>-->
    187     <!--<listitem>
     187    <listitem>
    188188      <para>Man-pages-&man-pages-version;</para>
    189     </listitem>-->
     189    </listitem>
    190190    <!--<listitem revision="systemd">
    191191      <para>MarkupSafe-&markupsafe-version;</para>
    … …  
    260260      <para>Util-Linux-&util-linux-version;</para>
    261261    </listitem>-->
    262     <!--<listitem>
     262    <listitem>
    263263      <para>Vim-&vim-version;</para>
    264     </listitem>-->
     264    </listitem>
    265265    <!--<listitem>
    266266      <para>XML-Parser-&xml-parser-version;</para>
    267267    </listitem>-->
    268     <!--<listitem>
     268    <listitem>
    269269      <para>XZ-Utils-&xz-version;</para>
    270     </listitem>-->
    271     <!--<listitem>
     270    </listitem>
     271    <listitem>
    272272      <para>Zlib-&zlib-version;</para>
    273     </listitem>-->
     273    </listitem>
    274274    <!--<listitem>
    275275      <para>Zstd-&zstd-version;</para>
    … …  
    290290    <listitem><para></para></listitem>  <!-- satisfy build -->
    291291
    292     <!--<listitem>
    293       <para>&xz-upstream-fix-patch;</para>
    294     </listitem>-->
     292    <listitem>
     293      <para>&bash-fixes-patch;</para>
     294    </listitem>
     295    <listitem>
     296      <para>&readline-fixes-patch;</para>
     297    </listitem>
    295298  </itemizedlist>
    296299

  • chapter03/patches.xml

    r1308af8 r6c4d9d0  
    2727    </varlistentry>
    2828-->
    29 <!--
     29
    3030    <varlistentry>
    3131      <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
    … …  
    3535      </listitem>
    3636    </varlistentry>
    37 -->
     37
    3838<!--
    3939    <varlistentry>
    … …  
    119119    </varlistentry>
    120120-->
    121 <!--
     121
    122122    <varlistentry>
    123       <term>Shadow Segfault Fix Patch - <token>&shadow-segfault-patch-size;</token>:</term>
     123      <term>Readline Upstream Fix Patch - <token>&readline-fixes-patch-size;</token>:</term>
    124124      <listitem>
    125         <para>Download: <ulink url="&patches-root;&shadow-segfault-patch;"/></para>
    126         <para>MD5 sum: <literal>&shadow-segfault-patch-md5;</literal></para>
     125        <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
     126        <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
    127127      </listitem>
    128128    </varlistentry>
    129 -->
     129
    130130    <varlistentry revision="sysv">
    131131      <term>Sysvinit Consolidated Patch - <token>&sysvinit-consolidated-patch-size;</token>:</term>

  • chapter08/bash.xml

    r1308af8 r6c4d9d0  
    4040  <sect2 role="installation">
    4141    <title>Installation of Bash</title>
     42
     43    <para>First, fix some issues identified upstream:</para>
     44
     45<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
    4246
    4347    <para>Prepare Bash for compilation:</para>

  • chapter08/readline.xml

    r1308af8 r6c4d9d0  
    5050sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
    5151
     52    <para>Now fix a problem identified upstream:</para>
     53
     54<screen><userinput remap="pre">patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
     55
    5256    <para>Prepare Readline for compilation:</para>
    5357

  • packages.ent

    r1308af8 r6c4d9d0  
    115115<!ENTITY coreutils-fin-sbu "2.8 SBU">
    116116
    117 <!ENTITY dbus-version "1.14.2">
    118 <!ENTITY dbus-size "1,332 KB">
     117<!ENTITY dbus-version "1.14.4">
     118<!ENTITY dbus-size "1,337 KB">
    119119<!ENTITY dbus-url "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.xz">
    120 <!ENTITY dbus-md5 "2d9a6b441e6f844d41c35a004f0ef50b">
     120<!ENTITY dbus-md5 "e36f0f160751fa7ce103782166852c6b">
    121121<!ENTITY dbus-home "https://www.freedesktop.org/wiki/Software/dbus">
    122122<!ENTITY dbus-fin-du "19 MB">
    … …  
    246246<!ENTITY gdbm-fin-sbu "0.1 SBU">
    247247
    248 <!ENTITY gettext-version "0.21">
    249 <!ENTITY gettext-size "9,487 KB">
     248<!ENTITY gettext-version "0.21.1">
     249<!ENTITY gettext-size "9,819 KB">
    250250<!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
    251 <!ENTITY gettext-md5 "40996bbaf7d1356d3c22e33a8b255b31">
     251<!ENTITY gettext-md5 "27fcc8a42dbc8f334f23a08f1f2fe00a">
    252252<!ENTITY gettext-home "&gnu-software;gettext/">
    253253<!ENTITY gettext-tmp-du "282 MB">
    … …  
    318318<!ENTITY gzip-fin-sbu "0.3 SBU">
    319319
    320 <!ENTITY iana-etc-version "20220922">
     320<!ENTITY iana-etc-version "20221007">
    321321<!ENTITY iana-etc-size "584 KB">
    322322<!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
    323 <!ENTITY iana-etc-md5 "2fdc746cfc1bc10f841760fd6a92618c">
     323<!ENTITY iana-etc-md5 "4ba9c780b4cf3b0629a82fbe840cc14a">
    324324<!ENTITY iana-etc-home "https://www.iana.org/protocols">
    325325<!ENTITY iana-etc-fin-du "4.8 MB">
    … …  
    343343<!ENTITY intltool-fin-sbu "less than 0.1 SBU">
    344344
    345 <!ENTITY iproute2-version "5.19.0">
    346 <!ENTITY iproute2-size "872 KB">
     345<!ENTITY iproute2-version "6.0.0">
     346<!ENTITY iproute2-size "880 KB">
    347347<!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
    348 <!ENTITY iproute2-md5 "415bd9eeb8515a585e245809d2fe45a6">
     348<!ENTITY iproute2-md5 "5da6cb3154ee09b9a8b4004d1c2df4cd">
    349349<!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
    350350<!ENTITY iproute2-fin-du "16 MB">
    … …  
    432432<!ENTITY libtool-fin-sbu "1.5 SBU">
    433433
    434 <!ENTITY linux-major-version "5">
    435 <!ENTITY linux-minor-version "19">
    436 <!ENTITY linux-patch-version "13">
     434<!ENTITY linux-major-version "6">
     435<!ENTITY linux-minor-version "0">
     436<!ENTITY linux-patch-version "1">
    437437<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
    438438<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
    439 <!ENTITY linux-size "128,568 KB">
     439<!ENTITY linux-size "130,737 KB">
    440440<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    441 <!ENTITY linux-md5 "fd9538870c56a39ec8a7c1d6abf0b43a">
     441<!ENTITY linux-md5 "514d7aafe8964474b14f8fe6c69e6895">
    442442<!ENTITY linux-home "https://www.kernel.org/">
    443443<!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
    … …  
    481481<!ENTITY man-db-fin-sbu "0.4 SBU">
    482482
    483 <!ENTITY man-pages-version "5.13">
    484 <!ENTITY man-pages-size "1,752 KB">
     483<!ENTITY man-pages-version "6.00">
     484<!ENTITY man-pages-size "1,746 KB">
    485485<!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
    486 <!ENTITY man-pages-md5 "3ac24e8c6fae26b801cb87ceb63c0a30">
     486<!ENTITY man-pages-md5 "1a30556c061af0616bd8af882e040edb">
    487487<!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
    488488<!ENTITY man-pages-fin-du "33 MB">
    … …  
    497497<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
    498498
    499 <!ENTITY meson-version "0.63.2">
    500 <!ENTITY meson-size "2,016 KB">
     499<!ENTITY meson-version "0.63.3">
     500<!ENTITY meson-size "2,020 KB">
    501501<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
    502 <!ENTITY meson-md5 "12ae3150982645790a4f8a8e8795173c">
     502<!ENTITY meson-md5 "b2f2757b5dd84cc754b9df53ce37a175">
    503503<!ENTITY meson-home "https://mesonbuild.com">
    504504<!ENTITY meson-fin-du "38 MB">
    … …  
    598598     meson pages will be needed: python3.6 and python3.6m -->
    599599
    600 <!ENTITY python-version "3.10.7">
     600<!ENTITY python-version "3.10.8">
    601601<!ENTITY python-minor "3.10">
    602 <!ENTITY python-size "19,159 KB">
     602<!ENTITY python-size "19,160 KB">
    603603<!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
    604 <!ENTITY python-md5 "b8094f007b3a835ca3be6bdf8116cccc">
     604<!ENTITY python-md5 "e92356b012ed4d0e09675131d39b1bde">
    605605<!ENTITY python-home "https://www.python.org/">
    606606<!ENTITY python-tmp-du "364 MB">
    … …  
    609609<!ENTITY python-fin-sbu "3.4 SBU">
    610610<!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
    611 <!ENTITY python-docs-md5 "d5923c417995334e72c2561812905d23">
    612 <!ENTITY python-docs-size "7,176 KB">
     611<!ENTITY python-docs-md5 "e19fa51f7055c0e869d609f2dfbcc5d9">
     612<!ENTITY python-docs-size "7,190 KB">
    613613
    614614<!ENTITY readline-version "8.2">
    … …  
    704704<!ENTITY texinfo-fin-sbu "0.6 SBU">
    705705
    706 <!ENTITY tzdata-version "2022d">
     706<!ENTITY tzdata-version "2022e">
    707707<!ENTITY tzdata-size "424 KB">
    708708<!ENTITY tzdata-url "https://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
    709 <!ENTITY tzdata-md5 "e55dbeb2121230a0ae7c58dbb47ae8c8">
     709<!ENTITY tzdata-md5 "97bf180d57c3e51a49742d1d87ceed40">
    710710<!ENTITY tzdata-home "https://www.iana.org/time-zones">
    711711
    … …  
    727727<!ENTITY util-linux-fin-sbu "1.0 SBU">
    728728
    729 <!ENTITY vim-version "9.0.0228">
     729<!ENTITY vim-version "9.0.0739">
    730730<!-- <!ENTITY vim-majmin "90"> -->
    731731<!ENTITY vim-docdir "vim/vim90">
    732 <!ENTITY vim-size "16,372 KB">
     732<!ENTITY vim-size "16,370 KB">
    733733<!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
    734734<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
    735 <!ENTITY vim-md5 "bc7e0a4829d94bb4c03a7a6b4ad6a8cf">
     735<!ENTITY vim-md5 "d28503800dcd471edf8c308f5a74f177">
    736736<!ENTITY vim-home "https://www.vim.org">
    737737<!ENTITY vim-fin-du "217 MB">
    … …  
    755755<!ENTITY xml-parser-fin-sbu "less than 0.1 SBU">
    756756
    757 <!ENTITY xz-version "5.2.6">
    758 <!ENTITY xz-size "1,234 KB">
     757<!ENTITY xz-version "5.2.7">
     758<!ENTITY xz-size "1,253 KB">
    759759<!ENTITY xz-url "https://tukaani.org/xz/xz-&xz-version;.tar.xz">
    760 <!ENTITY xz-md5 "d9cd5698e1ec06cf638c0d2d645e8175">
     760<!ENTITY xz-md5 "6c130d21e260d4476e971985e7394e83">
    761761<!ENTITY xz-home "https://tukaani.org/xz">
    762762<!ENTITY xz-tmp-du "16 MB">
    … …  
    765765<!ENTITY xz-fin-sbu "0.2 SBU">
    766766
    767 <!ENTITY zlib-version "1.2.12">
    768 <!ENTITY zlib-size "1259 KB">
     767<!ENTITY zlib-version "1.2.13">
     768<!ENTITY zlib-size "1267 KB">
    769769<!ENTITY zlib-url "https://zlib.net/zlib-&zlib-version;.tar.xz">
    770 <!ENTITY zlib-md5 "28687d676c04e7103bb6ff2b9694c471">
     770<!ENTITY zlib-md5 "7d9fc1d78ae2fa3e84fe98b77d006c63">
    771771<!ENTITY zlib-home "https://www.zlib.net/">
    772772<!ENTITY zlib-fin-du "6.1 MB">

  • patches.ent

    r1308af8 r6c4d9d0  
    88<!ENTITY autoconf-fixes-patch-size "3.8 KB">
    99-->
    10 <!--
     10
    1111<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-1.patch">
    12 <!ENTITY bash-fixes-patch-md5 "c1545da2ad7d78574b52c465ec077ed9">
    13 <!ENTITY bash-fixes-patch-size "22 KB">
    14 -->
     12<!ENTITY bash-fixes-patch-md5 "5f20760139d6a97e55124988fcddae44">
     13<!ENTITY bash-fixes-patch-size "2.0 KB">
     14
    1515<!--
    1616<!ENTITY binutils-lto-patch "binutils-&binutils-version;-lto_fix-1.patch">
    … …  
    7979<!ENTITY perl-fix-patch-size "1.6 KB">
    8080-->
     81<!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fix-1.patch">
     82<!ENTITY readline-fixes-patch-md5 "dd1764b84cfca6b677f44978218a75da">
     83<!ENTITY readline-fixes-patch-size "1.3 KB">
     84
    8185<!--
    8286<!ENTITY shadow-segfault-patch "shadow-&shadow-version;-useradd_segfault-1.patch">
Note: See TracChangeset for help on using the changeset viewer.