Changeset 104ff4e for general/genlib/libssh2.xml

Timestamp:

01/04/2023 06:05:12 PM (16 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

qt5new

Children:

c0ef2f9

Parents:

1daaab6d (diff), 811d39b (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 qt5new

File:

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

general/genlib/libssh2.xml

@@ -16 +16 @@
   <?dbhtml filename="libssh2.html"?>
 
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
 
   <title>libssh2-&libssh2-version;</title>
@@ -34 +31 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -70 +67 @@
     </itemizedlist>
 
-<!-- Applied in 1.10.0
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -76 +72 @@
         <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>
@@ -88 +83 @@
       <xref linkend="gnupg2"/>,
       <xref linkend="libgcrypt"/>, and
-      <xref linkend="openssh"/> (all three are required for the testsuite)
+      <xref linkend="openssh"/> (all three are required for the test suite)
     </para>
 
@@ -100 +95 @@
 
     <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 +110 @@
     <para>
       To test the results, issue: <command>make check</command>.
-      <!--One test, using gnupg, may fail for unknown reasons.-->
     </para>