From e92e7dc4c2b13e97dd6af48017dd364d12e7a9d8 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Thu, 3 Jun 2021 18:51:50 -0500
Subject: [PATCH] libpwquality: adapt to merged-/usr changes

---
 introduction/welcome/changelog.xml |  3 +++
 postlfs/security/libpwquality.xml  | 15 ++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 5c72e0f86c..da07648d46 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <para>June 3rd, 2021</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Adapt libpwquality to merged-/usr changes.</para>
+        </listitem>
         <listitem revision="systemd">
           <para>[renodr] - Adapt the timer/unit creation for pciutils, usbutils,
           and logrotate to the merged-/usr changes.</para>
diff --git a/postlfs/security/libpwquality.xml b/postlfs/security/libpwquality.xml
index 58ce0f2a85..0b5443f822 100644
--- a/postlfs/security/libpwquality.xml
+++ b/postlfs/security/libpwquality.xml
@@ -101,10 +101,10 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr                  \
-            --disable-static               \
-            --with-securedir=/lib/security \
-            --with-python-binary=python3 &amp;&amp;
+<screen><userinput>./configure --prefix=/usr                      \
+            --disable-static                   \
+            --with-securedir=/usr/lib/security \
+            --with-python-binary=python3       &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -115,10 +115,7 @@ make</userinput></screen>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
     
-<screen role="root"><userinput>make install                          &amp;&amp;
-
-mv -v /usr/lib/libpwquality.so.* /lib &amp;&amp;
-ln -sfv ../../lib/$(readlink /usr/lib/libpwquality.so) /usr/lib/libpwquality.so</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
 
@@ -168,7 +165,7 @@ password  required    pam_pwquality.so   authtok_type=UNIX retry=1 difok=1 \
                                          maxclassrepeat=0 geoscheck=0 \
                                          dictcheck=1 usercheck=1 \
                                          enforcing=1 badwords="" \
-                                         dictpath=/lib/cracklib/pw_dict
+                                         dictpath=/usr/lib/cracklib/pw_dict
 # use sha512 hash for encryption, use shadow, and use the
 # authentication token (chosen password) set by pam_pwquality
 # above (or any previous modules)