Changeset ac82b96


Ignore:
Timestamp:
02/14/2024 09:45:08 AM (4 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/clfs-ng
Children:
83b0abd
Parents:
4d7ccf4 (diff), 96026a10 (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:

Merge remote-tracking branch 'origin/trunk' into xry111/clfs-ng

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    r4d7ccf4 rac82b96  
    4242
    4343    <listitem>
     44      <para>2024-02-12</para>
     45      <itemizedlist>
     46        <listitem>
     47          <para>[bdubbs] - Update to shadow-4.14.4.  Fixes
     48          <ulink url='&lfs-ticket-root;5437'>#5437</ulink>.</para>
     49        </listitem>
     50        <listitem>
     51          <para>[bdubbs] - Update to setuptools-69.1.0 (Python module).  Fixes
     52          <ulink url='&lfs-ticket-root;5439'>#5439</ulink>.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[bdubbs] - Update to python-3.12.2.  Fixes
     56          <ulink url='&lfs-ticket-root;5434'>#5434</ulink>.</para>
     57        </listitem>
     58        <listitem>
     59          <para>[bdubbs] - Update to pkgconf-2.1.1.  Fixes
     60          <ulink url='&lfs-ticket-root;5432'>#5432</ulink>.</para>
     61        </listitem>
     62        <listitem>
     63          <para>[bdubbs] - Update to MarkupSafe-2.1.5 (Python module).  Fixes
     64          <ulink url='&lfs-ticket-root;5431'>#5431</ulink>.</para>
     65        </listitem>
     66        <listitem>
     67          <para>[bdubbs] - Update to man-pages-6.06.  Fixes
     68          <ulink url='&lfs-ticket-root;5438'>#5438</ulink>.</para>
     69        </listitem>
     70        <listitem>
     71          <para>[bdubbs] - Update to expat-2.6.0.  Fixes
     72          <ulink url='&lfs-ticket-root;5435'>#5435</ulink>.</para>
     73        </listitem>
     74        <listitem>
     75          <para>[bdubbs] - Update to linux-6.7.4.  Fixes
     76          <ulink url='&lfs-ticket-root;5433'>#5433</ulink>.</para>
     77        </listitem>
     78      </itemizedlist>
     79    </listitem>
     80
     81    <listitem revision='systemd'>
     82      <para>2024-02-10</para>
     83      <itemizedlist>
     84        <listitem>
     85          <para>[xry111] - Fix a bug in systemd breaking running
     86          systemd-analyze on an instantiated systemd unit.</para>
     87        </listitem>
     88      </itemizedlist>
     89    </listitem>
     90
     91    <listitem>
    4492      <para>2024-02-02</para>
    4593      <itemizedlist>

  • chapter01/whatsnew.xml

    r4d7ccf4 rac82b96  
    7272       <para>E2fsprogs-&e2fsprogs-version;</para>
    7373    </listitem>-->
    74     <!--<listitem>
     74    <listitem>
    7575       <para>Expat-&expat-version;</para>
    76     </listitem>-->
     76    </listitem>
    7777    <!--<listitem>
    7878       <para>Expect-&expect-version;</para>
    … …  
    177177      <para>Man-DB-&man-db-version;</para>
    178178    </listitem>
    179     <!--<listitem>
     179    <listitem>
    180180      <para>Man-pages-&man-pages-version;</para>
    181     </listitem>-->
     181    </listitem>
    182182    <listitem>
    183183      <para>MarkupSafe-&markupsafe-version;</para>
    … …  
    225225      <para>Sed-&sed-version;</para>
    226226    </listitem>-->
    227     <!--<listitem>  After version 12.1 release - see Added
     227    <listitem>  <!-- After version 12.1 release - see Added -->
    228228      <para>Setuptools-&setuptools-version;</para>
    229     </listitem>-->
     229    </listitem>
    230230    <listitem>
    231231      <para>Shadow-&shadow-version;</para>
    … …  
    296296
    297297    <listitem>
     298      <para>&readline-fixes-patch;</para>
     299    </listitem>
     300
     301    <listitem>
    298302      <para>setuptools-&setuptools-version;</para>
    299303    </listitem>
    300304
    301305    <listitem>
    302       <para>&pkgconf-upstream-fix-patch;</para>
    303     </listitem>
    304 
    305     <listitem>
    306       <para>&readline-fixes-patch;</para>
     306      <para>&systemd-upstream-patch;</para>
    307307    </listitem>
    308308

  • chapter03/patches.xml

    r4d7ccf4 rac82b96  
    118118    </varlistentry>
    119119-->
    120 
     120<!--
    121121    <varlistentry>
    122122      <term>Pkgconf Upstream Fix Patch - <token>&pkgconf-upstream-fix-patch-size;</token>:</term>
    … …  
    126126      </listitem>
    127127    </varlistentry>
    128 
     128-->
    129129    <varlistentry>
    130130      <term>Readline Upstream Fix Patch - <token>&readline-fixes-patch-size;</token>:</term>
    … …  
    143143    </varlistentry>
    144144
    145 <!--
    146145    <varlistentry revision="systemd">
    147       <term>Systemd Upstream Patch - <token>&systemd-upstream-patch-size;</token>:</term>
     146      <term>Systemd Upstream Fixes Patch - <token>&systemd-upstream-patch-size;</token>:</term>
    148147      <listitem>
    149148        <para>Download: <ulink url="&patches-root;&systemd-upstream-patch;"/></para>
    … …  
    151150      </listitem>
    152151    </varlistentry>
    153 -->
    154152<!--
    155153    <varlistentry>

  • chapter08/expect.xml

    r4d7ccf4 rac82b96  
    6363    other virtual kernel file systems) mounted correctly.
    6464    This issue needs to be resolved before continuing, or the test suites
    65     requring Expect (for example the test suites of Bash, Binutils, GCC,
     65    requiring Expect (for example the test suites of Bash, Binutils, GCC,
    6666    GDBM, and of course Expect itself) will fail catastrophically, and other
    6767    subtle breakages may also happen.</para>

  • chapter08/pkgconf.xml

    r4d7ccf4 rac82b96  
    4444
    4545    <title>Installation of Pkgconf</title>
    46 
    47     <!-- https://github.com/pkgconf/pkgconf/issues/317 -->
    48     <para>Fix a regression in pkgconf-2.1.0 breaking BLFS packages:</para>
    49 
    50     <screen><userinput remap="pre">patch -Np1 -i ../&pkgconf-upstream-fix-patch;</userinput></screen>
    5146
    5247    <para>Prepare Pkgconf for compilation:</para>

  • chapter08/systemd.xml

    r4d7ccf4 rac82b96  
    5151    <!-- https://github.com/systemd/systemd/pull/30549 -->
    5252    <para>Now fix a security vulnerability in the DNSSEC verification of
    53     <command>systemd-resolved</command>:</para>
    54 
    55 <screen><userinput remap='pre'>sed -e '/return FLAGS_SET.*AUTHENTICATED/s/(t/(dt/' \
    56     -i src/resolve/resolved-dns-transaction.c</userinput></screen>
     53    <command>systemd-resolved</command> and a bug breaking running
     54    <command>systemd-analyze verify</command> on an instantiated systemd
     55    unit:</para>
     56
     57<screen><userinput remap='pre'>patch -Np1 -i ../&systemd-upstream-patch;</userinput></screen>
    5758
    5859    <para>Prepare systemd for compilation:</para>

  • packages.ent

    r4d7ccf4 rac82b96  
    157157<!ENTITY elfutils-fin-sbu "0.3 SBU">
    158158
    159 <!ENTITY expat-version "2.5.0">
    160 <!ENTITY expat-size "450 KB">
     159<!ENTITY expat-version "2.6.0">
     160<!ENTITY expat-size "473 KB">
    161161<!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz">
    162 <!ENTITY expat-md5 "ac6677b6d1b95d209ab697ce8b688704">
     162<!ENTITY expat-md5 "bd169cb11f4b9bdfddadf9e88a5c4d4b">
    163163<!ENTITY expat-home "https://libexpat.github.io/">
    164164<!ENTITY expat-fin-du "12 MB">
    … …  
    436436<!ENTITY linux-major-version "6">
    437437<!ENTITY linux-minor-version "7">
    438 <!ENTITY linux-patch-version "3">
     438<!ENTITY linux-patch-version "4">
    439439<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
    440440<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
    441 <!ENTITY linux-size "138,128 KB">
     441<!ENTITY linux-size "138,130 KB">
    442442<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
    443 <!ENTITY linux-md5 "a542a2aea4db4cf09e932fff02c8d1d1">
     443<!ENTITY linux-md5 "370e1b6155ae63133380e421146619e0">
    444444<!ENTITY linux-home "https://www.kernel.org/">
    445445<!-- measured for 6.5.3 / gcc-13.2.0 on x86_64 with -j4 : minimum is
    … …  
    487487<!ENTITY man-db-fin-sbu "0.2 SBU">
    488488
    489 <!ENTITY man-pages-version "6.05.01">
    490 <!ENTITY man-pages-size "2,144 KB">
     489<!ENTITY man-pages-version "6.06">
     490<!ENTITY man-pages-size "2,116 KB">
    491491<!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
    492 <!ENTITY man-pages-md5 "de4563b797cf9b1e0b0d73628b35e442">
     492<!ENTITY man-pages-md5 "26b39e38248144156d437e1e10cb20bf">
    493493<!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
    494494<!ENTITY man-pages-fin-du "33 MB">
    495495<!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
    496496
    497 <!ENTITY markupsafe-version "2.1.4">
    498 <!ENTITY markupsafe-size "20 KB">
     497<!ENTITY markupsafe-version "2.1.5">
     498<!ENTITY markupsafe-size "19 KB">
    499499<!ENTITY markupsafe-url "&pypi-src;/M/MarkupSafe/MarkupSafe-&markupsafe-version;.tar.gz">
    500 <!ENTITY markupsafe-md5 "8138329a11cf4bd0f9db780b2af26c66">
     500<!ENTITY markupsafe-md5 "8fe7227653f2fb9b1ffe7f9f2058998a">
    501501<!ENTITY markupsafe-home "https://palletsprojects.com/p/markupsafe/">
    502502<!ENTITY markupsafe-fin-du "548 KB">
    … …  
    580580<!ENTITY perl-fin-sbu "7.1 SBU">
    581581
    582 <!ENTITY pkgconf-version "2.1.0">
     582<!ENTITY pkgconf-version "2.1.1">
    583583<!ENTITY pkgconf-size "305 KB">
    584584<!ENTITY pkgconf-url "https://distfiles.ariadne.space/pkgconf/pkgconf-&pkgconf-version;.tar.xz">
    585 <!ENTITY pkgconf-md5 "0f2eadbb9dea5aed95147272ae1592cc">
     585<!ENTITY pkgconf-md5 "bc29d74c2483197deb9f1f3b414b7918">
    586586<!ENTITY pkgconf-home "http://pkgconf.org/">
    587587<!ENTITY pkgconf-fin-du "4.6 MB">
    … …  
    607607     meson pages will be needed: python3.6 and python3.6m -->
    608608
    609 <!ENTITY python-version "3.12.1">
     609<!ENTITY python-version "3.12.2">
    610610<!ENTITY python-minor "3.12">
    611 <!ENTITY python-size "20,102 KB">
     611<!ENTITY python-size "20,109 KB">
    612612<!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
    613 <!ENTITY python-md5 "50f827c800483776c8ef86e6a53831fa">
     613<!ENTITY python-md5 "e7c178b97bf8f7ccd677b94d614f7b3c">
    614614<!ENTITY python-home "https://www.python.org/">
    615615<!ENTITY python-tmp-du "533 MB">
    … …  
    618618<!ENTITY python-fin-sbu "1.9 SBU">
    619619<!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
    620 <!ENTITY python-docs-md5 "d5c21b804c219b06256495eae30fd153">
    621 <!ENTITY python-docs-size "7,998 KB">
     620<!ENTITY python-docs-md5 "8a6310f6288e7f60c3565277ec3b5279">
     621<!ENTITY python-docs-size "8,065 KB">
    622622
    623623<!ENTITY readline-version "8.2">
    … …  
    640640<!ENTITY sed-fin-sbu "0.3 SBU">
    641641
    642 <!ENTITY setuptools-version "69.0.3">
     642<!ENTITY setuptools-version "69.1.0">
    643643<!ENTITY setuptools-size "2,168 KB">
    644644<!ENTITY setuptools-url "&pypi-src;/s/setuptools/setuptools-&setuptools-version;.tar.gz">
    645 <!ENTITY setuptools-md5 "b82de45aaa6b9bb911226660212ebb83">
     645<!ENTITY setuptools-md5 "6f6eb780ce12c90d81ce243747ed7ab0">
    646646<!ENTITY setuptools-home "&pypi-home;/setuptools/">
    647647<!ENTITY setuptools-fin-du "30 MB">
    648648<!ENTITY setuptools-fin-sbu "0.1 SBU">
    649649
    650 <!ENTITY shadow-version "4.14.3">
    651 <!ENTITY shadow-size "1,760 KB">
     650<!ENTITY shadow-version "4.14.4">
     651<!ENTITY shadow-size "1,764 KB">
    652652<!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
    653 <!ENTITY shadow-md5 "b9a7f56d0c63297c0d11d742be2f8ffd">
     653<!ENTITY shadow-md5 "2189c4552a78c71010dd4ff2bc4ba1e4">
    654654<!ENTITY shadow-home "&github;/shadow-maint/shadow/">
    655655<!ENTITY shadow-fin-du "46 MB">

  • patches.ent

    r4d7ccf4 rac82b96  
    2727<!ENTITY kbd-backspace-patch-size "12 KB">
    2828
    29 <!ENTITY pkgconf-upstream-fix-patch "pkgconf-&pkgconf-version;-upstream_fix-1.patch">
    30 <!ENTITY pkgconf-upstream-fix-patch-md5 "77d5bb10840724a0e3dc08efee548363">
    31 <!ENTITY pkgconf-upstream-fix-patch-size "4 KB">
    32 
    3329<!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-3.patch">
    3430<!ENTITY readline-fixes-patch-md5 "9ed497b6cb8adcb8dbda9dee9ebce791">
    … …  
    3935<!ENTITY sysvinit-consolidated-patch-size "2.5 KB">
    4036
     37<!ENTITY systemd-upstream-patch "systemd-&systemd-version;-upstream_fixes-1.patch">
     38<!ENTITY systemd-upstream-patch-md5 "8d9c1014445c463cf7c24c162b1e0686">
     39<!ENTITY systemd-upstream-patch-size "7.2 KB">

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

    r4d7ccf4 rac82b96  
    11<?xml version='1.0' encoding='UTF-8'?>
    2 <!DOCTYPE l:i18n SYSTEM "https://cdn.docbook.org/release/xsl-nons/current/common/l10n.dtd">
     2<!DOCTYPE l:i18n SYSTEM "http://cdn.docbook.org/release/xsl-nons/current/common/l10n.dtd">
    33
    44<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
Note: See TracChangeset for help on using the changeset viewer.