Changeset d9447c15

Timestamp:

03/02/2020 06:27:41 PM (3 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, arm, bdubbs/gcc13, cross-chap5, ml-11.0, multilib, old-trunk, s6-init, trunk, xry111/arm64, xry111/clfs-ng, xry111/git-transition, xry111/glibc-2.34, xry111/glibc-2.37, xry111/kcfg-revise, xry111/lfs-next, xry111/pip3, xry111/queue-11.3, xry111/rust-wip-20221008, xry111/tester-nohack, xry111/usr-move

Children:

85ce0fca

Parents:

c173f88

Message:

Update to libcap-2.32.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11772 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter06/libcap.xml (modified) (2 diffs)
• general.ent (modified) (1 diff)
• packages.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -71 +71 @@
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to libcap-2.32. Fixes
-          <ulink url="&lfs-ticket-root;4600">#4600</ulink>.</para>
+          <para>[bdubbs] - Update to libcap-2.33. Fixes
+          <ulink url="&lfs-ticket-root;4600">#4608</ulink>.</para>
         </listitem>
         <listitem>

chapter06/libcap.xml

@@ -44 +44 @@
     <title>Installation of Libcap</title>
 
-    <para>Prevent two static libraries from being installed:</para>
+    <para>Prevent a static library from being installed:</para>
 
-<screen><userinput remap="pre">sed -i '/install.*STA...LIBNAME/d' libcap/Makefile</userinput></screen>
+<screen><userinput remap="pre">sed -i '/install.*STACAPLIBNAME/d' libcap/Makefile</userinput></screen>
 
     <para>Compile the package:</para>
@@ -70 +70 @@
 <screen><userinput remap="test">make test</userinput></screen>
 
-    <para>Install the package:</para>
+    <para>Install the package and do some cleanup:</para>
 
 <screen><userinput remap="install">make lib=lib install
-chmod -v 755 /lib/libcap.so.&libcap-version;</userinput></screen>
+chmod -v 755 /lib/libcap.so.&libcap-version;
+mv -v /lib/libpsx.a /usr/lib
+rm -v /lib/libcap.so
+ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput></screen>
 
   </sect2>

general.ent

@@ -11 +11 @@
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
-<!ENTITY milestone       "9.1">
 
 <!ENTITY lfs-root        "http://www.linuxfromscratch.org/">

packages.ent

@@ -390 +390 @@
 <!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.32">
-<!ENTITY libcap-size "98 KB">
+<!ENTITY libcap-version "2.33">
+<!ENTITY libcap-size "109 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "7416119c9fdcfd0e8dd190a432c668e9">
+<!ENTITY libcap-md5 "dcc6220b4a9bf260050b20c07edcddf4">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-ch6-du "8.5 MB">