From 161691d721f1fb721d1a9849f715a46ed997749e Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Sat, 4 Jan 2020 09:00:15 +0000
Subject: Fix various issues in libcap-2.29

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11719 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendices/dependencies.xml |  4 ++--
 chapter01/changelog.xml     | 10 ++++++++++
 chapter06/libcap.xml        | 35 +++++++++++------------------------
 chapter06/systemd.xml       |  2 +-
 general.ent                 |  6 +++---
 5 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 486df8e83..d3f99a9e7 100644
--- a/appendices/dependencies.xml
+++ b/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>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b94913ba3..1c72d069e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's 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>
diff --git a/chapter06/libcap.xml b/chapter06/libcap.xml
index 7b6bcabdc..0b8e45aa3 100644
--- a/chapter06/libcap.xml
+++ b/chapter06/libcap.xml
@@ -43,53 +43,40 @@
   <sect2 role="installation">
     <title>Installation of Libcap</title>
 
-    <para>Prevent a static library from being installed:</para>
+    <para>Prevent two static libraries from being installed:</para>
 
-<screen><userinput remap="pre">sed -i '/install.*STALIBNAME/d' libcap/Makefile</userinput></screen>
+<screen><userinput remap="pre">sed -i '/install.*STA...LIBNAME/d' libcap/Makefile</userinput></screen>
+
+    <para>Fix a file with wrong syntax:</para>
+
+<screen><userinput remap="pre">sed -i '/libpsx/,$d' libcap/libcap.pc.in</userinput></screen>
 
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make lib=lib</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="install">make lib=lib install
+chmod -v 755 /lib/libcap.so.&libcap-version;</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
+          <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>
-
-<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>
-
   </sect2>
 
   <sect2 id="contents-libcap" role="content">
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 7c484d867..0554072d2 100644
--- a/chapter06/systemd.xml
+++ b/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/
diff --git a/general.ent b/general.ent
index 6360c8453..998a6e5ca 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20200101">
+<!ENTITY version         "SVN-20200104">
 <!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        "20200101-systemd">
+<!ENTITY versiond        "20200104-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "January 1st, 2020">
+<!ENTITY releasedate     "January 4th, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "9.0">
-- 
cgit v1.2.3-54-g00ecf