Changeset c6f9253 for networking/netlibs/curl.xml

Timestamp:

07/19/2014 10:46:32 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

f81638e

Parents:

48dc54f (diff), 3eb09b31 (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:

Add systemd branch.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13485 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• networking/netlibs/curl.xml (modified) (8 diffs)

networking/netlibs/curl.xml

@@ -7 +7 @@
   <!ENTITY curl-download-http "http://curl.haxx.se/download/curl-&curl-version;.tar.bz2">
   <!ENTITY curl-download-ftp  " ">
-  <!ENTITY curl-md5sum        "b7bea20579ac2f696338ae03f2c19ba5">
-  <!ENTITY curl-size          "2.6 MB">
-  <!ENTITY curl-buildsize     "35 MB (additional 7 MB for tests)">
-  <!ENTITY curl-time          "0.4 SBU (additional 3.1 SBU for tests)">
+  <!ENTITY curl-md5sum        "95c627abcf6494f5abe55effe7cd6a57">
+  <!ENTITY curl-size          "3.1 MB">
+  <!ENTITY curl-buildsize     "40 MB (additional 7 MB for tests)">
+  <!ENTITY curl-time          "0.4 SBU (additional 8.2 SBU for tests)">
 ]>
 
@@ -31 +31 @@
 
     <para>
-      The <application>cURL</application> package contains an utility
+      The <application>cURL</application> package contains a utility
       and a library used for transferring files with URL syntax to any of
       the following protocols: FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP,
@@ -39 +39 @@
     </para>
 
-    &lfs73_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -85 +85 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="libidn"/>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="openldap"/>,
       <ulink url="http://daniel.haxx.se/projects/c-ares/">c-ares</ulink>,
-      <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
-      <xref linkend="libidn"/>,
       <ulink url="https://launchpad.net/libmetalink/">libmetalink</ulink>,
-      <ulink url="http://www.libssh2.org">libssh2</ulink>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="openldap"/> and
+      <ulink url="http://www.libssh2.org">libssh2</ulink>, and
       <ulink url="http://www.vintela.com/resources/topics/spnego/">
       SPNEGO</ulink>
@@ -98 +97 @@
     <bridgehead renderas="sect4">Optional for Running the Test Suite</bridgehead>
     <para role="optional">
-      <xref linkend="stunnel"/> (for the HTTPS and FTPS tests)
+      <xref linkend="stunnel"/> (for the HTTPS and FTPS tests) and
+      <xref linkend="valgrind"/>
     </para>
 
@@ -116 +116 @@
 <screen><userinput>./configure --prefix=/usr              \
             --disable-static           \
-            --enable-threaded-resolver \
-            --with-ca-path=/etc/ssl/certs &amp;&amp;
+            --enable-threaded-resolver &amp;&amp;
 make</userinput></screen>
 
     <para>
-      To test the results, issue: 
-      <command>sed -i 's/^#LDADD/LDADD/' docs/examples/Makefile; make check</command>.
-    </para>
+      To test the results, issue: <command>make test</command>. Tests need many
+      conditions to run successfully, and some may fail. Usually, each failed
+      test takes a long time. If you wish to disable some tests, include them
+      in the the appropriate file and run the tests again:
+    </para>
+
+<screen><userinput>cat &gt;&gt; tests/data/DISABLED &lt;&lt; "EOF"
+<literal>numb1
+...
+numbN
+...</literal>
+EOF</userinput></screen>
 
     <para>
@@ -139 +147 @@
     <title>Command Explanations</title>
 
-    <!--
-    <para>
-      <command>sed -i '/- -static-libs)/{N;s#echo .*#echo #;}'
-      curl-config.in</command>: Since the static libraries have not been installed,
-      this <command>sed</command> removes the static libs line from
-      <command>curl-config</command> as it might otherwise confuse other
-      applications.
-    </para>
-    -->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
@@ -154 +153 @@
       <parameter>--enable-threaded-resolver</parameter>: This switch enables
       <application>cURL</application>'s builtin threaded DNS resolver.
-    </para>
-
-    <para>
-      <parameter>--with-ca-path=/etc/ssl/certs</parameter>: This parameter
-      sets the directory to use as the path to the SSL certificates.
-      If you've not installed <xref linkend="openssl"/> or
-      <xref linkend="gnutls"/> and the <xref linkend="cacerts"/> you can
-      remove this option.
     </para>