Changeset 32244fa for postlfs

Timestamp:

09/06/2023 05:03:21 AM (9 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

7ffcdc1

Parents:

60de0e1 (diff), 6848b244 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Location:

postlfs

Files:

• filesystems/btrfs-progs-test-kernel.xml (modified) (1 diff)
• security/gpgme.xml (modified) (1 diff)
• security/libpwquality.xml (modified) (1 diff)
• security/nss.xml (modified) (2 diffs)
• security/openssh.xml (modified) (3 diffs)

postlfs/filesystems/btrfs-progs-test-kernel.xml

@@ -7 +7 @@
   &lt;*/M&gt; <emphasis role='blue'>B</emphasis>trfs filesystem support                                      [BTRFS_FS]
   [*]     <emphasis role='blue'>B</emphasis>trfs POSIX Access Control Lists                  [BTRFS_FS_POSIX_ACL]</screen>
-<!--  &lt;*/M&gt; <emphasis role='blue'>R</emphasis>eiserfs support (deprecated)                              [REISERFS_FS]
-  [*]     <emphasis role='blue'>R</emphasis>eiserFS extended attributes                       [REISERFS_FS_XATTR]
-  [*]       <emphasis role='blue'>R</emphasis>eiserFS POSIX Access Control Lists          [REISERFS_FS_POSIX_ACL]-->

postlfs/security/gpgme.xml

@@ -165 +165 @@
 
 <screen role="root"><userinput>if swig -version > /dev/null; then
-  pip3 install --no-index --find-links=dist --no-cache-dir --no-user gpg
+  &install-wheel; gpg
 fi</userinput></screen>
 

postlfs/security/libpwquality.xml

@@ -113 +113 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-pip3 install --no-index --find-links=dist --no-cache-dir pwquality</userinput></screen>
+&install-wheel; pwquality</userinput></screen>
 
   </sect2>

postlfs/security/nss.xml

@@ -14 +14 @@
   <!ENTITY nss-download-http "https://&nss-url;/NSS_&nss-dir;_RTM/src/nss-&nss-version;.tar.gz">
   <!ENTITY nss-download-ftp  " ">
-  <!ENTITY nss-md5sum        "589167c3be81d09b9e332ff17d46ebca">
+  <!ENTITY nss-md5sum        "735347cacb3cfb04544d79c65e27b334">
   <!ENTITY nss-size          "69 MB">
-  <!ENTITY nss-buildsize     "299 MB (add 261 MB for tests)">
+  <!ENTITY nss-buildsize     "297 MB (add 139 MB for tests)">
   <!ENTITY nss-time          "1.2 SBU (with parallelism=4, add 15 SBU for tests on AMD Ryzens or at least 30 SBU on Intel machines)">
   <!-- On my system, I got 64.2 SBU, but Bruce gets 18 SBU. -renodr -->
@@ -29 +29 @@
    Bruce's 3900X 19.3 SBU, his i7-12700K about 30 SBU, 12 failures
 
-   3.90:
-     Passed:             68593
+   3.93:
+     Passed:             69982
      Failed:             0
      Failed with core:   0

postlfs/security/openssh.xml

@@ -176 +176 @@
             --with-default-path=/usr/bin             \
             --with-superuser-path=/usr/sbin:/usr/bin \
-            --with-pid-dir=/run                      &&
+            --with-pid-dir=/run                      \
+            --without-zlib-version-check             &&
 make</userinput></screen>
 
@@ -242 +243 @@
     </para>
 
-    <!--
-    <para>
-      <parameter>-\-with-md5-passwords</parameter>: This enables the use of MD5
-      passwords.
-    </para>
-    -->
-
     <para>
       <parameter>--with-default-path=/usr/bin</parameter> and
@@ -260 +254 @@
       <application>OpenSSH</application> from referring to deprecated
       <filename class="directory">/var/run</filename>.
+    </para>
+
+    <para>
+      <parameter>--without-zlib-version-check</parameter>: This prevents
+      <application>OpenSSH</application> from checking the version of
+      the system <application>Zlib</application>.  We need to use this
+      switch or the version check would mistakenly report the latest
+      <application>Zlib</application> 1.13 <quote>too old</quote> and
+      reject it.
     </para>