Changeset 5ae7a99

Timestamp:

12/26/2013 12:01:25 AM (10 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

c757747

Parents:

9efe5ae

Message:

Some fixes from received patch. Thanks.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12447 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• postlfs/security/iptables.xml (modified) (6 diffs)
• postlfs/security/libcap.xml (modified) (1 diff)
• postlfs/security/linux-pam.xml (modified) (2 diffs)

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Some fixes. Mainly to fix shared library shebang
+          where unversioned so files are installed in /lib (see ticket 4426)
+          and simplification to iptables instructions.
+          Patch received, thanks.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Update to dovecot-2.2.10. Fixes
           <ulink url="&blfs-ticket-root;4469">#4469</ulink>.</para>

postlfs/security/iptables.xml

@@ -125 +125 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr                          \
-            --exec-prefix=                         \
-            --bindir=/usr/bin                      \
-            --with-xtlibdir=/lib/xtables           \
-            --with-pkgconfigdir=/usr/lib/pkgconfig \
-            --enable-libipq                        \
-            --enable-devel &amp;&amp;
+<screen><userinput>./configure --prefix=/usr                \
+            --sbindir=/sbin              \
+            --with-xtlibdir=/lib/xtables \
+            --enable-libipq &amp;&amp; <!-- enable-devel is enabled by default now -->
 make</userinput></screen>
 
@@ -140 +137 @@
 <screen role="root"><userinput>make install &amp;&amp;
 ln -sfv ../../sbin/xtables-multi /usr/bin/iptables-xml &amp;&amp;
-for file in libip4tc libip6tc libipq libiptc libxtables
+for file in ip4tc ip6tc ipq iptc xtables
 do
-  ln -sfv ../../lib/`readlink /lib/${file}.so` /usr/lib/${file}.so &amp;&amp;
-  rm -v /lib/${file}.so &amp;&amp;
-  mv -v /lib/${file}.la /usr/lib &amp;&amp;
-  sed -i "s@libdir='@&amp;/usr@g" /usr/lib/${file}.la
+  mv -v /usr/lib/lib${file}.so.* /lib &amp;&amp;
+  ln -sfv ../../lib/$(readlink /usr/lib/lib${file}.so) /usr/lib/lib${file}.so
 done</userinput></screen>
 
@@ -152 +147 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <parameter>--exec-prefix=</parameter>: Ensure all binaries and
-      libraries end up in <filename class="directory">/</filename>
-      directory tree.
-    </para>
 
     <para>
@@ -166 +155 @@
 
     <para>
-      <parameter>--with-pkgconfigdir=/usr/lib/pkgconfig</parameter>:
-      Ensure all the pkgconfig files are in the standard location.
-    </para>
-
-    <para>
       <option>--enable-libipq</option>: This switch enables building
       of <filename class="libraryfile">libipq.so</filename> which
@@ -177 +161 @@
 
     <para>
-      <option>--enable-devel</option>: This switch enables installation
-      of <application>Iptables</application> development headers that
-      can be used by some packages outside of BLFS.
-    </para>
-
-    <para>
       <option>--enable-nfsynproxy</option>: This switch enables installation
       of <application>nfsynproxy</application> SYNPROXY configuration tool.
@@ -189 +167 @@
     <para>
       <command>ln -sfv ../../sbin/xtables-multi /usr/bin/iptables-xml</command>:
-      Ensure  the symbolic link for <command>iptables-xml</command> is relative.
+      Ensure the symbolic link for <command>iptables-xml</command> is relative.
     </para>
 

postlfs/security/libcap.xml

@@ -91 +91 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make RAISE_SETFCAP=no install &amp;&amp;
-chmod -v 755 /lib/libcap.so</userinput></screen>
+<screen role="root"><userinput>make RAISE_SETFCAP=no prefix=/usr install &amp;&amp;
+chmod -v 755 /usr/lib/libcap.so &amp;&amp;
+mv -v /usr/lib/libcap.so.* /lib &amp;&amp;
+ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput></screen>
 
   </sect2>

postlfs/security/linux-pam.xml

@@ -139 +139 @@
 <screen><userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
+            --libdir=/usr/lib \
+            --enable-securedir=/lib/security \
             --docdir=/usr/share/doc/Linux-PAM-&linux-pam-version; \
             --disable-nis &amp;&amp;
@@ -178 +180 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-chmod -v 4755 /sbin/unix_chkpwd</userinput></screen>
+chmod -v 4755 /sbin/unix_chkpwd &amp;&amp;
+
+for file in pam pam_misc pamc
+do
+  mv -v /usr/lib/lib${file}.so.* /lib &amp;&amp;
+  ln -sfv ../../lib/$(readlink /usr/lib/lib${file}.so) /usr/lib/lib${file}.so
+done</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <parameter>--enable-securedir=/lib/security</parameter>:
+      This switch sets install location for the
+      <application>PAM</application> modules.
+    </para>
 
     <para>