Changeset 2cb4b95

Timestamp:

09/01/2022 11:21:24 AM (20 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

11.3, 12.0, 12.1, 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/llvm18, xry111/soup3, xry111/xf86-video-removal

Children:

88c3b98

Parents:

7076607

git-author:

Xi Ruoyao <xry111@…> (09/01/2022 11:20:19 AM)

git-committer:

Xi Ruoyao <xry111@…> (09/01/2022 11:21:24 AM)

Message:

libssh2: add upstream fix patch for OpenSSH compatibility

Files:

• general/genlib/libssh2.xml (modified) (4 diffs)
• networking/netlibs/curl.xml (modified) (3 diffs)

general/genlib/libssh2.xml

@@ -70 +70 @@
     </itemizedlist>
 
-<!-- Applied in 1.10.0
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -76 +75 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/libssh2-&libssh2-version;-security_fixes-1.patch"/>
+          <ulink url="&patch-root;/libssh2-&libssh2-version;-upstream_fix-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
 
     <bridgehead renderas="sect3">libssh2 Dependencies</bridgehead>
@@ -100 +98 @@
 
     <para>
+      Apply a patch to fix incompatibility with recent OpenSSH releases:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../libssh2-&libssh2-version;-upstream_fix-1.patch</userinput></screen>
+
+    <para>
       Install <application>libssh2</application> by running the following
       commands:
@@ -109 +113 @@
     <para>
       To test the results, issue: <command>make check</command>.
-      <!-- https://github.com/libssh2/libssh2/issues/630 -->
-      One test named <filename>ssh2.sh</filename> is known to fail with
-      recent OpenSSH releases.
     </para>
 

networking/netlibs/curl.xml

@@ -180 +180 @@
        duplicated many times complaining the Python module impacket (not a
        part of BLFS) is missing and be skipped.  If libssh2 is installed
-       and the optional <option>--enable-ssh2</option> is used, a lot of SCP
-       and SFTP tests will fail.
+       and the optional <option>--enable-ssh2</option> is used, test 1459
+       will fail.
     </para>
 <!-- Two (of 857) tests
@@ -343 +343 @@
 TESTFAIL: These test cases failed: 1139 1140 1173 1177
 ====
-Added by xry111 for curl-7.84.0 on 2022-08-25:
+Added by xry111 for curl-7.85.0 on 2022-09-01:
 With:
   all BLFS dependencies but stunnel installed
-  libssh2-2.10.0 patched
-    Without the patch, many SCP and SFTP tests fail with-libssh2
-    I'll add the patch in 11.3 development cycle.
+  libssh2-2.10.0 patched with libssh2-1.10.0-upstream_fix-1.patch
   with-{gssapi,libssh2} enable-threaded-resolver
 TESTDONE: 1520 tests were considered during 508 seconds.
@@ -355 +353 @@
   It is a SCP test for bad .known_hosts file and fails because of a mismatch
   of error codes, I don't think it indicated a serious issue.
-With:
-  all BLFS dependencies but stunnel installed
-  libssh2-2.10.0 patched
-  with-{gssapi,libssh2} enable-ares
-TESTDONE: 1520 tests were considered during 499 seconds.
-TESTDONE: 1325 tests out of 1327 reported OK: 99%
-TESTFAIL: These test cases failed: 1083 1459
-  1083 seems because c-ares don't handle "ip6-loopback" well (or, maybe
-  a LFS /etc/hosts issue?)
 -->