MultiLib: Merge changes from trunk

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11724 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

appendices/dependencies.xml

@@ -403,8 +403,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Make,
-         Patch, Perl, Sed, and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Libcap,
+         Make, Patch, Perl, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 

chapter01/changelog.xml

@@ -45,6 +45,66 @@
     appropriate for the entry or if needed the entire day's listitem.
        -->
     <listitem revision="sysv">
+      <para>2020-01-09</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to meson-0.53.0. Fixes
+          <ulink url="&lfs-ticket-root;4571">#4571</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.45.5. Fixes
+          <ulink url="&lfs-ticket-root;4570">#4570</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to grep-3.4. Fixes
+          <ulink url="&lfs-ticket-root;4568">#4568</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libpipeline-1.5.2. Fixes
+          <ulink url="&lfs-ticket-root;4567">#4567</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.4.8. Fixes
+          <ulink url="&lfs-ticket-root;4566">#4566</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Add <filename>/etc/os-release</filename> to
+          the sysV version, as it is required by some packages in BLFS.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2020-01-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to libcap-2.30. Fixes
+          <ulink url="&lfs-ticket-root;4569">#4569</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2020-01-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Fix various issues in libcap-2.29, and
+          update dependencies.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2020-01-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.29. Fixes
+          <ulink url="&lfs-ticket-root;4564">#4564</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2019-12-22</para>
       <itemizedlist>
         <listitem>

chapter01/whatsnew.xml

@@ -110,9 +110,9 @@
     <!--<listitem>
       <para>Gperf-&gperf-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Grep-&grep-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Groff-&groff-version;</para>
     </listitem>-->
@@ -155,9 +155,9 @@
    <listitem>
       <para>Libffi-&libffi-version;</para>
    </listitem>
-   <!--<listitem>
+   <listitem>
       <para>Libpipeline-&libpipeline-version;</para>
-   </listitem>-->
+   </listitem>
     <!--<listitem>
       <para>Libtool-&libtool-version;</para>
     </listitem>-->

chapter06/libcap.xml

@@ -45,50 +45,34 @@
 
     <para>Prevent a static library from being installed:</para>
 
-<screen><userinput remap="pre">sed -i '/install.*STALIBNAME/d' libcap/Makefile</userinput></screen>
+<screen><userinput remap="pre">sed -i '/install.*STACAPLIBNAME/d' libcap/Makefile</userinput></screen>
 
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make RAISE_SETFCAP=no lib=lib prefix=/usr install
-chmod -v 755 /usr/lib/libcap.so.&libcap-version;</userinput></screen>
+<screen><userinput remap="make">make lib=lib</userinput></screen>
 
     <variablelist>
       <title>The meaning of the make option:</title>
 
-      <varlistentry>
-        <term><parameter>RAISE_SETFCAP=no</parameter></term>
-        <listitem>
-          <para>This parameter skips trying to use <command>setcap</command>
-          on itself. This avoids an installation error if the kernel or file
-          system does not support extended capabilities.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><parameter>lib=lib</parameter></term>
         <listitem>
-          <para>This parameter installs the library in
-          <filename>$prefix/lib</filename> rather than
-          <filename>$prefix/lib64</filename> on x86_64. It has no effect on
+          <para>This parameter sets the library directory to
+          <filename>/lib</filename> rather than
+          <filename>/lib64</filename> on x86_64. It has no effect on
           x86.</para>
         </listitem>
       </varlistentry>
- 
     </variablelist>
 
-    <para>The shared library needs to be moved to
-    <filename class="directory">/lib</filename>, and as a result the
-    <filename class="extension">.so</filename> file in
-    <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
+    <para>To test the results, issue:</para>
 
-<screen><userinput remap="install">mv -v /usr/lib/libcap.so.* /lib
-ln -sfv ../../lib/$(readlink /usr/lib/libcap.so) /usr/lib/libcap.so</userinput></screen>
+<screen><userinput remap="test">make test</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make lib=lib install
+chmod -v 755 /lib/libcap.so.&libcap-version;</userinput></screen>
 
   </sect2>
 
@@ -139,7 +123,7 @@ rm -rf DESTDIR</userinput></screen>
 
       <seglistitem>
         <seg>capsh, getcap, getpcaps, and setcap</seg>
-        <seg>libcap.so</seg>
+        <seg>libcap.so and libpsx.a</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -199,6 +183,17 @@ rm -rf DESTDIR</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="libpsx">
+        <term><filename class="libraryfile">libpsx</filename></term>
+        <listitem>
+          <para>Contains functions to support POSIX semantics for syscalls
+          associated with the pthread library</para>
+          <indexterm zone="ch-system-libcap libpsx">
+            <primary sortas="c-libpsx">libpsx</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
   </sect2>

chapter06/meson.xml

@@ -39,11 +39,11 @@
 
   <sect2 role="installation">
     <title>Installation of Meson</title>
-
+<!--
     <para>Apply a fix from upstream to fix a regression:</para>
 
 <screen><userinput remap="pre">sed -i "s@isfile(a)@&amp; and not a.startswith('/dev')@" mesonbuild/interpreter.py</userinput></screen>
-
+-->
     <para>Compile Meson with the following command:</para>
 
 <screen><userinput remap="make">python3 setup.py build</userinput></screen>

chapter06/systemd.xml

@@ -51,7 +51,7 @@
 <screen><userinput remap="pre">ln -sf /tools/bin/true /usr/bin/xsltproc</userinput></screen>
 
     <para>Because we have not yet installed the final version of Util-Linux,
-    create links to the libraries in the approprite location:</para>
+    create links to the libraries in the appropriate location:</para>
 
 <screen><userinput remap="pre">for file in /tools/lib/lib{blkid,mount,uuid}.so*; do
     ln -sf $file /usr/lib/

general.ent

@@ -1,15 +1,15 @@
-<!ENTITY version         "SVN-20191222">
+<!ENTITY version         "SVN-20200109">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20191222-systemd">
+<!ENTITY versiond        "20200109-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "December 22nd, 2019">
+<!ENTITY releasedate     "January 9th, 2020">
 
-<!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
+<!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "9.0">
 
 <!ENTITY lfs-root        "http://www.linuxfromscratch.org/">

packages.ent

@@ -10,7 +10,7 @@
 <!ENTITY acl-size "513 KB">
 <!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.tar.gz">
 <!ENTITY acl-md5 "007aabf1dbb550bcddde52a244cd1070">
-<!ENTITY acl-home " ">
+<!ENTITY acl-home "&savannah-nongnu;/projects/acl">
 <!ENTITY acl-ch6-du "6.4 MB">
 <!ENTITY acl-ch6-sbu "0.1 SBU">
 
@@ -144,10 +144,10 @@
 <!ENTITY diffutils-ch6-du "36 MB">
 <!ENTITY diffutils-ch6-sbu "0.4 SBU">
 
-<!ENTITY e2fsprogs-version "1.45.4">
-<!ENTITY e2fsprogs-size "7,746 KB">
+<!ENTITY e2fsprogs-version "1.45.5">
+<!ENTITY e2fsprogs-size "7,753 KB">
 <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "2c2f9d4bcd0be54b3b3b8d5feec7b0ff">
+<!ENTITY e2fsprogs-md5 "6d35428e4ce960cb7e875afe5849c0f3">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-ch6-du "108 MB">
 <!ENTITY e2fsprogs-ch6-sbu "3.1 SBU">
@@ -289,10 +289,10 @@
 <!ENTITY gperf-ch6-du "6.3 MB">
 <!ENTITY gperf-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY grep-version "3.3">
-<!ENTITY grep-size "1,440 KB">
+<!ENTITY grep-version "3.4">
+<!ENTITY grep-size "1,520 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
-<!ENTITY grep-md5 "05d0718a1b7cc706a4bdf8115363f1ed">
+<!ENTITY grep-md5 "111b117d22d6a7d049d6ae7505e9c4d2">
 <!ENTITY grep-home "&gnu-software;grep/">
 <!ENTITY grep-ch5-du "24 MB">
 <!ENTITY grep-ch5-sbu "0.2 SBU">
@@ -397,12 +397,12 @@
 <!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB"> 
 <!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.28">
-<!ENTITY libcap-size "93 KB">
+<!ENTITY libcap-version "2.30">
+<!ENTITY libcap-size "96 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "4066ddca53fb7e146f98372c8e43afc4">
+<!ENTITY libcap-md5 "ea531f37a30a61dce8bf8544537a46e3">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
-<!ENTITY libcap-ch6-du "1.5 MB">
+<!ENTITY libcap-ch6-du "8.5 MB">
 <!ENTITY libcap-ch6-sbu "less than 0.1 SBU">
 
 <!ENTITY libffi-version "3.3">
@@ -413,10 +413,10 @@
 <!ENTITY libffi-ch6-du "7.6 MB">
 <!ENTITY libffi-ch6-sbu "0.4 SBU">
 
-<!ENTITY libpipeline-version "1.5.1">
-<!ENTITY libpipeline-size "965 KB">
+<!ENTITY libpipeline-version "1.5.2">
+<!ENTITY libpipeline-size "971 KB">
 <!ENTITY libpipeline-url "&savannah;/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">
-<!ENTITY libpipeline-md5 "4c8fe6cd85422baafd6e060f896c61bc">
+<!ENTITY libpipeline-md5 "169de4cc1f6f7f7d430a5bed858b2fd3">
 <!ENTITY libpipeline-home "http://libpipeline.nongnu.org/">
 <!ENTITY libpipeline-ch6-du "9.0 MB">
 <!ENTITY libpipeline-ch6-sbu "0.1 SBU">
@@ -431,12 +431,12 @@
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "4">
-<!ENTITY linux-patch-version "6">
+<!ENTITY linux-patch-version "8">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "106,889 KB">
+<!ENTITY linux-size "106,892 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "d77c45902ea8cdbbffed46ae92ae5ec8">
+<!ENTITY linux-md5 "2f44c832e1d59ebe766731f9c215aca6">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -493,10 +493,10 @@
 <!ENTITY man-pages-ch6-du "31 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.52.1">
-<!ENTITY meson-size "1,473 KB">
+<!ENTITY meson-version "0.53.0">
+<!ENTITY meson-size "1,512 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "a5f0c99567d772508f649a28ded7f8ad">
+<!ENTITY meson-md5 "3a0313d040ded973d84cbec368c2e1d3">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-ch6-du "28 MB">
 <!ENTITY meson-ch6-sbu "less than 0.1 SBU">
@@ -600,9 +600,9 @@
 <!ENTITY python-ch5-sbu "1.2 SBU">
 <!ENTITY python-ch6-du "399 MB">
 <!ENTITY python-ch6-sbu "1.3 SBU">
-<!ENTITY python-docs-url "https://docs.python.org/3/archives/python-&python-version;-docs-html.tar.bz2">
-<!ENTITY python-docs-md5 "f0a1899d5cecee5a3ba507878040bd86">
-<!ENTITY python-docs-size "6,429 KB">
+<!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
+<!ENTITY python-docs-md5 "edc8c97f9680373fcc1dd952f0ea7fcc">
+<!ENTITY python-docs-size "6,374 KB">
 
 <!ENTITY readline-version "8.0">
 <!ENTITY readline-size "2,907 KB">