[blfs-book] r12551 - in trunk/BOOK: . introduction/welcome postlfs/security

igor at higgs.linuxfromscratch.org igor at higgs.linuxfromscratch.org
Fri Jan 10 03:18:30 PST 2014


Author: igor
Date: Fri Jan 10 03:18:30 2014
New Revision: 12551

Log:
Update to libcap-2.24 and correct PAM module install location reported by Randy McMurphy.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/postlfs/security/libcap.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Fri Jan 10 02:06:58 2014	(r12550)
+++ trunk/BOOK/general.ent	Fri Jan 10 03:18:30 2014	(r12551)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "09">                   <!-- Always 2 digits -->
+<!ENTITY day          "10">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 9th, &year;">
+<!ENTITY releasedate  "January 10th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|testing|unstable|development] -->
@@ -148,7 +148,7 @@
 <!ENTITY gnutls-version               "3.2.8">
 <!ENTITY gpgme-version                "1.4.3">
 <!ENTITY iptables-version             "1.4.21">
-<!ENTITY libcap-version               "2.23">
+<!ENTITY libcap-version               "2.24">
 <!ENTITY linux-pam-version            "1.1.8">
 <!ENTITY mitkrb-version               "1.11.4">
 <!ENTITY nettle-version               "2.7.1">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Fri Jan 10 02:06:58 2014	(r12550)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Fri Jan 10 03:18:30 2014	(r12551)
@@ -44,6 +44,18 @@
 
 -->
     <listitem>
+      <para>January 10th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[igor] - Update to libcap-2.24 and correct PAM module install
+          location reported by Randy McMurphy. Fixes <ulink
+          url="&blfs-ticket-root;4539">#4539</ulink> and <ulink
+          url="&blfs-ticket-root;4523">#4523</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 9th, 2014</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/postlfs/security/libcap.xml
==============================================================================
--- trunk/BOOK/postlfs/security/libcap.xml	Fri Jan 10 02:06:58 2014	(r12550)
+++ trunk/BOOK/postlfs/security/libcap.xml	Fri Jan 10 03:18:30 2014	(r12551)
@@ -6,8 +6,8 @@
 
   <!ENTITY libcap-download-http "https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
   <!ENTITY libcap-download-ftp  "ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-  <!ENTITY libcap-md5sum        "09a185e4b0aa8a81a51c1e4d0eba7db0">
-  <!ENTITY libcap-size          "57 KB">
+  <!ENTITY libcap-md5sum        "d43ab9f680435a7fff35b4ace8d45b80">
+  <!ENTITY libcap-size          "62 KB">
   <!ENTITY libcap-buildsize     "1.5 MB">
   <!ENTITY libcap-time          "0.1 SBU">
 ]>
@@ -58,16 +58,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libcap-&libcap-version;-uapi-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">libcap Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -87,7 +77,7 @@
     <para>Install <application>libcap</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../libcap-&libcap-version;-uapi-1.patch &&
+<screen><userinput>sed -i 's:LIBDIR:PAM_&:g' pam_cap/Makefile &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -100,9 +90,12 @@
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make RAISE_SETFCAP=no \
-     prefix=/usr      \
-     SBINDIR=/sbin install</userinput></screen>
+<!-- dev note: make DESTDIR=<DESTDIR> prefix=/usr SBINDIR=<DESTDIR>/sbin PAM_LIBDIR=<DESTDIR>/lib RAISE_SETFCAP=no -->
+
+<screen role="root"><userinput>make prefix=/usr \
+     SBINDIR=/sbin \
+     PAM_LIBDIR=/lib \
+     RAISE_SETFCAP=no install</userinput></screen>
 
    <para>
      Still as the <systemitem class="username">root</systemitem> user, 
@@ -118,6 +111,11 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <command>sed -i '...'</command>, <parameter>PAM_LIBDIR=/lib</parameter>:
+      These correct PAM module install location.
+    </para>
+
     <para><parameter>RAISE_SETFCAP=no</parameter>: This parameter skips trying
     to use <application>setcap</application> on itself.  This avoids an installation
     error if the kernel or file system do not support extended capabilities.</para>



More information about the blfs-book mailing list