Merge branch 'trunk' into xry111/clfs-ng

This commit is contained in:
Xi Ruoyao 2022-03-15 21:07:53 +08:00
commit 6ebaf1e080
No known key found for this signature in database
GPG Key ID: D95E4716CCBB34DC
10 changed files with 65 additions and 30 deletions

View File

@ -40,6 +40,32 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
<para>2022-03-15</para>
<itemizedlist>
<listitem>
<para>[xry111] - Update to expat-2.4.7. Fixes
<ulink url="&lfs-ticket-root;5019">#5019</ulink>.</para>
</listitem>
<listitem>
<para>[xry111] - Update to bc-5.2.3. Fixes
<ulink url="&lfs-ticket-root;5020">#5020</ulink>.</para>
</listitem>
<listitem>
<para>[xry111] - Update to linux-5.16.14 (security fix). Fixes
<ulink url="&lfs-ticket-root;5021">#5021</ulink>.</para>
</listitem>
<listitem>
<para>[xry111] - Update to perl-5.34.1. Fixes
<ulink url="&lfs-ticket-root;5022">#5022</ulink>.</para>
</listitem>
<listitem>
<para>[xry111] - Update to vim-8.2.4567 (security fix).
Addresses <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2022-03-05</para>
<itemizedlist>

View File

@ -41,9 +41,9 @@
<!--<listitem>
<para>Bash &bash-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Bc &bc-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Binutils-&binutils-version;</para>
</listitem>-->
@ -74,9 +74,9 @@
<!--<listitem revision="sysv">
<para>Eudev-&eudev-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Expat-&expat-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Expect-&expect-version;</para>
</listitem>-->
@ -203,9 +203,9 @@
<!--<listitem>
<para>Patch-&patch-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Perl-&perl-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Pkg-config-&pkgconfig-version;</para>
</listitem>-->
@ -289,9 +289,9 @@
<title>Removed:</title>
<listitem><para></para></listitem> <!-- satisfy build -->
<!--<listitem>
<para>bash-5.0-upstream_fixes-1.patch</para>
</listitem>-->
<listitem>
<para>perl-5.34.0-upstream_fixes-1.patch</para>
</listitem>
</itemizedlist>

View File

@ -108,7 +108,7 @@
</listitem>
</varlistentry>
-->
<!--
<varlistentry>
<term>Perl Upstream Fix Patch - <token>&perl-fix-patch-size;</token>:</term>
<listitem>
@ -116,6 +116,7 @@
<para>MD5 sum: <literal>&perl-fix-patch-md5;</literal></para>
</listitem>
</varlistentry>
-->
<!--
<varlistentry>
<term>Shadow Segfault Fix Patch - <token>&shadow-segfault-patch-size;</token>:</term>

View File

@ -36,7 +36,7 @@
<para>Historically, Linux maintains a list of the mounted file systems in the
file <filename>/etc/mtab</filename>. Modern kernels maintain this list
internally and exposes it to the user via the <filename
internally and expose it to the user via the <filename
class="directory">/proc</filename> filesystem. To satisfy utilities that
expect the presence of <filename>/etc/mtab</filename>, create the following
symbolic link:</para>

View File

@ -168,9 +168,15 @@ esac</userinput></screen>
</listitem>
<listitem>
<para>The <emphasis>nss/tst-nss-files-hosts-multi</emphasis>
<para>The <emphasis>nss/tst-nss-files-hosts-long</emphasis>
test is known to fail if the system has no non-loopback IP
addresses.</para>
addresses.</para> <!-- PR 24816 -->
</listitem>
<listitem>
<para>The <emphasis>nss/tst-nss-files-hosts-multi</emphasis>
test is known to fail on relatively slow systems due to an internal
timeout.</para>
</listitem>
<!--
<listitem>

View File

@ -40,12 +40,12 @@
<sect2 role="installation">
<title>Installation of Perl</title>
<!--
<para>First, apply a patch that fixes an issue highlighted by recent
versions of gdbm:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&perl-fix-patch;</userinput></screen>
-->
<para>This version of Perl now builds the Compress::Raw::Zlib and
Compress::Raw::BZip2 modules. By
default Perl will use an internal copy of the sources for the build.

View File

@ -47,7 +47,7 @@
<!-- also of interest are libgfortan, libgo, libgomp, and libobjc from GCC -->
<!--<screen><userinput>save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"-->
<screen><userinput>save_usrlib="$(cd /usr/lib; ls ld-linux*)
<screen><userinput>save_usrlib="$(cd /usr/lib; ls ld-linux*)
libc.so.6
libthread_db.so.1
libquadmath.so.&libquadmath-version;

View File

@ -58,10 +58,10 @@
<!ENTITY bash-fin-du "50 MB">
<!ENTITY bash-fin-sbu "1.5 SBU">
<!ENTITY bc-version "5.2.2">
<!ENTITY bc-version "5.2.3">
<!ENTITY bc-size "428 KB">
<!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
<!ENTITY bc-md5 "632344cdb052af0e06087bd3b0034126">
<!ENTITY bc-md5 "804afda772aad9f8dd77847f8944a17d">
<!ENTITY bc-home "https://git.yzena.com/gavin/bc">
<!ENTITY bc-fin-du "7.1 MB">
<!ENTITY bc-fin-sbu "less than 0.1 SBU">
@ -163,10 +163,10 @@
<!ENTITY eudev-fin-du "83 MB">
<!ENTITY eudev-fin-sbu "0.2 SBU">
<!ENTITY expat-version "2.4.6">
<!ENTITY expat-version "2.4.7">
<!ENTITY expat-size "444 KB">
<!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz">
<!ENTITY expat-md5 "22a30c888752fdda9f8dd1b7281c54b0">
<!ENTITY expat-md5 "75a1f475e30281a00cb6f083ea481159">
<!ENTITY expat-home "https://libexpat.github.io/">
<!ENTITY expat-fin-du "12 MB">
<!ENTITY expat-fin-sbu "0.1 SBU">
@ -431,12 +431,12 @@
<!ENTITY linux-major-version "5">
<!ENTITY linux-minor-version "16">
<!ENTITY linux-patch-version "12">
<!ENTITY linux-patch-version "14">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-size "124,572 KB">
<!ENTITY linux-size "124,584 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "e859941968400c4437bd62b4fe39b7b7">
<!ENTITY linux-md5 "e972cda9b33bbd70737bfccb365410f8">
<!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
allnoconfig rounded down to allow for ongoing cleanups,
@ -558,12 +558,12 @@
<!ENTITY perl-version-major "5">
<!ENTITY perl-version-minor "34">
<!ENTITY perl-version-patch "0">
<!ENTITY perl-version-patch "1">
<!ENTITY perl-version-min "&perl-version-major;.&perl-version-minor;">
<!ENTITY perl-version "&perl-version-major;.&perl-version-minor;.&perl-version-patch;">
<!ENTITY perl-size "12,580 KB">
<!ENTITY perl-size "12,464 KB">
<!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
<!ENTITY perl-md5 "df7ecb0653440b26dc951ad9dbfab517">
<!ENTITY perl-md5 "7d2ece7f50775ea1ff739831935a24bd">
<!ENTITY perl-home "https://www.perl.org/">
<!ENTITY perl-tmp-du "272 MB">
<!ENTITY perl-tmp-sbu "1.6 SBU">
@ -728,13 +728,13 @@
<!ENTITY mount-setsid-du "85 MB">
<!ENTITY mount-setsid-sbu "less than 0.1 SBU">
<!ENTITY vim-version "8.2.4489">
<!ENTITY vim-version "8.2.4567">
<!ENTITY vim-majmin "82">
<!ENTITY vim-docdir "vim/vim82">
<!ENTITY vim-size "10,380 KB">
<!ENTITY vim-size "10,436 KB">
<!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.xz">
<!ENTITY vim-md5 "41e97917fc46d044ffe951c197509efe">
<!ENTITY vim-md5 "939fdfad067dec0e67bc4f8ad219cb4e">
<!ENTITY vim-home "https://www.vim.org">
<!ENTITY vim-fin-du "206 MB">
<!ENTITY vim-fin-sbu "2.4 SBU">

View File

@ -71,10 +71,11 @@
<!ENTITY ninja-limit-jobs-patch-md5 "f537a633532492e805aa342fa869ca45">
<!ENTITY ninja-limit-jobs-patch-size "2.5 KB">
-->
<!--
<!ENTITY perl-fix-patch "perl-&perl-version;-upstream_fixes-1.patch">
<!ENTITY perl-fix-patch-md5 "fb42558b59ed95ee00eb9f1c1c9b8056">
<!ENTITY perl-fix-patch-size "1.6 KB">
-->
<!--
<!ENTITY shadow-segfault-patch "shadow-&shadow-version;-useradd_segfault-1.patch">
<!ENTITY shadow-segfault-patch-md5 "66b299c0c9ac66fdb7c91b40df5984c0">

View File

@ -13,6 +13,7 @@ LINE=$(( LINE - 1 ))
# Not needed
#sed -i -e "$LINE s/monospace/&\" font-size=\"9pt/" $FILE
sed -i -e "s/monospace/&\" font-size=\"9pt/g" $FILE
# Break a block of code at the right place
sed -i -e 's@gcc --version@<fo:block page-break-before="always"></fo:block>&@' $FILE