Changeset 8307474 for general/sysutils/autofs.xml

Timestamp:

12/04/2021 03:28:15 PM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

lazarus

Children:

e6974d1

Parents:

b22e4ceb (diff), edd2feb7 (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 lazarus

File:

• general/sysutils/autofs.xml (modified) (4 diffs)

general/sysutils/autofs.xml

@@ -7 +7 @@
   <!ENTITY autofs-download-http "&kernel-dl;/linux/daemons/autofs/v5/autofs-&autofs-version;.tar.xz">
   <!ENTITY autofs-download-ftp  " ">
-  <!ENTITY autofs-md5sum        "6bd1ea8a9e5dc3a7dc95119e3bbaf52c">
-  <!ENTITY autofs-size          "324 KB">
-  <!ENTITY autofs-buildsize     "6.7 MB">
+  <!ENTITY autofs-md5sum        "72d81645d39a857c3d16bd3a32e9cb44">
+  <!ENTITY autofs-size          "320 KB">
+  <!ENTITY autofs-buildsize     "6.5 MB">
   <!ENTITY autofs-time          "0.1 SBU">
 ]>
@@ -127 +127 @@
 
     <title>Installation of Autofs</title>
-
-    <para>Some lines of code need to be removed for this package to be
-    consistent with glibc-2.34. We will remove these lines with some sed commands
-    by line numbers showing slightly different methods.</para>
-
-<screen><userinput>sed -e '87d'        \
-    -e '2618,2644d' \
-    -i daemon/automount.c &amp;&amp;
-
-sed -i '1178,1180d' daemon/state.c &amp;&amp;
-sed -i '275,+2 d'   lib/alarm.c</userinput></screen>
-
 
     <para>
@@ -393 +381 @@
         <seg>
           lookup_dir.so, lookup_file.so, lookup_files.so, lookup_hosts.so,
-          lookup_ldap.so, lookup_multi.so, lookup_nis.so, lookup_nisplus.so,
+          lookup_ldap.so (optional), lookup_multi.so, lookup_nis.so,
           lookup_program.so, lookup_userhome.so, lookup_yp.so, mount_afs.so,
           mount_autofs.so, mount_bind.so, mount_changer.so, mount_ext2.so,
@@ -399 +387 @@
           mount_nfs4.so, parse_amd.so, and parse_sun.so
            </seg>
-        <seg>/usr/lib/autofs, /etc/autofs</seg>
+        <seg>/usr/lib/autofs and /etc/autofs</seg>
       </seglistitem>
     </segmentedlist>