Changeset 13e0a61 for postlfs

Timestamp:

06/01/2013 08:03:58 AM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

af73a280

Parents:

dcdde93

Message:

Merge trunk and systemd branch

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@11231 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

postlfs/security

Files:

• attr.xml (modified) (4 diffs)
• libcap2.xml (modified) (2 diffs)
• openssh.xml (modified) (2 diffs)

postlfs/security/attr.xml

@@ -72 +72 @@
 INSTALL_USER=root  \
 INSTALL_GROUP=root \
-./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib &&
+./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib --disable-static &&
 make</userinput></screen>
 
@@ -99 +99 @@
     directory.</para>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
     <para><command>sed -i ... /usr/lib/libattr.la</command>: This command
-    corrects the location of the installed static library as referenced
+    corrects the location of the installed library as referenced
     in the libtool archive.</para>
 
@@ -136 +139 @@
       <seglistitem>
         <seg>attr, getfattr, and setfattr</seg>
-        <seg>libattr.{so,a}</seg>
+        <seg>libattr.so</seg>
         <seg>/usr/{include/attr,share/doc/attr-&attr-version;}</seg>
       </seglistitem>
@@ -177 +180 @@
 
       <varlistentry id="libattr">
-        <term><filename class='libraryfile'>libattr.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libattr.so</filename></term>
         <listitem>
           <para>contains the <application>attr</application> API functions.</para>
           <indexterm zone="attr libattr">
-            <primary sortas="c-libattr">libattr.{so,a}</primary>
+            <primary sortas="c-libattr">libattr.so</primary>
           </indexterm>
         </listitem>

postlfs/security/libcap2.xml

@@ -65 +65 @@
     <para role="required"><xref linkend="attr"/></para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="linux-pam"/></para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/libcap2"/></para>
@@ -79 +82 @@
 
     <para>This package does not come with a test suite.</para>
+
+    <para>
+      If you want to disable installing the static library, use this sed:
+    </para>
+
+<screen><userinput>sed -i '/install.*STALIBNAME/ s/^/#/' libcap/Makefile</userinput></screen>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 

postlfs/security/openssh.xml

@@ -87 +87 @@
       <xref linkend="x-window-system"/>,
       <xref linkend="mitkrb"/>,
-      <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>
-      (provides a command-line history feature to <command>sftp</command>),
+      <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>,
       <ulink url="http://www.opensc-project.org/">OpenSC</ulink> and
       <ulink url="http://www.citi.umich.edu/projects/smartcard/sectok.html">libsectok</ulink>
@@ -207 +206 @@
       <parameter>--with-kerberos5=/usr</parameter>: This option is used to
       include Kerberos 5 support in the build.
+    </para>
+
+    <para>
+      <parameter>--with-libedit</parameter>: This option enables line editing
+      and history features for <command>sftp</command>.
     </para>