Changeset cb7745e2


Ignore:
Timestamp:
11/11/2022 11:30:13 PM (18 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
multilib
Children:
0780176
Parents:
381c8a7 (diff), c4fc75e (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

  • chapter01/changelog.xml

    r381c8a7 rcb7745e2  
    4141    -->
    4242    <listitem revision="systemd">
     43      <para>2022-11-10</para>
     44      <itemizedlist>
     45        <listitem>
     46          <para>[bdubbs] - Fix make-4.4 bug. Fixes
     47          <ulink url="&lfs-ticket-root;5160">#5160</ulink>.</para>
     48        </listitem>
     49        <listitem>
     50          <para>[bdubbs] - Update to wheel-0.38.4 (Python Module). Fixes
     51          <ulink url="&lfs-ticket-root;5155">#5155</ulink>.</para>
     52        </listitem>
     53        <listitem>
     54          <para>[bdubbs] - Update to texinfo-7.0. Fixes
     55          <ulink url="&lfs-ticket-root;5159">#5159</ulink>.</para>
     56        </listitem>
     57        <listitem revision="sysv">
     58          <para>[bdubbs] - Update to sysvinit-3.05. Fixes
     59          <ulink url="&lfs-ticket-root;5153">#5153</ulink>.</para>
     60        </listitem>
     61        <listitem>
     62          <para>[bdubbs] - Update to shadow-4.13. Fixes
     63          <ulink url="&lfs-ticket-root;5161">#5161</ulink>.</para>
     64        </listitem>
     65        <listitem>
     66          <para>[bdubbs] - Update to sed-4.9. Fixes
     67          <ulink url="&lfs-ticket-root;5157">#5157</ulink>.</para>
     68        </listitem>
     69        <listitem>
     70          <para>[bdubbs] - Update to meson-0.64.0. Fixes
     71          <ulink url="&lfs-ticket-root;5156">#5156</ulink>.</para>
     72        </listitem>
     73        <listitem>
     74          <para>[bdubbs] - Update to linux-6.0.7. Fixes
     75          <ulink url="&lfs-ticket-root;5154">#5154</ulink>.</para>
     76        </listitem>
     77        <listitem>
     78          <para>[bdubbs] - Update to elfutils-0.188. Fixes
     79          <ulink url="&lfs-ticket-root;5152">#5152</ulink>.</para>
     80        </listitem>
     81        <listitem>
     82          <para>[bdubbs] - Update to bc-6.1.1. Fixes
     83          <ulink url="&lfs-ticket-root;5151">#5151</ulink>.</para>
     84        </listitem>
     85        <listitem>
     86          <para>[bdubbs] - Update to bash-5.2.9. Fixes
     87          <ulink url="&lfs-ticket-root;5158">#5158</ulink>.</para>
     88        </listitem>
     89      </itemizedlist>
     90    </listitem>
     91
     92    <listitem revision="systemd">
    4393      <para>2022-11-03</para>
    4494      <itemizedlist>

  • chapter01/whatsnew.xml

    r381c8a7 rcb7745e2  
    161161      <para>Libcap-&libcap-version;</para>
    162162    </listitem>
    163     <!--<listitem>
     163    <listitem>
    164164      <para>Libelf-&elfutils-version; (from elfutils)</para>
    165     </listitem>-->
     165    </listitem>
    166166    <listitem>
    167167      <para>Libffi-&libffi-version;</para>
    … …  
    230230      <para>Readline-&readline-version;</para>
    231231    </listitem>
    232     <!--<listitem>
     232    <listitem>
    233233      <para>Sed-&sed-version;</para>
    234     </listitem>-->
     234    </listitem>
    235235    <listitem>
    236236      <para>Shadow-&shadow-version;</para>
    … …  
    242242      <para>Systemd-&systemd-version;</para>
    243243    </listitem>
    244     <!--<listitem revision="sysv">
     244    <listitem revision="sysv">
    245245      <para>SysVinit-&sysvinit-version;</para>
    246     </listitem>-->
     246    </listitem>
    247247    <!--<listitem>
    248248      <para>Tar-&tar-version;</para>
    … …  
    251251      <para>Tcl-&tcl-version;</para>
    252252    </listitem>-->
    253    <!--<listitem>
     253   <listitem>
    254254      <para>Texinfo-&texinfo-version;</para>
    255     </listitem>-->
     255    </listitem>
    256256    <listitem>
    257257      <para>Tzdata-&tzdata-version;</para>
    … …  
    262262    <listitem>
    263263      <para>Vim-&vim-version;</para>
     264    </listitem>
     265    <listitem>
     266      <para>wheel-&wheel-version;</para>
    264267    </listitem>
    265268    <!--<listitem>
    … …  
    289292    <title>Added:</title>
    290293    <listitem><para></para></listitem>  <!-- satisfy build -->
    291 
     294<!--
    292295    <listitem>
    293296      <para>&bash-fixes-patch;</para>
    294297    </listitem>
     298-->
    295299    <listitem>
    296300      <para>&readline-fixes-patch;</para>

  • chapter03/patches.xml

    r381c8a7 rcb7745e2  
    2828-->
    2929
    30     <varlistentry>
     30<!--    <varlistentry>
    3131      <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
    3232      <listitem>
    … …  
    3535      </listitem>
    3636    </varlistentry>
    37 
     37-->
    3838<!--
    3939    <varlistentry>

  • chapter06/make.xml

    r381c8a7 rcb7745e2  
    4343    <title>Installation of Make</title>
    4444
     45    <para>First, fix an issue identified upstream:</para>
     46
     47<screen><userinput remap="pre">sed -e '/ifdef SIGPIPE/,+2 d' \
     48    -e '/undef  FATAL_SIG/i FATAL_SIG (SIGPIPE);' \
     49    -i src/main.c</userinput></screen>
     50
    4551    <para>Prepare Make for compilation:</para>
    4652

  • chapter08/bash.xml

    r381c8a7 rcb7745e2  
    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>
    4642
    4743    <para>Prepare Bash for compilation:</para>

  • chapter08/make.xml

    r381c8a7 rcb7745e2  
    4141  <sect2 role="installation">
    4242    <title>Installation of Make</title>
    43 <!--
    44     <para>Again, work around an error caused by glibc-2.27 and later:</para>
    4543
    46 <screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen>
    47 -->
     44    <para>First, fix some issues identified upstream:</para>
     45
     46<screen><userinput remap="pre">sed -e '/ifdef SIGPIPE/,+2 d' \
     47    -e '/undef  FATAL_SIG/i FATAL_SIG (SIGPIPE);' \
     48    -i src/main.c</userinput></screen>
     49
    4850    <para>Prepare Make for compilation:</para>
    4951

  • packages.ent

    r381c8a7 rcb7745e2  
    4949<!ENTITY automake-fin-sbu "less than 0.1 SBU (about 7.7 SBU with tests)">
    5050
    51 <!ENTITY bash-version "5.2">
     51<!ENTITY bash-version "5.2.9">
    5252<!ENTITY bash-size "10,695 KB">
    5353<!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
    54 <!ENTITY bash-md5 "cfb4cf795fc239667f187b3d6b3d396f">
     54<!ENTITY bash-md5 "0d8a4e4fe2d31ed5c304316bd9fcb337">
    5555<!ENTITY bash-home "&gnu-software;bash/">
    5656<!ENTITY bash-tmp-du "64 MB">
    … …  
    5959<!ENTITY bash-fin-sbu "1.4 SBU">
    6060
    61 <!ENTITY bc-version "6.0.4">
    62 <!ENTITY bc-size "442 KB">
     61<!ENTITY bc-version "6.1.1">
     62<!ENTITY bc-size "445 KB">
    6363<!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
    64 <!ENTITY bc-md5 "1e1c90de1a11f3499237425de1673ef1">
     64<!ENTITY bc-md5 "9a7ffa015c499272e7d41b4c0f28e691">
    6565<!ENTITY bc-home "https://git.yzena.com/gavin/bc">
    6666<!ENTITY bc-fin-du "7.4 MB">
    … …  
    149149<!ENTITY e2fsprogs-fin-sbu "4.4 SBU on a spinning disk, 1.2 SBU on an SSD">
    150150
    151 <!ENTITY elfutils-version "0.187"> <!-- libelf -->
    152 <!ENTITY elfutils-size "9,024 KB">
     151<!ENTITY elfutils-version "0.188"> <!-- libelf -->
     152<!ENTITY elfutils-size "8,900 KB">
    153153<!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
    154 <!ENTITY elfutils-md5 "cc04f07b53a71616b22553c0a458cf4b">
     154<!ENTITY elfutils-md5 "efb25a91873b2eec4df9f31e6a4f4e5c">
    155155<!ENTITY elfutils-home "https://sourceware.org/elfutils/">
    156156<!ENTITY elfutils-fin-du "117 MB">
    … …  
    434434<!ENTITY linux-major-version "6">
    435435<!ENTITY linux-minor-version "0">
    436 <!ENTITY linux-patch-version "6">
     436<!ENTITY linux-patch-version "7">
    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 "130,766 KB">
     439<!ENTITY linux-size "130,748 KB">
    440440<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    441 <!ENTITY linux-md5 "4e01a82c673ea0fb85f751672f99dc96">
     441<!ENTITY linux-md5 "690e3de421b693bf111ec74a97476ea7">
    442442<!ENTITY linux-home "https://www.kernel.org/">
    443443<!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
    … …  
    497497<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
    498498
    499 <!ENTITY meson-version "0.63.3">
    500 <!ENTITY meson-size "2,020 KB">
     499<!ENTITY meson-version "0.64.0">
     500<!ENTITY meson-size "2,042 KB">
    501501<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
    502 <!ENTITY meson-md5 "b2f2757b5dd84cc754b9df53ce37a175">
     502<!ENTITY meson-md5 "63a3d83206e7e277fce4b90e8ad8003a">
    503503<!ENTITY meson-home "https://mesonbuild.com">
    504504<!ENTITY meson-fin-du "38 MB">
    … …  
    621621<!ENTITY readline-fin-sbu "0.1 SBU">
    622622
    623 <!ENTITY sed-version "4.8">
    624 <!ENTITY sed-size "1,317 KB">
     623<!ENTITY sed-version "4.9">
     624<!ENTITY sed-size "1,365 KB">
    625625<!ENTITY sed-url "&gnu;sed/sed-&sed-version;.tar.xz">
    626 <!ENTITY sed-md5 "6d906edfdb3202304059233f51f9a71d">
     626<!ENTITY sed-md5 "6aac9b2dbafcd5b7a67a8a9bcb8036c3">
    627627<!ENTITY sed-home "&gnu-software;sed/">
    628628<!ENTITY sed-tmp-du "20 MB">
    … …  
    631631<!ENTITY sed-fin-sbu "0.4 SBU">
    632632
    633 <!ENTITY shadow-version "4.12.3">
    634 <!ENTITY shadow-size "1,707 KB">
     633<!ENTITY shadow-version "4.13">
     634<!ENTITY shadow-size "1,722 KB">
    635635<!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
    636 <!ENTITY shadow-md5 "710bcc89c39683609aacfef9f08bd854">
     636<!ENTITY shadow-md5 "b1ab01b5462ddcf43588374d57bec123">
    637637<!ENTITY shadow-home "https://shadow-maint.github.io/shadow/">
    638638<!ENTITY shadow-fin-du "46 MB">
    … …  
    664664<!ENTITY systemd-fin-sbu  "2.5 SBU">
    665665
    666 <!ENTITY sysvinit-version "3.04">
    667 <!ENTITY sysvinit-size "216 KB">
    668 <!ENTITY sysvinit-url "&savannah;/releases/sysvinit/sysvinit-&sysvinit-version;.tar.xz">
    669 <!ENTITY sysvinit-md5 "9a00e5f15dd2f038f10feee50677ebff">
     666<!ENTITY sysvinit-version "3.05">
     667<!ENTITY sysvinit-size "229 KB">
     668<!ENTITY sysvinit-url "&github;/slicer69/sysvinit/releases/download/&sysvinit-version;/sysvinit-&sysvinit-version;.tar.xz">
     669<!ENTITY sysvinit-md5 "57577060e5f21fd9899fa601aa45b064">
    670670<!ENTITY sysvinit-home "&savannah-nongnu;/projects/sysvinit">
    671671<!ENTITY sysvinit-fin-du "2.7 MB">
    … …  
    694694<!ENTITY tcl-tmp-sbu "3.2 SBU">
    695695
    696 <!ENTITY texinfo-version "6.8">
    697 <!ENTITY texinfo-size "4,848 KB">
     696<!ENTITY texinfo-version "7.0">
     697<!ENTITY texinfo-size "4,786 KB">
    698698<!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.xz">
    699 <!ENTITY texinfo-md5 "a91b404e30561a5df803e6eb3a53be71">
     699<!ENTITY texinfo-md5 "c9bda68c809e3afe67f1fbcd7c3d9fd3">
    700700<!ENTITY texinfo-home "&gnu-software;texinfo/">
    701701<!ENTITY texinfo-tmp-du "113 MB">
    … …  
    738738<!ENTITY vim-fin-sbu "2.5 SBU">
    739739
    740 <!ENTITY wheel-version "0.37.1">
    741 <!ENTITY wheel-size "65 KB">
     740<!ENTITY wheel-version "0.38.4">
     741<!ENTITY wheel-size "66 KB">
    742742<!ENTITY wheel-url "&pypi-src;/w/wheel/wheel-&wheel-version;.tar.gz">
    743 <!ENTITY wheel-md5 "f490f1399e5903706cb1d4fbed9ecb28">
     743<!ENTITY wheel-md5 "83bb4e7bd4d687d398733f341a64ab91">
    744744<!ENTITY wheel-home "&pypi-home;/wheel/">
    745745<!ENTITY wheel-fin-du "956 KB">

  • patches.ent

    r381c8a7 rcb7745e2  
    88<!ENTITY autoconf-fixes-patch-size "3.8 KB">
    99-->
    10 
     10<!--
    1111<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-1.patch">
    1212<!ENTITY bash-fixes-patch-md5 "5f20760139d6a97e55124988fcddae44">
    1313<!ENTITY bash-fixes-patch-size "2.0 KB">
    14 
     14-->
    1515<!--
    1616<!ENTITY binutils-lto-patch "binutils-&binutils-version;-lto_fix-1.patch">
    … …  
    8989-->
    9090<!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
    91 <!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
     91<!ENTITY sysvinit-consolidated-patch-md5 "372d367918134f2f41daf54f2acf280a">
    9292<!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
    9393

  • stylesheets/lfs-xsl/lfs-l10n.xml

    r381c8a7 rcb7745e2  
    100100  </l:l10n>
    101101
     102  <!-- Simplified Chinese -->
     103  <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
     104          language="zh_cn" english-language-name="Simplified Chinese">
     105
     106    <l:gentext key="description" text="描述"/>
     107    <l:gentext key="Bootscripts" text="引导脚本"/>
     108    <l:gentext key="Configuration Files" text="配置文件"/>
     109    <l:gentext key="Kernel Configuration" text="内核配置"/>
     110    <l:gentext key="Libraries" text="库"/>
     111    <l:gentext key="Others" text="其他"/>
     112    <l:gentext key="Packages" text="软件包"/>
     113    <l:gentext key="Programs" text="程序"/>
     114    <l:gentext key="Scripts" text="脚本"/>
     115
     116    <l:context name="title-numbered">
     117      <l:template name="part" text="第 %n 部分 %t"/>
     118    </l:context>
     119
     120    <l:gentext key="Copyright" text="版权所有"/>
     121
     122  </l:l10n>
     123
    102124</l:i18n>
Note: See TracChangeset for help on using the changeset viewer.