Ignore:
Timestamp:
12/04/2021 08:32:42 AM (2 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
qt5new
Children:
104ff4e
Parents:
ce5723af (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 qt5new

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/genlib/libssh2.xml

    rce5723af r1daaab6d  
    77  <!ENTITY libssh2-download-http "https://www.libssh2.org/download/libssh2-&libssh2-version;.tar.gz">
    88  <!ENTITY libssh2-download-ftp  " ">
    9   <!ENTITY libssh2-md5sum        "1beefafe8963982adc84b408b2959927">
    10   <!ENTITY libssh2-size          "868 KB">
     9  <!ENTITY libssh2-md5sum        "f604ba083fad23bf715a9ecccc9f57f4">
     10  <!ENTITY libssh2-size          "944 KB">
    1111  <!ENTITY libssh2-buildsize     "13 MB (with tests)">
    1212  <!ENTITY libssh2-time          "0.2 SBU (with tests)">
     
    7070    </itemizedlist>
    7171
     72<!-- Applied in 1.10.0
    7273    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    7374    <itemizedlist spacing="compact">
     
    7980      </listitem>
    8081    </itemizedlist>
     82-->
    8183
    8284    <bridgehead renderas="sect3">libssh2 Dependencies</bridgehead>
     
    8688      <xref linkend="gnupg2"/>,
    8789      <xref linkend="libgcrypt"/>, and
    88       <xref linkend="openssh"/> (all three required for the testsuite)
     90      <xref linkend="openssh"/> (all three are required for the testsuite)
    8991    </para>
    9092
     
    102104    </para>
    103105
    104 <screen><userinput>patch -Np1 -i ../libssh2-&libssh2-version;-security_fixes-1.patch &amp;&amp;
    105 ./configure --prefix=/usr --disable-static            &amp;&amp;
     106<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
    106107make</userinput></screen>
    107108
    108109    <para>
    109110      To test the results, issue: <command>make check</command>.
    110       One test, using gnupg, may fail for unknown reasons.
     111      <!--One test, using gnupg, may fail for unknown reasons.-->
    111112    </para>
    112113
Note: See TracChangeset for help on using the changeset viewer.