[blfs-book] r9413 - in trunk/BOOK: . general/prog introduction/welcome networking/netlibs

andy at linuxfromscratch.org andy at linuxfromscratch.org
Wed Feb 15 08:30:37 PST 2012


Author: andy
Date: 2012-02-15 09:30:29 -0700 (Wed, 15 Feb 2012)
New Revision: 9413

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/git.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/networking/netlibs/curl.xml
Log:
curl-7.24.0

Modified: trunk/BOOK/general/prog/git.xml
===================================================================
--- trunk/BOOK/general/prog/git.xml	2012-02-15 13:45:35 UTC (rev 9412)
+++ trunk/BOOK/general/prog/git.xml	2012-02-15 16:30:29 UTC (rev 9413)
@@ -144,17 +144,17 @@
       <para>If you want to use <command>git svn</command> you will to install
       <xref linkend="subversion"/> and its perl bindings.</para>
 
-      <para>To be able to use git to pull from a https source you need to tell
-      it where the ssl certificates are. To install the SSL certificate bundle,
-      see <xref linkend="curl"/>. To set the location of the SSL certificate
-      bundle for all users, as the
-      <systemitem class="username">root</systemitem> user:</para>
+      <para>To be able to use git to pull from a https source you need first
+      install the <xref linkend="cacerts"/> and then configure git to know where
+      they are. To set the location of the SSL certificates for all just the
+      current user:</para>
 
-<screen role="root"><userinput>git config --system http.sslcainfo /etc/ssl/certs/ca-bundle.crt</userinput></screen>
+<screen><userinput>git config --global http.sslCAPath /etc/ssl/certs</userinput></screen>
 
-      <para>Alternatively, to define http.sslcainfo only for yourself:</para>
+      <para>Alternatively, to define http.sslCAPath  for all users, as the
+      <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput>git config --global http.sslcainfo /etc/ssl/certs/ca-bundle.crt</userinput></screen>
+<screen role="root"><userinput>git config --system http.sslCAPath /etc/ssl/certs</userinput></screen>
     </sect3>
   </sect2>
 

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-02-15 13:45:35 UTC (rev 9412)
+++ trunk/BOOK/general.ent	2012-02-15 16:30:29 UTC (rev 9413)
@@ -491,7 +491,7 @@
 <!ENTITY NetworkManager-version       "0.9.2.0">
 
 <!-- Chapter 16 -->
-<!ENTITY curl-version                 "7.22.0">
+<!ENTITY curl-version                 "7.24.0">
 <!ENTITY libgdata-version             "0.10.1">
 <!ENTITY libnice-version              "0.1.1">
 <!ENTITY libnl-version                "3.2.3">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-02-15 13:45:35 UTC (rev 9412)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-02-15 16:30:29 UTC (rev 9413)
@@ -62,6 +62,9 @@
         <listitem>
           <para>[abenton] - add Git 1.7.9.</para>
         </listitem>
+        <listitem>
+          <para>[abenton] - cURL 7.24.0.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/networking/netlibs/curl.xml
===================================================================
--- trunk/BOOK/networking/netlibs/curl.xml	2012-02-15 13:45:35 UTC (rev 9412)
+++ trunk/BOOK/networking/netlibs/curl.xml	2012-02-15 16:30:29 UTC (rev 9413)
@@ -4,13 +4,15 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY curl-download-http "http://curl.haxx.se/download/curl-&curl-version;.tar.bz2">
-  <!--<!ENTITY curl-download-ftp  "ftp://gd.tuwien.ac.at/utils/archivers/curl/curl-&curl-version;.tar.bz2">-->
+  <!ENTITY curl-download-http
+  "http://curl.haxx.se/download/curl-&curl-version;.tar.lzma">
+  <!--<!ENTITY curl-download-ftp
+  "ftp://gd.tuwien.ac.at/utils/archivers/curl/curl-&curl-version;.tar.bz2">-->
   <!ENTITY curl-download-ftp  " ">
-  <!ENTITY curl-md5sum        "bdb5c226d37c4a6082c70e7ef6f63060">
-  <!ENTITY curl-size          "2.2 MB">
-  <!ENTITY curl-buildsize     "37 MB">
-  <!ENTITY curl-time          "3.0 SBU (including the test suite)">
+  <!ENTITY curl-md5sum        "713d7d7cbc5cfaabd785a2ff905096f2">
+  <!ENTITY curl-size          "1.9 MB">
+  <!ENTITY curl-buildsize     "31 MB">
+  <!ENTITY curl-time          "0.5 SBU">
 ]>
 
 <sect1 id="curl" xreflabel="cURL-&curl-version;">
@@ -35,13 +37,13 @@
     <filename class="libraryfile">libcurl</filename>. This is useful for
     transferring files with URL syntax to any of the following protocols:
     FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS and FILE.
-    This ability to both download and upload files can be incorporated into other
-    programs to support functions like streaming media.</para>
+    This ability to both download and upload files can be incorporated into
+    other programs to support functions like streaming media.</para>
 
     &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
+    <itemizedlist spacing="compact">
       <listitem>
         <para>Download (HTTP): <ulink url="&curl-download-http;"/></para>
       </listitem>
@@ -73,11 +75,14 @@
     <ulink url="http://www.libssh2.org">libssh2</ulink>
     (for secure transfers),
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
-    <ulink url="http://www.vintela.com/resources/topics/spnego/">SPNEGO</ulink>, and
+    <ulink
+    url="http://www.vintela.com/resources/topics/spnego/">SPNEGO</ulink>, and
     <ulink url="http://daniel.haxx.se/projects/c-ares/">c-ares</ulink></para>
 
-    <bridgehead renderas="sect4">Optional for Running the Test Suite</bridgehead>
-    <para role="optional"><xref linkend="stunnel"/> (for the HTTPS and FTPS tests)</para>
+    <bridgehead renderas="sect4">Optional for Running the Test
+    Suite</bridgehead>
+    <para role="optional"><xref linkend="stunnel"/> (for the HTTPS and FTPS
+    tests)</para>
 
     <!-- and
     <ulink url="http://valgrind.org/">Valgrind</ulink> (not used if building
@@ -85,7 +90,6 @@
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/curl"/></para>
-
   </sect2>
 
   <sect2 role="installation">
@@ -94,7 +98,7 @@
     <para>Install <application>cURL</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr --disable-static &&
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>. Note that
@@ -103,18 +107,22 @@
     the HTTPS tests, you'll need to have an unrestrictive
     <filename>/etc/hosts.deny</filename> file.</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
 
-<screen role='root'><userinput>make install &&
-find docs -name "Makefile*" -o -name "*.1" -o -name "*.3" | xargs rm &&
+<screen role="root"><userinput>make install &&
+find docs \( -name "Makefile*" -o -name "*.1" -o -name "*.3" \) -exec rm {} \; &&
 install -v -d -m755 /usr/share/doc/curl-&curl-version; &&
 cp -v -R docs/*     /usr/share/doc/curl-&curl-version;</userinput></screen>
-
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para><option>--disable-static</option>: This option stops it compiling and
+    installing a static version of
+    <filename class="libraryfile">libcurl</filename>.</para>
+
     <para><option>--with-gssapi</option>:
     This parameter adds <application>Kerberos 5</application> support to
     <filename class="libraryfile">libcurl</filename>.</para>
@@ -127,12 +135,11 @@
     To build with <application>GnuTLS</application>
     support instead of <application>OpenSSL</application> for SSL/TLS.</para>
 
-    <para><command>find docs -name "Makefile*" -o -name "*.1"
-    -o -name "*.3" | xargs rm</command>: This command removes
+    <para><command>find docs \( -name "Makefile*" -o -name "*.1" -o -name "*.3"
+    \) -exec rm {} \;</command>: This command removes
     <filename>Makefiles</filename> and man files from the documentation
     directory that would otherwise be installed by the commands that
     follow.</para>
-
   </sect2>
 
   <sect2 role="content">
@@ -145,9 +152,8 @@
 
       <seglistitem>
         <seg>curl and curl-config</seg>
-        <seg>libcurl.{so,a}</seg>
-        <seg>/usr/include/curl, /usr/share/curl
-        and /usr/share/doc/curl-&curl-version;</seg>
+        <seg>libcurl.so</seg>
+        <seg>/usr/include/curl and /usr/share/doc/curl-&curl-version;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -179,18 +185,15 @@
       </varlistentry>
 
       <varlistentry id="libcurl">
-        <term><filename class='libraryfile'>libcurl.{so,a}</filename></term>
+        <term><filename class="libraryfile">libcurl.so</filename></term>
         <listitem>
           <para>provides the API functions required by
           <command>curl</command> and other programs.</para>
           <indexterm zone="curl libcurl">
-            <primary sortas="c-libcurl">libcurl.{so,a}</primary>
+            <primary sortas="c-libcurl">libcurl.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>




More information about the blfs-book mailing list