Update to keyutils-1.6.3

general/genlib/keyutils.xml

@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY keyutils-download-http "https://people.redhat.com/~dhowells/keyutils/keyutils-&keyutils-version;.tar.bz2">
+  <!ENTITY keyutils-download-http "https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-&keyutils-version;.tar.gz">
   <!ENTITY keyutils-download-ftp  " ">
-  <!ENTITY keyutils-md5sum        "919af7f33576816b423d537f8a8692e8">
-  <!ENTITY keyutils-size          "96 KB">
-  <!ENTITY keyutils-buildsize     "1.9 MB (with tests)">
-  <!ENTITY keyutils-time          "less than 0.1 SBU (add 0.6 SBU for tests)">
+  <!ENTITY keyutils-md5sum        "6b70b2b381c1b6d9adfaf66d5d3e7c00">
+  <!ENTITY keyutils-size          "136 KB">
+  <!ENTITY keyutils-buildsize     "2.6 MB (with tests)">
+  <!ENTITY keyutils-time          "less than 0.1 SBU (add 0.4 SBU for tests)">
 ]>
 
 <sect1 id="keyutils" xreflabel="keyutils-&keyutils-version;">
@@ -68,16 +68,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">keyutils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="mitkrb"/>
-      <!-- Without krb5 installed, a FTBFS occurs while trying to compile dns.afsdb.c.
-      It looks for profile.h, which is installed by krb5. -->
-    </para>
-
-
   </sect2>
 
   <sect2 role="installation">
@@ -88,8 +78,7 @@
       commands:
     </para>
 
-<screen><userinput>sed -i 's:$(LIBDIR)/$(PKGCONFIG_DIR):/usr/lib/pkgconfig:' Makefile &amp;&amp;
-make</userinput></screen>
+<screen><userinput>make</userinput></screen>
 
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -103,14 +92,13 @@ make</userinput></screen>
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root" remap="test"><userinput>sed -e 's/executable/\\(pie \\)?/' \
-    -i tests/toolbox.inc.sh        &amp;&amp;
-make -k test</userinput></screen>
+<screen role="root" remap="test"><userinput>make -k test</userinput></screen>
 
     <para>
       Note that several tests will fail if certain uncommon kernel options
-      were not used when the kernel was built.  These include CONFIG_BIG_KEYS,
-      CONFIG_KEY_DH_OPERATIONS, and CONFIG_CRYPTO_DH.
+      were not used when the kernel was built. These include CONFIG_BIG_KEYS,
+      CONFIG_KEY_DH_OPERATIONS, CONFIG_CRYPTO_DH,
+      CONFIG_SECONDARY_TRUSTED_KEYRING, and CONFIG_SYSTEM_BLACKLIST_KEYRING.
     </para>
 
   </sect2>
@@ -118,6 +106,7 @@ make -k test</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+<!--
     <para>
       <command>sed ... Makefile</command>: This command ensures the pkgconfig
       file is placed in the correct directory.
@@ -125,11 +114,12 @@ make -k test</userinput></screen>
 
     <para>
       <command>sed ... tests/toolbox.inc.sh</command>: In LFS, GCC has been
-      configured with <option>--enable-default-pie</option> so
+      configured with <option>- -enable-default-pie</option> so
       <command>/usr/bin/bash</command> is a PIE, but the test script does
       not anticipate it.  Fix this oversight so the test can run on a LFS
       system.
     </para>
+-->
 
     <para>
       <parameter>NO_ARLIB=1</parameter>: This make flag disables installing the
@@ -172,7 +162,9 @@ make -k test</userinput></screen>
       <seglistitem>
         <seg>keyctl, key.dns_resolver, and request-key</seg>
         <seg>libkeyutils.so</seg>
-        <seg>/etc/request-key.d and /usr/share/keyutils</seg>
+        <seg>/etc/keyutils,
+        /etc/request-key.d,
+        and /usr/share/keyutils</seg>
       </seglistitem>
     </segmentedlist>
 

introduction/welcome/changelog.xml

@@ -41,6 +41,10 @@
     <listitem>
       <para>January 23rd, 2024</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to keyutils-1.6.3. Fixes
+          <ulink url="&blfs-ticket-root;19159">#19159</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to shadow-4.14.3. Fixes
           <ulink url="&blfs-ticket-root;19136">#19136</ulink>.</para>

packages.ent

@@ -121,7 +121,7 @@
 <!ENTITY jansson-version              "2.14">
 <!ENTITY json-c-version               "0.17">
 <!ENTITY json-glib-version            "1.8.0">
-<!ENTITY keyutils-version             "1.6.1">
+<!ENTITY keyutils-version             "1.6.3">
 <!ENTITY libaio-version               "0.3.113">
 <!ENTITY libarchive-version           "3.7.2">
 <!ENTITY libassuan-version            "2.5.6">