diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2020-03-02 18:27:41 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2020-03-02 18:27:41 +0000 |
| commit | d9447c15c151ab1e46796bf069545a4fb521e3b0 (patch) | |
| tree | 0dafe57a30615be4b32903b1dcfcb0e6e8a9186f | |
| parent | c173f88d858feffe4b2853855b5454aa2b9fffb0 (diff) | |
Update to libcap-2.32.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11772 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter06/libcap.xml | 11 | ||||
| -rw-r--r-- | general.ent | 1 | ||||
| -rw-r--r-- | packages.ent | 6 |
4 files changed, 12 insertions, 10 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 80106b963..a76d2396d 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -70,8 +70,8 @@ <ulink url="&lfs-ticket-root;4601">#4601</ulink>.</para> </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> <para>[bdubbs] - Update to linux-5.5.7. Fixes diff --git a/chapter06/libcap.xml b/chapter06/libcap.xml index 6ec48c5ad..74704650d 100644 --- a/chapter06/libcap.xml +++ b/chapter06/libcap.xml @@ -43,9 +43,9 @@ <sect2 role="installation"> <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> @@ -69,10 +69,13 @@ <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> diff --git a/general.ent b/general.ent index 8ff75962f..2679639a6 100644 --- a/general.ent +++ b/general.ent @@ -10,7 +10,6 @@ <!ENTITY releasedate "March 2nd, 2020"> <!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not – --> -<!ENTITY milestone "9.1"> <!ENTITY lfs-root "http://www.linuxfromscratch.org/"> <!ENTITY blfs-root "&lfs-root;blfs/"> diff --git a/packages.ent b/packages.ent index b17dc61d5..fb5e47682 100644 --- a/packages.ent +++ b/packages.ent @@ -389,10 +389,10 @@ <!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB"> <!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"> <!ENTITY libcap-ch6-sbu "less than 0.1 SBU"> |