From 582da16ec4c90fb4e670eeae4d4868d7da610e24 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 15 Mar 2022 00:26:26 +0800 Subject: [PATCH 1/3] glibc: fix the desc of nss/tst-nss-files-hosts-multi failure, and ... mention nss/tst-nss-files-hosts-long failure It seems I was confused by the two failures with similar name, when I added the description. --- chapter08/glibc.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index 6615926ec..4e241b40f 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -167,9 +167,15 @@ esac - The nss/tst-nss-files-hosts-multi + The nss/tst-nss-files-hosts-long test is known to fail if the system has no non-loopback IP - addresses. + addresses. + + + + The nss/tst-nss-files-hosts-multi + test is known to fail on relatively slow systems due to an internal + timeout. - save_usrlib="$(cd /usr/lib; ls ld-linux*) +save_usrlib="$(cd /usr/lib; ls ld-linux*) libc.so.6 libthread_db.so.1 libquadmath.so.&libquadmath-version; diff --git a/pdf-fixups.sh b/pdf-fixups.sh index 44fe56370..d39d3f10f 100755 --- a/pdf-fixups.sh +++ b/pdf-fixups.sh @@ -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@&@' $FILE From f7ac150c84e41125402dcb0938bb8a25396f3b7b Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 15 Mar 2022 16:10:57 +0800 Subject: [PATCH 3/3] package update * update to expat-2.4.7 (#5019) * update to bc-5.2.3 (#5020) * update to linux-5.16.14 (#5021) * update to perl-5.34.1 (#5022) * update to vim-8.2.4567 (#4500) --- chapter01/changelog.xml | 26 ++++++++++++++++++++++++++ chapter01/whatsnew.xml | 18 +++++++++--------- chapter03/patches.xml | 3 ++- chapter08/perl.xml | 4 ++-- packages.ent | 26 +++++++++++++------------- patches.ent | 3 ++- 6 files changed, 54 insertions(+), 26 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 72cebc79e..4e7715d51 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,32 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2022-03-15 + + + [xry111] - Update to expat-2.4.7. Fixes + #5019. + + + [xry111] - Update to bc-5.2.3. Fixes + #5020. + + + [xry111] - Update to linux-5.16.14 (security fix). Fixes + #5021. + + + [xry111] - Update to perl-5.34.1. Fixes + #5022. + + + [xry111] - Update to vim-8.2.4567 (security fix). + Addresses #4500. + + + + 2022-03-05 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index e009291ca..c48e088fe 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -41,9 +41,9 @@ - + @@ -74,9 +74,9 @@ - + @@ -203,9 +203,9 @@ - + @@ -289,9 +289,9 @@ Removed: - + + perl-5.34.0-upstream_fixes-1.patch + diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 4b24fad1f..c4dae4abb 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -108,7 +108,7 @@ --> - + 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. diff --git a/packages.ent b/packages.ent index fb2704ff7..70d6198d7 100644 --- a/packages.ent +++ b/packages.ent @@ -58,10 +58,10 @@ - + - + @@ -163,10 +163,10 @@ - + - + @@ -427,12 +427,12 @@ - + - + - + - + diff --git a/patches.ent b/patches.ent index 7e43f7e0a..5dd7ffcaa 100644 --- a/patches.ent +++ b/patches.ent @@ -71,10 +71,11 @@ --> - +