Changeset 0f9a1f08 for postlfs

Timestamp:

01/18/2023 02:35:32 PM (21 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.3, 12.0, 12.1, 12.2, gimp3, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/for-12.3, xry111/llvm18, xry111/spidermonkey128, xry111/xf86-video-removal

Children:

c10acfe

Parents:

f56d2e7 (diff), 97e7219 (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 plabs/python-mods

Location:

postlfs

Files:

• editors/ed.xml (modified) (1 diff)
• filesystems/fuse3.xml (modified) (1 diff)
• filesystems/uefi-bootloaders/grub-setup.xml (modified) (2 diffs)
• filesystems/xfsprogs.xml (modified) (2 diffs)
• security/gnutls.xml (modified) (3 diffs)
• security/iptables.xml (modified) (1 diff)
• security/ssh-askpass.xml (modified) (4 diffs)

postlfs/editors/ed.xml

@@ -7 +7 @@
   <!ENTITY ed-download-http "&gnu-http;/ed/ed-&ed-version;.tar.lz">
   <!ENTITY ed-download-ftp  "&gnu-ftp;/ed/ed-&ed-version;.tar.lz">
-  <!ENTITY ed-md5sum        "9c83a86d63e8d1d048ce2d9cfe7bc0c4">
-  <!ENTITY ed-size          "68 KB">
-  <!ENTITY ed-buildsize     "1.0 MB">
+  <!ENTITY ed-md5sum        "fa861f0c9ebb8c0e1b79fda770a73b1c">
+  <!ENTITY ed-size          "65 KB">
+  <!ENTITY ed-buildsize     "1.2 MB">
   <!ENTITY ed-time          "less than 0.1 SBU">
 ]>

postlfs/filesystems/fuse3.xml

@@ -7 +7 @@
   <!ENTITY fuse3-download-http "https://github.com/libfuse/libfuse/releases/download/fuse-&fuse3-version;/fuse-&fuse3-version;.tar.xz">
   <!ENTITY fuse3-download-ftp  " ">
-  <!ENTITY fuse3-md5sum        "2640cd55b3c2a2eb9e78054f77f5c87a">
-  <!ENTITY fuse3-size          "3.1 MB">
-  <!ENTITY fuse3-buildsize     "95 MB (with tests and documentation)">
+  <!ENTITY fuse3-md5sum        "abb22345822168b16d455a6fcd990d4b">
+  <!ENTITY fuse3-size          "3.7 MB">
+  <!ENTITY fuse3-buildsize     "96 MB (with tests and documentation)">
   <!ENTITY fuse3-time          "0.1 SBU (add 0.4 SBU for tests)">
 ]>

postlfs/filesystems/uefi-bootloaders/grub-setup.xml

@@ -123 +123 @@
   Firmware Drivers --->
     [*] Mark VGA/VBE/EFI FB as generic system framebuffer       [CONFIG_SYSFB_SIMPLEFB]
-    EFI (Extensible Firmware Interface) Support --->
-      < > EFI Variable Support via sysfs                        [CONFIG_EFI_VARS]
   Graphics support --->
     <*> Direct Rendering Manager                                [CONFIG_DRM]
@@ -148 +146 @@
           EFI firmware to load it as an EFI application.  So, EFI stub is
           needed to wrap the kernel as an EFI application.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>CONFIG_EFI_VARS</parameter></term>
-        <listitem>
-          <para>Don't use this deprecated option because of a 1024-byte
-          variable size limit.  Its function is replaced by
-          <parameter>CONFIG_EFIVAR_FS</parameter>.</para>
         </listitem>
       </varlistentry>

postlfs/filesystems/xfsprogs.xml

@@ -7 +7 @@
   <!ENTITY xfsprogs-download-http "&kernel-dl;/linux/utils/fs/xfs/xfsprogs/xfsprogs-&xfsprogs-version;.tar.xz">
   <!ENTITY xfsprogs-download-ftp  " ">
-  <!ENTITY xfsprogs-md5sum        "267f09f8b2b0c286d49693841f48400c">
+  <!ENTITY xfsprogs-md5sum        "9befb0877b9f874b0ff16bcc1f858985">
   <!ENTITY xfsprogs-size          "1.3 MB">
-  <!ENTITY xfsprogs-buildsize     "53 MB">
+  <!ENTITY xfsprogs-buildsize     "77 MB">
   <!ENTITY xfsprogs-time          "0.3 SBU (Using parallelism=4)">
 ]>
@@ -166 +166 @@
         <seg>libhandle.so</seg>
         <seg>/usr/include/xfs,
-        /usr/lib/xfsprogs, and
+        /usr/lib/xfsprogs,
+        /usr/share/xfsprogs, and
         /usr/share/doc/xfsprogs-&xfsprogs-version;</seg>
       </seglistitem>

postlfs/security/gnutls.xml

@@ -146 +146 @@
 <screen><userinput>./configure --prefix=/usr \
             --docdir=/usr/share/doc/gnutls-&gnutls-version; \
-            --disable-rpath \
             --with-default-trust-store-pkcs11="pkcs11:" &amp;&amp;
 make</userinput></screen>
+<!-- - -disable-rpath \
+     Old gnutls versions (around 3.5) had a problem with rpath, because
+     libraries in the build tree were linked with rpath pointing to the
+     system libraries, so that tests failed. Present versions don't have
+     this problem, and do exactly what is expected without using the
+     disable-rpath option: rpath pointing to the build tree when libraries
+     are first linked, but rpath removed when libraries are relinked at
+     install time. -->
 
     <para>
@@ -160 +167 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-<!--
-    <para>
-      If you passed <option>- -enable-gtk-doc</option> to the
-      <command>configure</command> script, the API will automatically be
-      installed.  Otherwise, if desired, you can still install the API
-      documentation to the <filename
-      class="directory">/usr/share/gtk-doc/html/gnutls</filename> directory
-      using the following command as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C doc/reference install-data-local</userinput></screen>
--->
+
   </sect2>
 
@@ -183 +178 @@
       Omit this switch if <xref linkend="p11-kit"/> is not installed.
     </para>
-
-    <para>
-      <parameter>--disable-rpath</parameter>: This switch prevents building
+    <!-- see above
+    <para>
+      <parameter>- -disable-rpath</parameter>: This switch prevents building
       GnuTLS utilities and tests with hardcoded runtime library search path.
       Hardcoded rpath is unneeded for BLFS, and it causes test failures if
       an old version of GnuTLS is installed.
     </para>
-
+    -->
     <para>
       <option>--with-default-trust-store-file=/etc/pki/tls/certs/ca-bundle.crt</option>:

postlfs/security/iptables.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY iptables-download-http "https://www.netfilter.org/projects/iptables/files/iptables-&iptables-version;.tar.bz2">
-  <!ENTITY iptables-download-ftp  "ftp://ftp.netfilter.org/pub/iptables/iptables-&iptables-version;.tar.bz2">
-  <!ENTITY iptables-md5sum        "93da73116b7934a8da940b95a5f3e590">
-  <!ENTITY iptables-size          "732 KB">
+  <!ENTITY iptables-download-http "https://www.netfilter.org/projects/iptables/files/iptables-&iptables-version;.tar.xz">
+  <!ENTITY iptables-download-ftp  "ftp://ftp.netfilter.org/pub/iptables/iptables-&iptables-version;.tar.xz">
+  <!ENTITY iptables-md5sum        "ffa00f68d63e723c21b8a091c5c0271b">
+  <!ENTITY iptables-size          "633 KB">
   <!ENTITY iptables-buildsize     "16 MB">
   <!ENTITY iptables-time          "0.1 SBU">

postlfs/security/ssh-askpass.xml

@@ -76 +76 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/>,
+      <xref linkend="gtk3"/>,
       <xref role="runtime" linkend="sudo"/> (runtime),
       <xref linkend="xorg7-lib"/>, and
@@ -96 +96 @@
 
 <screen><userinput>cd contrib &amp;&amp;
-make gnome-ssh-askpass2</userinput></screen>
+make gnome-ssh-askpass3</userinput></screen>
 
     <para>
@@ -103 +103 @@
 
 <screen role="root"><userinput>install -v -d -m755                    /usr/libexec/openssh/contrib  &amp;&amp;
-install -v -m755    gnome-ssh-askpass2 /usr/libexec/openssh/contrib  &amp;&amp;
-ln -sv -f contrib/gnome-ssh-askpass2   /usr/libexec/openssh/ssh-askpass</userinput></screen>
+install -v -m755    gnome-ssh-askpass3 /usr/libexec/openssh/contrib  &amp;&amp;
+ln -sv -f contrib/gnome-ssh-askpass3   /usr/libexec/openssh/ssh-askpass</userinput></screen>
 
     <para>
@@ -153 +153 @@
       <seglistitem>
         <seg>
-          None
+          gnome-ssh-askpass3, ssh-askpass (symlink to 
+          <filename>gnome-ssh-askpass3</filename>)
         </seg>
         <seg>