Changeset d09e490


Ignore:
Timestamp:
03/05/2023 10:16:29 AM (14 months ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib
Children:
ce49ad6
Parents:
4e897cf (diff), 271c856 (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:
11 edited

Legend:

Unmodified
Added
Removed

  • appendices/dependencies.xml

    r4e897cf rd09e490  
    388388        <segtitle>&before;</segtitle>
    389389        <seglistitem>
    390           <seg>File</seg>
     390          <seg>File and Libelf</seg>
    391391        </seglistitem>
    392392      </segmentedlist>
    … …  
    16861686        <segtitle>&dependencies;</segtitle>
    16871687        <seglistitem>
    1688           <seg>Bash, Binutils, Coreutils, GCC, Glibc, and Make</seg>
     1688          <seg>Bash, Binutils, Bzip2, Coreutils, GCC, Glibc, Make, Xz,
     1689          Zlib, and Zstd</seg>
    16891690        </seglistitem>
    16901691      </segmentedlist>
    … …  
    16931694        <segtitle>&runtime;</segtitle>
    16941695        <seglistitem>
    1695           <seg>Glibc and Zlib</seg>
     1696          <seg>Bzip2, Glibc, Xz, Zlib, and Zstd</seg>
    16961697        </seglistitem>
    16971698      </segmentedlist>
    … …  
    32063207        <seglistitem>
    32073208          <seg><phrase revision="sysv">Eudev, </phrase>File, GRUB, Kmod,
    3208           <phrase revision="sysv">and </phrase>Man-DB<phrase
     3209          Libelf, <phrase revision="sysv">and </phrase>Man-DB<phrase
    32093210          revision="systemd">, and Systemd</phrase></seg>
    32103211        </seglistitem>
    … …  
    32453246        <segtitle>&before;</segtitle>
    32463247        <seglistitem>
    3247           <seg>File, Kmod, Perl, and Util-linux</seg>
     3248          <seg>File, Kmod, Libelf, Perl, and Util-linux</seg>
    32483249        </seglistitem>
    32493250      </segmentedlist>
    … …  
    32833284        <segtitle>&before;</segtitle>
    32843285        <seglistitem>
    3285           <seg>GCC <phrase revision='systemd'>and Systemd</phrase></seg>
     3286          <seg><phrase revision='sysv'>GCC and Libelf</phrase>
     3287          <phrase revision='systemd'>GCC, Libelf, and Systemd</phrase></seg>
    32863288        </seglistitem>
    32873289      </segmentedlist>

  • chapter01/changelog.xml

    r4e897cf rd09e490  
    4343      <para>2023-03-04</para>
    4444      <itemizedlist>
     45        <listitem revision='systemd'>
     46          <para>[xry111] - Update to systemd-253.  Fixes
     47          <ulink url='&lfs-ticket-root;5206'>#5206</ulink>.</para>
     48        </listitem>
     49        <listitem>
     50          <para>[xry111] - Update to bc-6.3.1.  Fixes
     51          <ulink url='&lfs-ticket-root;5217'>#5217</ulink>.</para>
     52        </listitem>
     53        <listitem>
     54          <para>[xry111] - Update to linux-6.2.2 (security fixes).  Fixes
     55          <ulink url='&lfs-ticket-root;5218'>#5218</ulink>.</para>
     56        </listitem>
     57        <listitem>
     58          <para>[xry111] - Update to procps-ng-4.0.3.  Fixes
     59          <ulink url='&lfs-ticket-root;5220'>#5220</ulink>.</para>
     60        </listitem>
     61        <listitem>
     62          <para>[xry111] - Update to iproute2-6.2.0.  Fixes
     63          <ulink url='&lfs-ticket-root;5221'>#5221</ulink>.</para>
     64        </listitem>
     65        <listitem>
     66          <para>[xry111] - Update to meson-1.0.1.  Fixes
     67          <ulink url='&lfs-ticket-root;5222'>#5222</ulink>.</para>
     68        </listitem>
     69        <listitem>
     70          <para>[xry111] - Update to make-4.4.1.  Fixes
     71          <ulink url='&lfs-ticket-root;5223'>#5223</ulink>.</para>
     72        </listitem>
     73        <listitem>
     74          <para>[xry111] - Update to libelf-0.189.  Fixes
     75          <ulink url='&lfs-ticket-root;5224'>#5224</ulink>.</para>
     76        </listitem>
    4577        <listitem>
    4678          <para>[bdubbs] - Change to a better host requirements script in Chapter 2.</para>

  • chapter01/whatsnew.xml

    r4e897cf rd09e490  
    5050      <para>Bash &bash-version;</para>
    5151    </listitem>-->
    52     <!--<listitem>
     52    <listitem>
    5353      <para>Bc &bc-version;</para>
    54     </listitem>-->
     54    </listitem>
    5555    <!--<listitem>
    5656      <para>Binutils-&binutils-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>
    … …  
    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>
    … …  
    173173      <para>Libtool-&libtool-version;</para>
    174174    </listitem>-->
    175     <!--<listitem>
     175    <listitem>
    176176      <para>Linux-&linux-version;</para>
    177     </listitem>-->
     177    </listitem>
    178178    <!--<listitem>
    179179      <para>M4-&m4-version;</para>
    180180    </listitem>-->
    181     <!--<listitem>
     181    <listitem>
    182182      <para>Make-&make-version;</para>
    183     </listitem>-->
     183    </listitem>
    184184    <!--<listitem>
    185185      <para>Man-DB-&man-db-version;</para>
    … …  
    191191      <para>MarkupSafe-&markupsafe-version;</para>
    192192    </listitem>-->
    193     <!--<listitem>
     193    <listitem>
    194194      <para>Meson-&meson-version;</para>
    195     </listitem>-->
     195    </listitem>
    196196    <!--<listitem>
    197197      <para>MPC-&mpc-version;</para>
    … …  
    218218      <para>Pkg-config-&pkgconfig-version;</para>
    219219    </listitem>-->
    220     <!--<listitem>
     220    <listitem>
    221221      <para>Procps-ng-&procps-ng-version;</para>
    222     </listitem>-->
     222    </listitem>
    223223    <!--<listitem>
    224224      <para>Psmisc-&psmisc-version;</para>
    … …  
    239239      <para>Sysklogd-&sysklogd-version;</para>
    240240    </listitem>-->
    241     <!--<listitem revision="systemd">
     241    <listitem revision="systemd">
    242242      <para>Systemd-&systemd-version;</para>
    243     </listitem>-->
     243    </listitem>
    244244    <!--<listitem revision="sysv">
    245245      <para>SysVinit-&sysvinit-version;</para>
    … …  
    310310    <listitem><para></para></listitem>  <!-- satisfy build -->
    311311
    312     <!--<listitem>
    313       <para>zstd-1.5.2-upstream_fixes-1.patch</para>
    314     </listitem>-->
     312    <listitem>
     313      <para>systemd-252-security_fix-1.patch</para>
     314    </listitem>
    315315  </itemizedlist>
    316316

  • chapter02/hostreqs.xml

    r4e897cf rd09e490  
    5656
    5757    <listitem>
    58       <para><emphasis role="strong">Coreutils-6.9</emphasis></para>
     58      <para><emphasis role="strong">Coreutils-7.0</emphasis></para>
    5959    </listitem>
    6060
    … …  
    166166
    167167<screen role="nodump"><userinput>cat &gt; version-check.sh &lt;&lt; "EOF"
    168 <literal> #!/bin/bash
     168<literal>#!/bin/bash
    169169# A script to list version numbers of critical development tools
    170170
    … …  
    186186     echo "ERROR: Cannot find $2 ($1)"; return 1;
    187187   fi
    188    v=$($2 --version 2>&amp;1 | grep -E -o '[0-9]+\.[0-9\.]+' | head -n1)
     188   v=$($2 --version 2>&amp;1 | grep -E -o '[0-9]+\.[0-9\.]+[a-z]*' | head -n1)
    189189   if printf '%s\n' $3 $v | sort --version-sort --check &amp;>/dev/null
    190190   then
    … …  
    198198ver_kernel()
    199199{
    200    kver=$(uname -r | sed -E 's/^([0-9\.]+).*/\1/')
     200   kver=$(uname -r | grep -E -o '[0-9\.]+')
    201201   if printf '%s\n' $1 $kver | sort --version-sort --check &amp;>/dev/null
    202202   then
    … …  
    218218ver_check GCC            gcc      5.1
    219219ver_check "GCC (C++)"    g++      5.1
    220 ver_check Grep           grep     2.6.1
     220ver_check Grep           grep     2.5.1a
    221221ver_check Gzip           gzip     1.3.12
    222222ver_check M4             m4       1.4.10
    … …  
    229229ver_check Texinfo        texi2any 4.7
    230230ver_check Xz             xz       5.0.0
    231 #ver_check "Linux Kernel" "" 3.2 'cat /proc/version'
    232 ver_kernel 3.2
     231ver_kernel &min-kernel;
    233232
    234233alias_check() {
    … …  
    242241alias_check sh Bash
    243242
    244 echo "Compiler check"
     243echo "Compiler check:"
    245244if printf "int main(){}" | g++ -x c++ -
    246245then echo "OK:    g++ works";

  • chapter03/patches.xml

    r4e897cf rd09e490  
    144144    </varlistentry>
    145145
    146 
     146<!--
    147147    <varlistentry revision="systemd">
    148148      <term>Systemd Upstream Patch - <token>&systemd-upstream-patch-size;</token>:</term>
    … …  
    152152      </listitem>
    153153    </varlistentry>
    154 
     154-->
    155155<!--
    156156    <varlistentry>

  • chapter06/make.xml

    r4e897cf rd09e490  
    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 
    5145    <para>Prepare Make for compilation:</para>
    5246

  • chapter08/libelf.xml

    r4e897cf rd09e490  
    5858
    5959<screen><userinput remap="test">make check</userinput></screen>
    60 
    61     <!-- https://sourceware.org/bugzilla/show_bug.cgi?id=30047 -->
    62     <para>The test named <filename>run-native-test.sh</filename> is known to
    63     fail.</para>
    6460
    6561    <para>Install only Libelf:</para>

  • chapter08/make.xml

    r4e897cf rd09e490  
    4242    <title>Installation of Make</title>
    4343
    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 
    5044    <para>Prepare Make for compilation:</para>
    5145
    … …  
    5650<screen><userinput remap="make">make</userinput></screen>
    5751
     52    <!-- Running tests as root causes failures:
     53         https://savannah.gnu.org/bugs/?63852 -->
    5854    <para>To test the results, issue:</para>
    5955
    60 <screen><userinput remap="test">make check</userinput></screen>
     56<screen><userinput remap="test">chown -Rv tester .
     57su tester -c "PATH=$PATH make check"</userinput></screen>
    6158
    6259    <para>Install the package:</para>

  • chapter08/systemd.xml

    r4e897cf rd09e490  
    4040  <sect2 role="installation">
    4141    <title>Installation of systemd</title>
    42 
    43 
    44     <para>First, fix a security issue in systemd-coredump:</para>
    45 
    46 <screen><userinput remap="pre">patch -Np1 -i ../&systemd-upstream-patch;</userinput></screen>
    47 
    4842
    4943    <para>Remove two unneeded groups,
    … …  
    353347        systemctl), reboot (symlink to systemctl), resolvconf (symlink to
    354348        resolvectl), resolvectl, runlevel (symlink to systemctl), shutdown
    355         (symlink to systemctl), systemctl, systemd-analyze,
     349        (symlink to systemctl), systemctl, systemd-ac-power, systemd-analyze,
    356350        systemd-ask-password, systemd-cat, systemd-cgls, systemd-cgtop,
    357351        systemd-creds, systemd-delta, systemd-detect-virt,
    … …  
    606600      </varlistentry>
    607601
     602      <varlistentry id="systemd-ac-power">
     603        <term><command>systemd-ac-power</command></term>
     604        <listitem>
     605          <para>Reports whether the system is connected to an external
     606          power source.</para>
     607          <indexterm zone="ch-system-systemd systemd-ac-power">
     608            <primary sortas="b-systemd-ac-power">systemd-ac-power</primary>
     609          </indexterm>
     610        </listitem>
     611      </varlistentry>
     612
    608613      <varlistentry id="systemd-analyze">
    609614        <term><command>systemd-analyze</command></term>

  • packages.ent

    r4e897cf rd09e490  
    5959<!ENTITY bash-fin-sbu "1.2 SBU">
    6060
    61 <!ENTITY bc-version "6.2.4">
    62 <!ENTITY bc-size "447 KB">
     61<!ENTITY bc-version "6.3.1">
     62<!ENTITY bc-size "448 KB">
    6363<!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
    64 <!ENTITY bc-md5 "5245ff400df17b66be7621c7a6498953">
     64<!ENTITY bc-md5 "70caa7c8a273d7152ad015823e887455">
    6565<!ENTITY bc-home "https://git.gavinhoward.com/gavin/bc">
    6666<!ENTITY bc-fin-du "7.6 MB">
    … …  
    149149<!ENTITY e2fsprogs-fin-sbu "2.4 SBU on a spinning disk, 0.4 SBU on an SSD">
    150150
    151 <!ENTITY elfutils-version "0.188"> <!-- libelf -->
    152 <!ENTITY elfutils-size "8,900 KB">
     151<!ENTITY elfutils-version "0.189"> <!-- libelf -->
     152<!ENTITY elfutils-size "8,936 KB">
    153153<!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
    154 <!ENTITY elfutils-md5 "efb25a91873b2eec4df9f31e6a4f4e5c">
     154<!ENTITY elfutils-md5 "5cfaa711a90cb670406cd495aeaa6030">
    155155<!ENTITY elfutils-home "https://sourceware.org/elfutils/">
    156156<!ENTITY elfutils-fin-du "120 MB">
    … …  
    343343<!ENTITY intltool-fin-sbu "less than 0.1 SBU">
    344344
    345 <!ENTITY iproute2-version "6.1.0">
    346 <!ENTITY iproute2-size "885 KB">
     345<!ENTITY iproute2-version "6.2.0">
     346<!ENTITY iproute2-size "892 KB">
    347347<!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
    348 <!ENTITY iproute2-md5 "f3ff4461e25dbc5ef1fb7a9167a9523d">
     348<!ENTITY iproute2-md5 "85861856a856f6d358c6d9a4fc9088c9">
    349349<!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
    350350<!ENTITY iproute2-fin-du "17 MB">
    … …  
    433433
    434434<!ENTITY linux-major-version "6">
    435 <!ENTITY linux-minor-version "1">
    436 <!ENTITY linux-patch-version "11">
     435<!ENTITY linux-minor-version "2">
     436<!ENTITY linux-patch-version "2">
    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 "131,653 KB">
     439<!ENTITY linux-size "133,236 KB">
    440440<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    441 <!ENTITY linux-md5 "f91621912cd58ac6d4128d4057980e7d">
     441<!ENTITY linux-md5 "03b17feb98f92131a465b09f3a12e715">
    442442<!ENTITY linux-home "https://www.kernel.org/">
    443443<!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
    … …  
    460460<!ENTITY m4-fin-sbu "0.3 SBU">
    461461
    462 <!ENTITY make-version "4.4">
    463 <!ENTITY make-size "2,254 KB">
     462<!ENTITY make-version "4.4.1">
     463<!ENTITY make-size "2,300 KB">
    464464<!ENTITY make-url "&gnu;make/make-&make-version;.tar.gz">
    465 <!ENTITY make-md5 "d7575a26a94ee8427130e9db23cdaa78">
     465<!ENTITY make-md5 "c8469a3713cbbe04d955d4ae4be23eeb">
    466466<!ENTITY make-home "&gnu-software;make/">
    467467<!ENTITY make-tmp-du "15 MB">
    … …  
    494494<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
    495495
    496 <!ENTITY meson-version "1.0.0">
    497 <!ENTITY meson-size "2,051 KB">
     496<!ENTITY meson-version "1.0.1">
     497<!ENTITY meson-size "2,056 KB">
    498498<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
    499 <!ENTITY meson-md5 "009b78125467cd9ee4d467175a5c12e1">
     499<!ENTITY meson-md5 "843ba549bb2a199d9e04092116a7e749">
    500500<!ENTITY meson-home "https://mesonbuild.com">
    501501<!ENTITY meson-fin-du "41 MB">
    … …  
    576576<!ENTITY pkgconfig-fin-sbu "0.1 SBU">
    577577
    578 <!ENTITY procps-ng-version "4.0.2">
    579 <!ENTITY procps-ng-size "1250 KB">
     578<!ENTITY procps-ng-version "4.0.3">
     579<!ENTITY procps-ng-size "1,268 KB">
    580580<!ENTITY procps-ng-url "https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
    581 <!ENTITY procps-ng-md5 "691748c4767f19b9d94ed9d088e40c4d">
     581<!ENTITY procps-ng-md5 "22b287bcd758831cbaf3356cd3054fe7">
    582582<!ENTITY procps-ng-home "https://sourceforge.net/projects/procps-ng">
    583583<!ENTITY procps-ng-fin-du "26 MB">
    … …  
    644644<!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
    645645
    646 <!ENTITY systemd-version  "252">
     646<!ENTITY systemd-version  "253">
    647647<!--<!ENTITY systemd-stable   "6b4878d">-->
    648648<!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel
    649649     change that is incompatible, we will switch to the backport branch until the next stable release. -->
    650 <!ENTITY systemd-size     "11,488 KB">
     650<!ENTITY systemd-size     "11,708 KB">
    651651<!ENTITY systemd-url      "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
    652652<!--<!ENTITY systemd-url      "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
    653 <!ENTITY systemd-md5      "b9456750a212dd54d81caeb3c38134b6">
     653<!ENTITY systemd-md5      "7cf12ee8a91a04306fc6cf290eed42e8">
    654654<!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
    655 <!ENTITY systemd-man-version "252-2">
    656 <!ENTITY systemd-man-size "628 KB">
     655<!ENTITY systemd-man-version "253">
     656<!ENTITY systemd-man-size "600 KB">
    657657<!--<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
    658658<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz">
    659 <!ENTITY systemd-man-md5  "c1df1aefdbc4840b5f82a8783f3b72c1">
     659<!ENTITY systemd-man-md5  "8b54792c9433fc8db8e5d10db326802d">
    660660<!ENTITY systemd-fin-du   "258 MB">
    661661<!ENTITY systemd-fin-sbu  "0.7 SBU">

  • patches.ent

    r4e897cf rd09e490  
    9090<!ENTITY sysvinit-consolidated-patch-size "2.5 KB">
    9191
    92 
     92<!--
    9393<!ENTITY systemd-upstream-patch "systemd-&systemd-version;-security_fix-1.patch">
    9494<!ENTITY systemd-upstream-patch-md5 "da817e69e897d35cdffd7c45ea06be39">
    9595<!ENTITY systemd-upstream-patch-size "76.0 KB">
    96 
     96-->
    9797<!--
    9898<!ENTITY xz-upstream-fix-patch "xz-&xz-version;-upstream_fix-1.patch">
Note: See TracChangeset for help on using the changeset viewer.