Changeset 1309e0e

Timestamp:

07/12/2023 07:54:16 PM (11 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1

Children:

86cdf39

Parents:

6167e6b (diff), f976691 (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' into xry111/loongarch

Files:

• appendices/dependencies.xml (modified) (1 diff)
• chapter08/libxcrypt.xml (modified) (1 diff)
• chapter08/shadow.xml (modified) (4 diffs)
• chapter10/kernel.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

appendices/dependencies.xml

@@ -1893 +1893 @@
         <seglistitem>
           <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-          Make, and Sed</seg>
+          Make, Perl, and Sed</seg>
         </seglistitem>
       </segmentedlist>

chapter08/libxcrypt.xml

@@ -100 +100 @@
       them at runtime. However, the only known binary-only applications
       that link against these functions require ABI version 1.  If you must
-      have such libraries because of some binary-only application or to be
+      have such functions because of some binary-only application or to be
       to be compliant with LSB, build the package again with the following
       commands:</para>

chapter08/shadow.xml

@@ -61 +61 @@
 
     <para id="shadow-login_defs">Instead of using the default
-    <emphasis>crypt</emphasis> method, use the more secure
-    <emphasis>SHA-512</emphasis> method of password encryption, which also
-    allows passwords longer than 8 characters. In addition, set the number of
-    rounds to 500,000 instead of the default 5000, which is much too low to
-    prevent brute force password attacks. It is also necessary to change
+    <emphasis>crypt</emphasis> method, use the much more secure
+    <emphasis>YESCRYPT</emphasis> method of password encryption, which also
+    allows passwords longer than 8 characters.
+    It is also necessary to change
     the obsolete <filename class="directory">/var/spool/mail</filename> location
     for user mailboxes that Shadow uses by default to the <filename
@@ -82 +81 @@
     </note>
 
-<screen><userinput remap="pre">sed -e 's:#ENCRYPT_METHOD DES:ENCRYPT_METHOD SHA512:' \
-    -e 's@#\(SHA_CRYPT_..._ROUNDS 5000\)@\100@'       \
-    -e 's:/var/spool/mail:/var/mail:'                 \
-    -e '/PATH=/{s@/sbin:@@;s@/bin:@@}'                \
+<screen><userinput remap="pre">sed -e 's:#ENCRYPT_METHOD DES:ENCRYPT_METHOD YESCRYPT:' \
+    -e 's:/var/spool/mail:/var/mail:'                   \
+    -e '/PATH=/{s@/sbin:@@;s@/bin:@@}'                  \
     -i etc/login.defs</userinput></screen>
 
@@ -107 +105 @@
 
 <screen><userinput remap="configure">touch /usr/bin/passwd
-./configure --sysconfdir=/etc \
-            --disable-static  \
+./configure --sysconfdir=/etc   \
+            --disable-static    \
+            --with-{b,yes}crypt \
             --with-group-name-max-length=32</userinput></screen>
 
@@ -123 +122 @@
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--with-{b,yes}crypt</parameter></term>
+        <listitem>
+          <para>The shell expands this to two switches,
+          <parameter>--with-bcrypt</parameter> and
+          <parameter>--with-yescrypt</parameter>.  They allow shadow to use
+          the Bcrypt and Yescrypt algorithms implemented by
+          <application>Libxcrypt</application> for hashing passwords.
+          These algorithms are more secure (in particular, much more
+          resistant to GPU-based attacks) than the traditional SHA
+          algorithms.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>--with-group-name-max-length=32</parameter></term>

chapter10/kernel.xml

@@ -167 +167 @@
    [*] Control Group support [CONFIG_CGROUPS]   --->
       [*] Memory controller [CONFIG_MEMCG]
-   [ ] Enable deprecated sysfs features to support old userspace tools [CONFIG_SYSFS_DEPRECATED]
    [ ] Configure standard kernel features (expert users) [CONFIG_EXPERT]
 General architecture-dependent options  --->

packages.ent

@@ -433 +433 @@
 <!ENTITY libxcrypt-version "4.4.35">
 <!ENTITY libxcrypt-size "612 KB">
-<!ENTITY libxcrypt-url "&github;/besser82/libxcrypt/releases/download/&libxcrypt-version;/libxcrypt-&libxcrypt-version;.tar.xz">
+<!ENTITY libxcrypt-url "&github;/besser82/libxcrypt/releases/download/v&libxcrypt-version;/libxcrypt-&libxcrypt-version;.tar.xz">
 <!ENTITY libxcrypt-md5 "1d8487dfc43ee8e31a858456b868f836">
 <!ENTITY libxcrypt-home "&github;/besser82/libxcrypt/">