From 0b8fb2ff912e216ce4475b41d2cf94d5b2d28340 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 4 Apr 2023 13:00:01 -0500
Subject: [PATCH] Update to cracklib-2.9.11.

---
 introduction/welcome/changelog.xml |  4 +++
 packages.ent                       |  2 +-
 postlfs/security/cracklib.xml      | 47 ++++++++++++++++--------------
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 037902f6b7..fee5a82877 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,10 @@
    <listitem>
      <para>April 3rd, 2023</para>
      <itemizedlist>
+       <listitem>
+         <para>[bdubbs] - Update to cracklib-2.9.11. Fixes
+         <ulink url="&blfs-ticket-root;17889">#17889</ulink>.</para>
+       </listitem>
        <listitem>
          <para>[bdubbs] - Update to cmake-3.26.2. Fixes
          <ulink url="&blfs-ticket-root;17886">#17886</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 3e087222b1..11ec74a3dc 100644
--- a/packages.ent
+++ b/packages.ent
@@ -1,7 +1,7 @@
 <!-- Part II -->
 <!-- Chapter 4 -->
 
-<!ENTITY cracklib-version             "2.9.10">
+<!ENTITY cracklib-version             "2.9.11">
 <!ENTITY cryptsetup-minor             "2.4">
 <!ENTITY cryptsetup-version           "&cryptsetup-minor;.3">
 <!ENTITY cyrus-sasl-version           "2.1.28">
diff --git a/postlfs/security/cracklib.xml b/postlfs/security/cracklib.xml
index 935bb6d025..b8c4de3bc7 100644
--- a/postlfs/security/cracklib.xml
+++ b/postlfs/security/cracklib.xml
@@ -6,16 +6,16 @@
 
   <!ENTITY cracklib-url "https://github.com/cracklib/cracklib/releases/download">
 
-  <!ENTITY cracklib-download-http "&cracklib-url;/v&cracklib-version;/cracklib-&cracklib-version;.tar.bz2">
+  <!ENTITY cracklib-download-http "&cracklib-url;/v&cracklib-version;/cracklib-&cracklib-version;.tar.xz">
   <!ENTITY cracklib-download-ftp  " ">
-  <!ENTITY cracklib-md5sum        "97f3338c07861200194fc21efc57c9c9">
-  <!ENTITY cracklib-size          "608 KB">
+  <!ENTITY cracklib-md5sum        "a6dfb1766aab43a54e1cbd78abf0a20a">
+  <!ENTITY cracklib-size          "452 KB">
   <!ENTITY cracklib-buildsize     "6.8 MB">
   <!ENTITY cracklib-time          "0.1 SBU">
 
-  <!ENTITY crackdict-download     "&cracklib-url;/v&cracklib-version;/cracklib-words-&cracklib-version;.bz2">
-  <!ENTITY crackdict-size         "6.7 MB">
-  <!ENTITY crackdict-md5sum       "f5f58abd1598ec34ab7f493209eb70f1">
+  <!ENTITY crackdict-download     "&cracklib-url;/v&cracklib-version;/cracklib-words-&cracklib-version;.xz">
+  <!ENTITY crackdict-size         "4.0 MB">
+  <!ENTITY crackdict-md5sum       "f27804022dbf2682a7f7c353317f9a53">
 ]>
 
 <sect1 id="cracklib" xreflabel="CrackLib-&cracklib-version;">
@@ -75,11 +75,20 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
+      <para>Recommended word list for English-speaking countries:</para>
       <listitem>
         <para>
-          Recommended word list for English-speaking countries (size:
-          &crackdict-size;; md5sum: &crackdict-md5sum;):
-          <ulink url="&crackdict-download;"/>
+          Download (HTTP): <ulink url="&crackdict-download;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+           Download MD5 sum: &crackdict-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+            Download size:  &crackdict-size;; 
         </para>
       </listitem>
     </itemizedlist>
@@ -153,13 +162,13 @@ make</userinput></screen>
       to the <command>create-cracklib-dict</command> command.
     </para>
 
-<screen role="root"><userinput>install -v -m644 -D    ../cracklib-words-&cracklib-version;.bz2 \
-                         /usr/share/dict/cracklib-words.bz2    &amp;&amp;
+<screen role="root"><userinput>install -v -m644 -D    ../cracklib-words-&cracklib-version;.xz \
+                         /usr/share/dict/cracklib-words.xz    &amp;&amp;
 
-bunzip2 -v               /usr/share/dict/cracklib-words.bz2    &amp;&amp;
-ln -v -sf cracklib-words /usr/share/dict/words                 &amp;&amp;
-echo $(hostname) >>      /usr/share/dict/cracklib-extra-words  &amp;&amp;
-install -v -m755 -d      /usr/lib/cracklib                     &amp;&amp;
+unxz -v                  /usr/share/dict/cracklib-words.xz    &amp;&amp;
+ln -v -sf cracklib-words /usr/share/dict/words                &amp;&amp;
+echo $(hostname) >>      /usr/share/dict/cracklib-extra-words &amp;&amp;
+install -v -m755 -d      /usr/lib/cracklib                    &amp;&amp;
 
 create-cracklib-dict     /usr/share/dict/cracklib-words \
                          /usr/share/dict/cracklib-extra-words</userinput></screen>
@@ -200,13 +209,7 @@ create-cracklib-dict     /usr/share/dict/cracklib-words \
       <envar>PYTHON=python3</envar>: This forces the installation of
       python bindings for Python 3, even if Python 2 is installed.
     </para>
-    <!-- fixed by autoreconf
-    <para>
-      <envar>CPPFLAGS=-I/usr/include/python&python3-majorver;</envar>:
-      This works around an issue caused by incorrect usage of Python 3
-      headers.
-    </para>
-    -->
+
     <para>
       <parameter>--with-default-dict=/lib/cracklib/pw_dict</parameter>:
       This parameter forces the installation of the