[blfs-book] r11327 - in trunk/BOOK: . introduction/welcome networking/netlibs

bdubbs at higgs.linuxfromscratch.org bdubbs at higgs.linuxfromscratch.org
Thu Jun 27 15:03:22 PDT 2013


Author: bdubbs
Date: Thu Jun 27 15:03:22 2013
New Revision: 11327

Log:
Update to curl-7.31.0

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/networking/netlibs/curl.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Thu Jun 27 12:53:14 2013	(r11326)
+++ trunk/BOOK/general.ent	Thu Jun 27 15:03:22 2013	(r11327)
@@ -463,7 +463,7 @@
 <!ENTITY wicd-major-version           "1.7">
 
 <!-- Chapter 17 -->
-<!ENTITY curl-version                 "7.30.0">
+<!ENTITY curl-version                 "7.31.0">
 <!ENTITY geoclue-version              "0.12.0">
 <!ENTITY glib-networking-version      "2.34.2">
 <!ENTITY libevent-version             "2.0.21">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Thu Jun 27 12:53:14 2013	(r11326)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Thu Jun 27 15:03:22 2013	(r11327)
@@ -47,6 +47,9 @@
       <para>June 27th, 2013</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Updated to curl-7.31.0.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Updated to Berkeley db-6.0.19.</para>
         </listitem>
         <listitem>

Modified: trunk/BOOK/networking/netlibs/curl.xml
==============================================================================
--- trunk/BOOK/networking/netlibs/curl.xml	Thu Jun 27 12:53:14 2013	(r11326)
+++ trunk/BOOK/networking/netlibs/curl.xml	Thu Jun 27 15:03:22 2013	(r11327)
@@ -6,10 +6,10 @@
 
   <!ENTITY curl-download-http "http://curl.haxx.se/download/curl-&curl-version;.tar.bz2">
   <!ENTITY curl-download-ftp  " ">
-  <!ENTITY curl-md5sum        "0db5ec03a5001b42a2edc03bf63b5ceb">
+  <!ENTITY curl-md5sum        "b7bea20579ac2f696338ae03f2c19ba5">
   <!ENTITY curl-size          "2.6 MB">
-  <!ENTITY curl-buildsize     "35 MB (additional 4 MB for tests)">
-  <!ENTITY curl-time          "0.5 SBU (additional 3.5 SBU for tests)">
+  <!ENTITY curl-buildsize     "35 MB (additional 7 MB for tests)">
+  <!ENTITY curl-time          "0.4 SBU (additional 3.1 SBU for tests)">
 ]>
 
 <sect1 id="curl" xreflabel="cURL-&curl-version;">
@@ -113,15 +113,15 @@
       commands:
     </para>
 
-<screen><userinput>sed -i '/--static-libs)/{N;s#echo .*#echo #;}' curl-config.in &&
-./configure --prefix=/usr              \
+<screen><userinput>./configure --prefix=/usr              \
             --disable-static           \
             --enable-threaded-resolver \
             --with-ca-path=/etc/ssl/certs &&
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: 
+      <command>sed -i 's/^#LDADD/LDADD/' docs/examples/Makefile; make check</command>.
     </para>
 
     <para>
@@ -138,17 +138,18 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <!--
     <para>
-      <command>sed -i '/--static-libs)/{N;s#echo .*#echo #;}'
+      <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"/>
-
+ 
     <para>
       <parameter>--enable-threaded-resolver</parameter>: This switch enables
       <application>cURL</application>'s builtin threaded DNS resolver.



More information about the blfs-book mailing list