Changeset 5f555ba for chapter08

Timestamp:

07/03/2023 11:53:28 AM (15 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/arm64, xry111/arm64-12.0

Children:

9a5dab1

Parents:

0eb03e9d (diff), f4313a7 (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 remote-tracking branch 'origin/trunk' into xry111/arm64

Location:

chapter08

Files:

• chapter08.xml (modified) (1 diff)
• gettext.xml (modified) (1 diff)
• glibc.xml (modified) (3 diffs)
• kbd.xml (modified) (1 diff)
• libxcrypt.xml (added)

chapter08/chapter08.xml

@@ -37 +37 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxcrypt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>

chapter08/gettext.xml

@@ -98 +98 @@
         libgettextsrc.so, libtextstyle.so, and preloadable_libintl.so</seg>
         <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;,
-        /usr/share/gettext, and /usr/share/gettext-0.19.8</seg>
+        /usr/share/gettext, and /usr/share/gettext-&gettext-version;</seg>
       </seglistitem>
     </segmentedlist>

chapter08/glibc.xml

@@ -80 +80 @@
              --enable-stack-protector=strong          \
              --with-headers=/usr/include              \
+             --disable-crypt                          \
              libc_cv_slibdir=/usr/lib</userinput></screen>
 
@@ -490 +491 @@
         libBrokenLocale.{a,so}, libanl.{a,so},
         libc.{a,so}, libc_nonshared.a, libc_malloc_debug.so,
-        libcrypt.{a,so}, libdl.{a,so.2}, libg.a, libm.{a,so},
+        libdl.{a,so.2}, libg.a, libm.{a,so},
         libmcheck.a, libmemusage.so, libmvec.{a,so}, libnsl.so.1,
         libnss_compat.so, libnss_dns.so, libnss_files.so, libnss_hesiod.so,
@@ -796 +797 @@
       </varlistentry>
 
-      <varlistentry id="libcrypt">
-        <term><filename class="libraryfile">libcrypt</filename></term>
-        <listitem>
-          <para>The cryptography library</para>
-          <indexterm zone="ch-system-glibc libcrypt">
-            <primary sortas="c-libcrypt">libcrypt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libdl">
         <term><filename class="libraryfile">libdl</filename></term>

chapter08/kbd.xml

@@ -106 +106 @@
     <para>If desired, install the documentation:</para>
 
-<screen><userinput remap="install">mkdir -pv           /usr/share/doc/kbd-&kbd-version;
-cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
+<screen><userinput remap="install">cp -R -v docs/doc -T /usr/share/doc/kbd-&kbd-version;</userinput></screen>
 
   </sect2>