Changeset 35a47ae8 for general/genlib

Timestamp:

06/01/2023 08:17:24 AM (16 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

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

Children:

185bfd71

Parents:

68cae62

Message:

Update to libssh2-1.11.0

File:

• general/genlib/libssh2.xml (modified) (5 diffs)

general/genlib/libssh2.xml

@@ -7 +7 @@
   <!ENTITY libssh2-download-http "https://www.libssh2.org/download/libssh2-&libssh2-version;.tar.gz">
   <!ENTITY libssh2-download-ftp  " ">
-  <!ENTITY libssh2-md5sum        "f604ba083fad23bf715a9ecccc9f57f4">
-  <!ENTITY libssh2-size          "944 KB">
+  <!ENTITY libssh2-md5sum        "a01d543fd891ca48fe47726540d50b17">
+  <!ENTITY libssh2-size          "1.1 MB">
   <!ENTITY libssh2-buildsize     "13 MB (with tests)">
   <!ENTITY libssh2-time          "0.2 SBU (with tests)">
@@ -81 +81 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gnupg2"/>,
-      <xref linkend="libgcrypt"/>, and
-      <xref linkend="openssh"/> (all three are required for the test suite)
+      <xref linkend="cmake"/> (can be used instead of the
+      <command>configure</command> script),
+      <xref linkend="libgcrypt"/> (can be used instead of OpenSSL),
+      <xref linkend="openssh"/> (for some tests), and
+      <ulink url='https://www.docker.com'>Docker</ulink> (for some tests)
     </para>
 
@@ -95 +97 @@
 
     <para>
-      Apply a patch to fix incompatibility with recent OpenSSH releases:
+      If you want to test the package, exclude the tests requiring a static
+      library:
     </para>
 
-<screen><userinput>patch -Np1 -i ../libssh2-&libssh2-version;-upstream_fix-1.patch</userinput></screen>
+<screen><userinput>sed -E '/^DOCKER_TEST/,/^SSHD_TEST/s/test_(auth_keyboard_info.* |hostkey |simple)/$(NOTHING)/' \
+    -i tests/Makefile.inc &amp;&amp;
+autoreconf -fi</userinput></screen>
 
     <para>
@@ -105 +110 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr          \
+            --disable-docker-tests \
+            --disable-static       &amp;&amp;
 make</userinput></screen>
 
@@ -121 +128 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <parameter>--disable-docker-tests</parameter>: Disable the tests
+      requiring Docker, which is beyond the scope of BLFS.  Remove this
+      switch if you've installed Docker and you wish to run the test suite.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"