From 9a178619b934f7dca245c7cebd63dbebc4039c3b Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 23 Apr 2021 01:38:47 +0800 Subject: [PATCH 1/6] add a paragraph for "downgrading issue" in package management page --- chapter08/pkgmgt.xml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/chapter08/pkgmgt.xml b/chapter08/pkgmgt.xml index e898416d8..6c628c3d6 100644 --- a/chapter08/pkgmgt.xml +++ b/chapter08/pkgmgt.xml @@ -71,7 +71,27 @@ against libfoo.so.2 in order to use the new library version. You should not remove the previous libraries unless all the dependent packages are recompiled. - + + + If a package containing a shared library is updated, + and the name of library doesn't change, but the version number of the + library file decreases (for example, + the name of the library is kept named + libfoo.so.1, + but the name of library file is changed from + libfoo.so.1.25 to + libfoo.so.1.24), + you should remove the library file from the previously installed version + (libfoo.so.1.25 in the case). + Or, a ldconfig run (by yourself using a command + line, or by the installation of some package) will reset the symlink + libfoo.so.1 to point to + the old library file because it seems having a newer + version, as its version number is larger. This situation may happen if + you have to downgrade a package, or the package changes the versioning + scheme of library files suddenly. + + From 61707b171ecaedfc9141b30e35242bef94ebbc70 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 23 Apr 2021 18:57:29 +0800 Subject: [PATCH 2/6] secure LFS URL --- INSTALL | 18 +++++++++--------- chapter01/resources.xml | 2 +- chapter03/introduction.xml | 2 +- general.ent | 4 ++-- prologue/architecture.xml | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/INSTALL b/INSTALL index 182598e55..7f87aab69 100644 --- a/INSTALL +++ b/INSTALL @@ -6,26 +6,26 @@ read (e.g. HTML, TXT, or PDF). If you are interested in this, then keep reading. If you are only interested in editing the XML source for re- submission to the lfs-book or lfs-dev mailing lists, then you do not need this document. Instead, you need to read the LFS Editor's Manual. See the LFS -website at http://www.linuxfromscratch.org for more information. +website at https://www.linuxfromscratch.org for more information. ------------------------------------------------------------------------------- If you want to convert the XML to HTML, install the following: * libxml2 - - http://www.linuxfromscratch.org/blfs/view/svn/general/libxml2.html + - https://www.linuxfromscratch.org/blfs/view/svn/general/libxml2.html * libxslt - - http://www.linuxfromscratch.org/blfs/view/svn/general/libxslt.html + - https://www.linuxfromscratch.org/blfs/view/svn/general/libxslt.html * DocBook DTD - - http://www.linuxfromscratch.org/blfs/view/svn/pst/xml.html + - https://www.linuxfromscratch.org/blfs/view/svn/pst/xml.html * DocBook XSL Stylesheets - - http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html + - https://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html * HTMLTidy - - http://www.linuxfromscratch.org/blfs/view/svn/general/tidy-html5.html + - https://www.linuxfromscratch.org/blfs/view/svn/general/tidy-html5.html ------------------------------------------------------------------------------- @@ -33,7 +33,7 @@ If you want to convert the XML to TXT, install the above items, and then install the following: * lynx - - http://www.linuxfromscratch.org/blfs/view/svn/basicnet/lynx.html + - https://www.linuxfromscratch.org/blfs/view/svn/basicnet/lynx.html ------------------------------------------------------------------------------- @@ -41,7 +41,7 @@ If you want to convert the XML to PDF, install the items listed above (except lynx) and then install the following: * JDK - - http://www.linuxfromscratch.org/blfs/view/svn/general/openjdk.html + - https://www.linuxfromscratch.org/blfs/view/svn/general/openjdk.html * FOP and JAI - - http://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html + - https://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html diff --git a/chapter01/resources.xml b/chapter01/resources.xml index b3074d2e6..1642f5815 100644 --- a/chapter01/resources.xml +++ b/chapter01/resources.xml @@ -67,7 +67,7 @@ For additional information on the packages, useful tips are available in the LFS Package Reference page located at . + url="https://www.linuxfromscratch.org/~matthew/LFS-references.html"/>. --> diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml index 7a7626d92..9b05ce7ff 100644 --- a/chapter03/introduction.xml +++ b/chapter03/introduction.xml @@ -60,7 +60,7 @@ For stable versions of the book, a tarball of all the needed files can be downloaded from one of the LFS files mirrors listed at - . + . The files can be downloaded using wget and diff --git a/general.ent b/general.ent index bde4680b8..87473b365 100644 --- a/general.ent +++ b/general.ent @@ -20,7 +20,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/prologue/architecture.xml b/prologue/architecture.xml index 9916840f5..ca240183c 100644 --- a/prologue/architecture.xml +++ b/prologue/architecture.xml @@ -44,7 +44,7 @@ This is not directly supported in LFS because it would interfere with the educational objective of providing the instructions needed for a straightforward base Linux system. Some LFS/BLFS editors maintain a fork of LFS for multilib, which is accessible at . But it +url="https://www.linuxfromscratch.org/~thomas/multilib/index.html"/>. But it is an advanced topic. From 4612211a9080251a02e4b3235c41db55f586a6b3 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Fri, 23 Apr 2021 22:03:03 -0500 Subject: [PATCH 3/6] Update mail address in currency check. --- lfs-latest-git.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs-latest-git.php b/lfs-latest-git.php index 24024da50..fa0cecbcf 100644 --- a/lfs-latest-git.php +++ b/lfs-latest-git.php @@ -380,10 +380,10 @@ function mail_to_lfs() global $vers; global $dirs; - $to = "lfs-book@lists4.linuxfromscratch.org"; - $from = "bdubbs@rivendell.linuxfromscratch.org"; + $to = "lfs-book@lists.linuxfromscratch.org"; + $from = "bdubbs@linuxfromscratch.org"; $subject = "LFS Package Currency Check - $date GMT"; - $headers = "From: bdubbs@rivendell.linuxfromscratch.org"; + $headers = "From: bdubbs@linuxfromscratch.org"; $message = "Package LFS Upstream Flag\n\n"; From af548cd4ae4426e330da08804abe6e9802f4759d Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 24 Apr 2021 22:22:08 +0800 Subject: [PATCH 4/6] mention make-ca in rebooting --- chapter11/reboot.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/chapter11/reboot.xml b/chapter11/reboot.xml index 611967cf9..5ecd2a2f7 100644 --- a/chapter11/reboot.xml +++ b/chapter11/reboot.xml @@ -25,6 +25,12 @@ will allow you to easily view the BLFS book in one virtual terminal, while building packages in another. + The + make-ca package + will allow you to set up local trusted anchor certificates, allowing + the system to verify SSL certificates provided by remote servers (for + example, a website using HTTPS). + The GPM package will allow you to perform copy/paste actions in your virtual From 7b2439a5df3c6d576e769ae4d2cfae978ac331b8 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 26 Apr 2021 19:26:06 -0500 Subject: [PATCH 5/6] Update to vim-8.2.2812. Update to iana-etc-20210407. Update to Python3-3.9.4. Update to meson-0.57.2. Update to linux-5.10.16. Update to less-581. Update to file-5.40. Update to bc-4.0.1. --- chapter01/changelog.xml | 38 ++++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 16 ++++++------- chapter08/python.xml | 2 +- packages.ent | 52 ++++++++++++++++++++--------------------- 4 files changed, 73 insertions(+), 35 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 2e7325eb3..cc2bee1b0 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,44 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2021-04-26 + + + [bdubbs] - Update to vim-8.2.2812. Addresses + #4500. + + + [bdubbs] - Update to iana-etc-20210407. Addresses + #4722. + + + [bdubbs] - Update to Python3-3.9.4. Fixes + #4843. + + + [bdubbs] - Update to meson-0.57.2. Fixes + #4846. + + + [bdubbs] - Update to linux-5.10.16. Addresses + #4840. + + + [bdubbs] - Update to less-581. Fixes + #4849. + + + [bdubbs] - Update to file-5.40. Fixes + #4839. + + + [bdubbs] - Update to bc-4.0.1. Fixes + #4845. + + + + 2021-04-22 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 72237e48d..0946a7978 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -84,9 +84,9 @@ - + @@ -144,9 +144,9 @@ - + @@ -180,9 +180,9 @@ Man-pages-&man-pages-version; - + @@ -213,9 +213,9 @@ - + diff --git a/chapter08/python.xml b/chapter08/python.xml index b71822b9b..4a6fe1bd5 100644 --- a/chapter08/python.xml +++ b/chapter08/python.xml @@ -88,7 +88,7 @@ make test Some tests requiring a network connection or additional packages are - skipped. The test named test_normalization is known to fail. For + skipped. The tests test_unicodedata and test_curses tests are known to fail. For more comprehensive results, the tests can be rerun when Python 3 is reinstalled in BLFS. diff --git a/packages.ent b/packages.ent index fb615c162..b230ea0e9 100644 --- a/packages.ent +++ b/packages.ent @@ -57,10 +57,10 @@ - - + + - + @@ -179,10 +179,10 @@ - - + + - + @@ -320,10 +320,10 @@ - - + + - + @@ -368,10 +368,10 @@ - - + + - + @@ -418,12 +418,12 @@ - + - + - + - + - + - + - - + + @@ -702,13 +702,13 @@ - + - + - + From c461bd9011d22a23ad20babaa0039958761beb16 Mon Sep 17 00:00:00 2001 From: "Douglas R. Reno" Date: Mon, 26 Apr 2021 19:32:25 -0500 Subject: [PATCH 6/6] Changelog: Reflect 5.11.16 instead of 5.10.16 --- chapter01/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index cc2bee1b0..a2e057b13 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -63,7 +63,7 @@ #4846. - [bdubbs] - Update to linux-5.10.16. Addresses + [bdubbs] - Update to linux-5.11.16. Addresses #4840.