Update to cmake-2.8.6.

Update to curl-7.22.0.
Updated to libarchive-2.8.5.
Reset all python references to python2.


git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8928 af4574ff-66df-0310-9fd7-8a98e5e911e0

basicnet/netlibs/curl.xml

@@ -7,10 +7,10 @@
   <!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-ftp  " ">
-  <!ENTITY curl-md5sum        "ca96df88e044c7c25d19692ec8b250b2">
+  <!ENTITY curl-md5sum        "bdb5c226d37c4a6082c70e7ef6f63060">
-  <!ENTITY curl-size          "2.1 MB">
+  <!ENTITY curl-size          "2.2 MB">
-  <!ENTITY curl-buildsize     "30 MB">
+  <!ENTITY curl-buildsize     "37 MB">
-  <!ENTITY curl-time          "0.6 SBU (up to 7 SBUs to run the test suite)">
+  <!ENTITY curl-time          "3.0 SBU (including the test suite)">
 ]>
 
 <sect1 id="curl" xreflabel="cURL-&curl-version;">
@@ -38,7 +38,7 @@
     This ability to both download and upload files can be incorporated into other
     programs to support functions like streaming media.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing='compact'>

basicnet/netutils/avahi.xml

@@ -191,7 +191,7 @@ make</userinput></screen>
         libavahi-core.{so,a}, libavahi-glib.{so,a}, libavahi-gobject.{so,a}, and
         libavahi-ui.{so,a}</seg>
         <seg>/etc/avahi/services,/usr/{include/avahi-{client,common,core,glib,
-        gobject,ui},lib/{avahi,python&python-majorver;/site-packages/{avahi,avahi_discover}},
+        gobject,ui},lib/{avahi,python&python2-majorver;/site-packages/{avahi,avahi_discover}},
         share/avahi/{interfaces,introspection}}</seg>
       </seglistitem>
     </segmentedlist>

general.ent

@@ -3,13 +3,13 @@ $LastChangedBy$
 $Date$
 -->
 
-<!ENTITY day          "30">                   <!-- Always 2 digits -->
+<!ENTITY day          "31">                   <!-- Always 2 digits -->
 <!ENTITY month        "10">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "September &day;th, &year;">
+<!ENTITY releasedate  "October &day;st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|testing|unstable|development] -->
@@ -299,8 +299,8 @@ $Date$
 <!ENTITY udisks-version               "1.0.1">
 <!ENTITY eject-version                "2.1.5">
 <!ENTITY unrar-version                "3.9.10">
-<!ENTITY libarchive-version           "2.8.4">
+<!ENTITY libarchive-version           "2.8.5">
-<!ENTITY cmake-version                "2.8.3">
+<!ENTITY cmake-version                "2.8.6">
 <!ENTITY raptor-version               "1.4.21">
 <!ENTITY rasqal-version               "0.9.20">
 <!ENTITY redland-version              "1.0.12">
@@ -330,8 +330,8 @@ $Date$
 <!ENTITY php-version                  "5.3.3">
 <!ENTITY python2-version              "2.7.2">
 <!ENTITY python2-majorver             "2.7">
-<!ENTITY python-version               "3.2.2">
+<!ENTITY python3-version              "3.2.2">
-<!ENTITY python-majorver              "3.2.2">
+<!ENTITY python3-majorver             "3.2.2">
 <!ENTITY ruby-version                 "1.9.2-p290">
 <!ENTITY tcl-version                  "8.5.10">
 <!ENTITY tk-version                   "8.5.9">
@@ -421,7 +421,7 @@ $Date$
 <!ENTITY pppoe-version                "3.8">
 
 <!-- Chapter 16 -->
-<!ENTITY curl-version                 "7.21.2">
+<!ENTITY curl-version                 "7.22.0">
 <!ENTITY libnice-version              "0.0.8">
 <!ENTITY libpcap-version              "1.0.0">
 <!ENTITY libproxy-version             "0.2.3">

general/genlib/dbus-bindings.xml

@@ -324,7 +324,7 @@ install -v -m644    api/* \
           <seg>None</seg>
           <seg><application>Python</application>
           <application>D-Bus</application> modules</seg>
-          <seg>/usr/lib/python&python-majorver;/site-packages/dbus and
+          <seg>/usr/lib/python&python2-majorver;/site-packages/dbus and
           /usr/share/doc/dbus-python-&dbus-python-version;</seg>
         </seglistitem>
       </segmentedlist>

general/genlib/expat.xml

@@ -32,7 +32,7 @@
     <para>The <application>Expat</application> package contains a stream oriented
     C library for parsing XML.</para>
 
-    &lfs67_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

general/genlib/libgsf.xml

@@ -138,7 +138,7 @@ make</userinput></screen>
         <seg>gsf, gsf-office-thumbnailer (optional), and gsf-vba-dump</seg>
         <seg>libgsf-1.{so,a} and optionally, libgsf-gnome-1.{so,a}</seg>
         <seg>/usr/include/libgsf-1 and /usr/share/gtk-doc/html/gsf and
-        optionally, /usr/lib/python&python-majorver;/site-packages/gsf</seg>
+        optionally, /usr/lib/python&python2-majorver;/site-packages/gsf</seg>
       </seglistitem>
     </segmentedlist>
 

general/prog/python-modules.xml

@@ -213,7 +213,7 @@ cd ..</userinput></screen>
         <seglistitem>
           <seg>xmlproc_parse and xmlproc_val</seg>
           <seg>PyXML Python library modules</seg>
-          <seg>/usr/lib/python&python-majorver;/site-packages/_xmlplus and
+          <seg>/usr/lib/python&python2-majorver;/site-packages/_xmlplus and
           /usr/share/doc/PyXML-&pyxml-version;</seg>
         </seglistitem>
       </segmentedlist>
@@ -327,7 +327,7 @@ make</userinput></screen>
           <seg>None</seg>
           <seg>Pycairo Python library module</seg>
           <seg>/usr/include/pycairo and
-          /usr/lib/python&python-majorver;/site-packages/cairo</seg>
+          /usr/lib/python&python2-majorver;/site-packages/cairo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -428,7 +428,7 @@ make</userinput></screen>
           <seg>libpyglib-2.0-python.so, _gio.so, unix.so, _glib.so, and
           _gobject.so</seg>
           <seg>/usr/{include/pygtk-2.0,
-          lib/python&python-majorver;/site-packages/gtk-2.0/{gio,glib,gobject},
+          lib/python&python2-majorver;/site-packages/gtk-2.0/{gio,glib,gobject},
           share/{gtk-doc/html/pygobject,pygobject/{2.0/{codegen,defs},
           xsl}}}</seg>
         </seglistitem>
@@ -553,7 +553,7 @@ make</userinput></screen>
           <seg>atk.so, _gtk.so, glade.so, gtkunixprint.so, pango.so, and
           pangocairo.so</seg>
           <seg>/usr/{include/pygtk-2.0/pygtk,lib/{pygtk/2.0/demos/images,
-          python&python-majorver;/site-packages/gtk-2.0/gtk},
+          python&python2-majorver;/site-packages/gtk-2.0/gtk},
           share/{gtk-doc/html/pygtk/{cursors,icons,images},pygtk/2.0/defs}}</seg>
         </seglistitem>
       </segmentedlist>
@@ -894,7 +894,7 @@ make</userinput></screen>
           _gnome.so, ui.so, gnomecanvas.so, _gnomevfs.so, and
           gnomevfsbonobo.so</seg>
           <seg>/usr/{include/gnome-python-2.0,
-          lib/python&python-majorver;/site-packages/gtk-2.0/{bonobo,gnomevfs},
+          lib/python&python2-majorver;/site-packages/gtk-2.0/{bonobo,gnomevfs},
           share/{gtk-doc/html/pygnomevfs,pygtk/2.0/argtypes}}</seg>
         </seglistitem>
       </segmentedlist>
@@ -1042,7 +1042,7 @@ make</userinput></screen>
           <seg>braseroburn.so, braseromedia.so, evince.so, ebook.so, ecal.so,
           gnomeapplet.so, _gnomedesktop.so, gnomekeyring.so, _print.so, ui.so,
           gtop.so, mediaprofiles.so, rsvg.so, plparser.so, and wnck.so</seg>
-          <seg>/usr/{lib/python&python-majorver;/site-packages/gtk-2.0/{evolution,
+          <seg>/usr/{lib/python&python2-majorver;/site-packages/gtk-2.0/{evolution,
           gnomedesktop,gnomeprint,totem},share/gtk-doc/html/pygnomeprintui}</seg>
           <seg>None</seg>
         </seglistitem>

general/prog/python.xml

@@ -4,29 +4,29 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY python-download-http "http://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
+  <!ENTITY python3-download-http "http://www.python.org/ftp/python/&python3-version;/Python-&python3-version;.tar.xz">
-  <!ENTITY python-download-ftp  "&gentoo-ftp-repo;/Python-&python-version;.tar.xz">
+  <!ENTITY python3-download-ftp  "&gentoo-ftp-repo;/Python-&python3-version;.tar.xz">
-  <!ENTITY python-md5sum        "3720ce9460597e49264bbb63b48b946d">
+  <!ENTITY python3-md5sum        "3720ce9460597e49264bbb63b48b946d">
-  <!ENTITY python-size          "8.5 MB">
+  <!ENTITY python3-size          "8.5 MB">
-  <!ENTITY python-buildsize     "141 MB (23MB for the test suite)">
+  <!ENTITY python3-buildsize     "141 MB (23MB for the test suite)">
-  <!ENTITY python-time          "1 SBU (additional 2.9 SBU to run the test suite)">
+  <!ENTITY python3-time          "1 SBU (additional 2.9 SBU to run the test suite)">
-  <!ENTITY pythonhtmldoc-download-http "http://docs.python.org/ftp/python/doc/&python-majorver;/python-&python-majorver;-docs-html.tar.bz2">
+  <!ENTITY python3htmldoc-download-http "http://docs.python.org/ftp/python/doc/&python3-majorver;/python3-&python3-majorver;-docs-html.tar.bz2">
-  <!ENTITY pythonhtmldoc-md5sum        "55af06e320f35920ea9fed1f143e1286">
+  <!ENTITY python3htmldoc-md5sum        "55af06e320f35920ea9fed1f143e1286">
-  <!ENTITY pythonhtmldoc-size          "4.2 MB">
+  <!ENTITY python3htmldoc-size          "4.2 MB">
 ]>
 
-<sect1 id="python" xreflabel="Python-&python-version;">
+<sect1 id="python3" xreflabel="Python-&python3-version;">
-  <?dbhtml filename="python.html" ?>
+  <?dbhtml filename="python3.html" ?>
 
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
 
-  <title>Python-&python-version;</title>
+  <title>Python-&python3-version;</title>
 
-  <indexterm zone="python">
+  <indexterm zone="python3">
-    <primary sortas="a-Python">Python</primary>
+    <primary sortas="a-Python3">Python</primary>
   </indexterm>
 
   <sect2 role="package">
@@ -45,22 +45,22 @@
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&python-download-http;"/></para>
+        <para>Download (HTTP): <ulink url="&python3-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&python-download-ftp;"/></para>
+        <para>Download (FTP): <ulink url="&python3-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &python-md5sum;</para>
+        <para>Download MD5 sum: &python3-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Download size: &python-size;</para>
+        <para>Download size: &python3-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &python-buildsize;</para>
+        <para>Estimated disk space required: &python3-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &python-time;</para>
+        <para>Estimated build time: &python3-time;</para>
       </listitem>
     </itemizedlist>
 
@@ -75,13 +75,13 @@
     <itemizedlist spacing='compact'>
       <title>Optional HTML Documentation</title>
       <listitem>
-        <para>Download (HTTP): <ulink url="&pythonhtmldoc-download-http;"/></para>
+        <para>Download (HTTP): <ulink url="&python3htmldoc-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &pythonhtmldoc-md5sum;</para>
+        <para>Download MD5 sum: &python3htmldoc-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Download size: &pythonhtmldoc-size;</para>
+        <para>Download size: &python3htmldoc-size;</para>
       </listitem>
     </itemizedlist>
 
@@ -141,12 +141,12 @@ make</userinput></screen>
     commands as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/Python-&python-version;/html &amp;&amp;
+<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/Python-&python3-version;/html &amp;&amp;
 tar --strip-components=1 \
     --no-same-owner \
     --no-same-permissions \
-    -C /usr/share/doc/Python-&python-version;/html \
+    -C /usr/share/doc/Python-&python3-version;/html \
-    -xvf ../python-&python-majorver;-docs-html.tar.bz2</userinput></screen>
+    -xvf ../python-&python3-majorver;-docs-html.tar.bz2</userinput></screen>
 
   </sect2>
 
@@ -166,7 +166,7 @@ tar --strip-components=1 \
     documentation, you must add the following environment variable to
     individual user's or the system's profile:</para>
 
-    <screen role="root"><userinput>export PYTHONDOCS=/usr/share/doc/Python-&python-version;/html</userinput></screen>
+    <screen role="root"><userinput>export PYTHONDOCS=/usr/share/doc/Python-&python3-version;/html</userinput></screen>
 
   </sect2>
 
@@ -179,14 +179,14 @@ tar --strip-components=1 \
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>2to3, pydoc, python, python-config, python&python-majorver;,
+        <seg>2to3, pydoc, python3, python3-config, python&python3-majorver;,
-        python&python-majorver;-config, smtpd.py, and optionally if
+        python&python3-majorver;-config, smtpd.py, and optionally if
         <application>Tk</application> is installed, idle</seg>
-        <seg>libpython&python-majorver;.so and numerous modules installed in
+        <seg>libpython&python3-majorver;.so and numerous modules installed in
-        /usr/lib/python&python-majorver;/lib-dynload</seg>
+        /usr/lib/python&python3-majorver;/lib-dynload</seg>
-        <seg>/usr/include/python&python-majorver;,
+        <seg>/usr/include/python&python3-majorver;,
-        /usr/lib/python&python-majorver;, and
+        /usr/lib/python&python3-majorver;, and
-        /usr/share/doc/python-&python-version;</seg>
+        /usr/share/doc/python-&python3-version;</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -200,7 +200,7 @@ tar --strip-components=1 \
         <listitem>
           <para>is a wrapper script that opens a
           <application>Python</application> aware GUI editor.</para>
-          <indexterm zone="python idle">
+          <indexterm zone="python3 idle">
             <primary sortas="b-idle">idle</primary>
           </indexterm>
         </listitem>
@@ -211,30 +211,30 @@ tar --strip-components=1 \
         <listitem>
           <para>is the <application>Python</application> documentation
           tool.</para>
-          <indexterm zone="python pydoc">
+          <indexterm zone="python3 pydoc">
             <primary sortas="b-pydoc">pydoc</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="python-prog">
+      <varlistentry id="python3-prog">
         <term><command>python</command></term>
         <listitem>
           <para>is an interpreted, interactive, object-oriented programming
           language.</para>
-          <indexterm zone="python python-prog">
+          <indexterm zone="python3 python3-prog">
-            <primary sortas="b-python">python</primary>
+            <primary sortas="b-python3">python3</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
       <varlistentry id="python-ver">
-        <term><command>python&python-majorver;</command></term>
+        <term><command>python&python3-majorver;</command></term>
         <listitem>
           <para>is a version-specific name for the <command>python</command>
           program.</para>
-          <indexterm zone="python python-ver">
+          <indexterm zone="python3 python-ver">
-            <primary sortas="b-python&python-majorver;">python&python-majorver;</primary>
+            <primary sortas="b-python&python3-majorver;">python&python3-majorver;</primary>
           </indexterm>
         </listitem>
       </varlistentry>
@@ -244,7 +244,7 @@ tar --strip-components=1 \
         <listitem>
           <para>is an SMTP proxy implemented in
           <application>Python</application>.</para>
-          <indexterm zone="python smtpd.py">
+          <indexterm zone="python3 smtpd.py">
             <primary sortas="b-smtpd.py">smtpd.py</primary>
           </indexterm>
         </listitem>

general/prog/python2.xml

@@ -15,7 +15,7 @@
   <!ENTITY python2htmldoc-size          "4.1 MB">
 ]>
 
-<sect1 id="python2" xreflabel="Python-&python2-version;">
+<sect1 id="python" xreflabel="Python-&python2-version;">
   <?dbhtml filename="python2.html" ?>
 
   <sect1info>
@@ -25,7 +25,7 @@
 
   <title>Python-&python2-version;</title>
 
-  <indexterm zone="python2">
+  <indexterm zone="python">
     <primary sortas="a-Python2">Python</primary>
   </indexterm>
 
@@ -195,7 +195,7 @@ tar --strip-components=1 \
         <listitem>
           <para>is a wrapper script that opens a
           <application>Python</application> aware GUI editor.</para>
-          <indexterm zone="python2 idle2">
+          <indexterm zone="python idle2">
             <primary sortas="b-idle2">idle</primary>
           </indexterm>
         </listitem>
@@ -206,7 +206,7 @@ tar --strip-components=1 \
         <listitem>
           <para>is the <application>Python</application> documentation
           tool.</para>
-          <indexterm zone="python2 pydoc2">
+          <indexterm zone="python pydoc2">
             <primary sortas="b-pydoc2">pydoc</primary>
           </indexterm>
         </listitem>
@@ -217,8 +217,8 @@ tar --strip-components=1 \
         <listitem>
           <para>is an interpreted, interactive, object-oriented programming
           language.</para>
-          <indexterm zone="python2 python2-prog">
+          <indexterm zone="python python2-prog">
-            <primary sortas="b-python2">python</primary>
+            <primary sortas="b-python">python</primary>
           </indexterm>
         </listitem>
       </varlistentry>
@@ -228,8 +228,8 @@ tar --strip-components=1 \
         <listitem>
           <para>is a version-specific name for the <command>python</command>
           program.</para>
-          <indexterm zone="python2 python2-ver">
+          <indexterm zone="python python2-ver">
-            <primary sortas="b-python&python-majorver;">python&python-majorver;</primary>
+            <primary sortas="b-python&python2-majorver;">python&python2-majorver;</primary>
           </indexterm>
         </listitem>
       </varlistentry>
@@ -239,7 +239,7 @@ tar --strip-components=1 \
         <listitem>
           <para>is an SMTP proxy implemented in
           <application>Python</application>.</para>
-          <indexterm zone="python2 smtpd.py2">
+          <indexterm zone="python smtpd.py2">
             <primary sortas="b-smtpd.py2">smtpd.py</primary>
           </indexterm>
         </listitem>

general/sysutils/cmake.xml

@@ -6,10 +6,10 @@
 
   <!ENTITY cmake-download-http "http://www.cmake.org/files/v2.8/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "a76a44b93acf5e3badda9de111385921">
+  <!ENTITY cmake-md5sum        "2147da452fd9212bb9b4542a9eee9d5b">
   <!ENTITY cmake-size          "5.3 MB">
-  <!ENTITY cmake-buildsize     "132 MB">
+  <!ENTITY cmake-buildsize     "303 MB (including tests)">
-  <!ENTITY cmake-time          "1.3 SBU">
+  <!ENTITY cmake-time          "4.1 SBU (including 2.5 SBU test time)">
 ]>
 
 <sect1 id="cmake" xreflabel="cmake-&cmake-version;">
@@ -57,23 +57,18 @@
       </listitem>
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/cmake-&cmake-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-
     <bridgehead renderas="sect3">CMake Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="curl"/>, 
+      <xref linkend="curl"/>, 
-    <xref linkend="libarchive"/>, and 
+      <xref linkend="libarchive"/>, and 
-    <xref linkend="expat"/>
+      <xref linkend="expat"/>
+    </para>
+
+    <bridgehead renderas="sect4">Options</bridgehead>
+    <para role="optional">
+      <xref linkend="subversion"/> (for testing)
     </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -87,12 +82,15 @@
     <para>Install <application>CMake</application> by running the following
     commands:</para>
 
-<screen><userinput>./bootstrap --prefix=/usr \
+<screen><userinput>./bootstrap --prefix=/usr       \
-            --system-libs \
+            --system-libs       \
             --mandir=/share/man \
             --docdir=/share/doc/cmake-&cmake-version; &amp;&amp;
 make</userinput></screen>
 
+    <para>To test the results, issue: <userinput>make test</userinput>.
+    The SVN test may fail.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>

general/sysutils/libarchive.xml

@@ -6,10 +6,10 @@
 
   <!ENTITY libarchive-download-http "http://libarchive.googlecode.com/files/libarchive-&libarchive-version;.tar.gz">
   <!ENTITY libarchive-download-ftp  " ">
-  <!ENTITY libarchive-md5sum        "83b237a542f27969a8d68ac217dc3796">
+  <!ENTITY libarchive-md5sum        "9caf51dcf6213e9c9f5a1c27448b9c90">
-  <!ENTITY libarchive-size          "1.5 MB">
+  <!ENTITY libarchive-size          "1.4 MB">
-  <!ENTITY libarchive-buildsize     "18 MB">
+  <!ENTITY libarchive-buildsize     "25 MB">
-  <!ENTITY libarchive-time          "0.2 SBU">
+  <!ENTITY libarchive-time          "0.3 SBU">
 ]>
 
 <sect1 id="libarchive" xreflabel="libarchive-&libarchive-version;">
@@ -32,7 +32,7 @@
     <para>The <application>libarchive</application> library provides a single interface for
     reading/writing various compression formats.</para>
 
-    &lfs67_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -87,6 +87,8 @@
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
+    <para>To test the results, issue: <userinput>make check</userinput>.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>

gnome/add/alacarte.xml

@@ -103,7 +103,7 @@ make</userinput></screen>
       <seglistitem>
         <seg>alacarte</seg>
         <seg><application>Python</application> modules.</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{lib/python&python-majorver;/site-packages/Alacarte,
+        <seg><envar>$GNOME_PREFIX</envar>/{lib/python&python2-majorver;/site-packages/Alacarte,
         share/{alacarte,icons/hicolor/256x256/apps,locale/bem/LC_MESSAGES}}</seg>
       </seglistitem>
     </segmentedlist>

gnome/add/at-spi.xml

@@ -133,7 +133,7 @@ make</userinput></screen>
         <seg>at-spi-registryd</seg>
         <seg>libatk-bridge.so, libcspi.so, libloginhelper.so, libspi.so,
         Accessibility_LoginHelper_module.so, and Accessibility_module.so</seg>
-        <seg>/usr/lib/python&python-majorver;/site-packages/pyatspi,
+        <seg>/usr/lib/python&python2-majorver;/site-packages/pyatspi,
         <envar>$GNOME_PREFIX</envar>/{include/at-spi-1.0/{cspi,libspi,
         login-helper},lib/at-spi,share/{doc/at-spi-1.30.1/reference/html,
         gtk-doc/html/at-spi-cspi,idl/at-spi-1.0}}</seg>

gnome/add/deskbar-applet.xml

@@ -127,7 +127,7 @@ make</userinput></screen>
       <seglistitem>
         <seg>deskbar-applet</seg>
         <seg>Python modules</seg>
-        <seg>/usr/lib/python&python-majorver;/site-packages/deskbar/{core/{_userdirs,
+        <seg>/usr/lib/python&python2-majorver;/site-packages/deskbar/{core/{_userdirs,
         keybinder,updater},handlers/{actions,evolution},interfaces,osutils,
         ui/{cuemiac,iconentry,preferences}},
         <envar>$GNOME_PREFIX</envar>/{lib/deskbar-applet/modules-2.20-compatible,

gnome/add/gnome-games.xml

@@ -188,7 +188,7 @@ make</userinput></screen>
         gnome-sudoku, gnomine, gnotravex, gnotski, gtali, iagno, lightsoff,
         mahjongg, quadrapassel, sol, swell-foop, and ar-cards-renderer</seg>
         <seg>libgames-support-gi.{so,a}</seg>
-        <seg>/usr/lib/python&python-majorver;/site-packages/{glchess/{chess/fics,
+        <seg>/usr/lib/python&python2-majorver;/site-packages/{glchess/{chess/fics,
         ggz,gtkui,scene/{cairo,opengl},ui},gnome_sudoku/gtk_goodies},
         <envar>$GNOME_PREFIX</envar>/{lib/gnome-games,share/{glchess/textures,
         gnome-games-common/cards,gnome-games/{aisleriot/games,glines/pixmaps,

gnome/add/hamster-applet.xml

@@ -108,7 +108,7 @@ make</userinput></screen>
       <seglistitem>
         <seg>gnome-time-tracker and hamster-standalone</seg>
         <seg>_keybinder.so</seg>
-        <seg>/usr/lib/python&python-majorver;/site-packages/hamster/{keybinder,
+        <seg>/usr/lib/python&python2-majorver;/site-packages/hamster/{keybinder,
         widgets},
         <envar>$GNOME_PREFIX</envar>/{lib/hamster-applet,
         share/{gnome/help/hamster-applet/*,hamster-applet/art}}</seg>

gnome/add/orca.xml

@@ -136,7 +136,7 @@ make</userinput></screen>
       <seglistitem>
         <seg>orca</seg>
         <seg>None</seg>
-        <seg>/usr/lib/python&python-majorver;/site-packages/orca/scripts/{apps/{Banshee,
+        <seg>/usr/lib/python&python2-majorver;/site-packages/orca/scripts/{apps/{Banshee,
         Thunderbird,evolution,gcalctool,gedit,gnome-window-properties,
         packagemanager,pidgin,planner,rhythmbox,soffice,yelp},toolkits/{Gecko,
         J2SE-access-bridge}},

gnome/core/gnome-menus.xml

@@ -152,7 +152,7 @@ make</userinput></screen>
         profile, or in individual user's profiles as shown below:</para>
 
 <screen role='root'><userinput>echo "export PYTHONPATH=\$PYTHONPATH:$(pkg-config \
---variable=prefix ORBit-2.0)/lib/python&python-majorver;/site-packages/GMenuSimpleEditor" \
+--variable=prefix ORBit-2.0)/lib/python&python2-majorver;/site-packages/GMenuSimpleEditor" \
 &gt;&gt; /etc/profile.d/gnome.sh</userinput></screen>
 
       </sect4>
@@ -174,7 +174,7 @@ make</userinput></screen>
         <seg>libgnome-menu.{so,a} and gmenu.{so,a}</seg>
         <seg>&gnome-etc-dir;/xdg/menus,
         <envar>$GNOME_PREFIX</envar>/{include/gnome-menus,
-        lib/python&python-majorver;/site-packages/GMenuSimpleEditor,
+        lib/python&python2-majorver;/site-packages/GMenuSimpleEditor,
         share/{desktop-directories,gnome-menus/{examples,ui}}}</seg>
       </seglistitem>
     </segmentedlist>

gnome/core/libgweather.xml

@@ -130,7 +130,7 @@ make</userinput></screen>
         <seg>None</seg>
         <seg>libgweather.{so,a}</seg>
         <seg><envar>$GNOME_PREFIX</envar>/{include/libgweather,
-        lib/python&python-majorver;/site-packages/gweather/I_KNOW_THIS_IS_UNSTABLE,
+        lib/python&python2-majorver;/site-packages/gweather/I_KNOW_THIS_IS_UNSTABLE,
         share/{gtk-doc/html/libgweather,libgweather}}</seg>
       </seglistitem>
     </segmentedlist>

gnome/core/pre-install-config.xml

@@ -53,7 +53,7 @@ ln -v -s gnome-&gnome-version;&gnome-minor-version; /opt/gnome</userinput></scre
 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/pkgconfig
 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/share/pkgconfig
 export GNOME_LIBCONFIG_PATH=/usr/lib:/opt/gnome-&gnome-version;&gnome-minor-version;/lib
-export PYTHONPATH=$PYTHONPATH:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/python&python-majorver;/site-packages</literal></screen>
+export PYTHONPATH=$PYTHONPATH:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/python&python2-majorver;/site-packages</literal></screen>
 
   <para>Add to your <filename>/etc/ld.so.conf</filename>:</para>
 

introduction/welcome/changelog.xml

@@ -41,6 +41,21 @@
 
 -->
 
+    <listitem>
+      <para>October 31st, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Updated to cmake-2.8.6.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Updated to curl-7.22.0.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Updated to libarchive-2.8.5.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>October 30th, 2011</para>
       <itemizedlist>

server/databases/mysql.xml

@@ -41,7 +41,7 @@
     existing BLFS instructions. Note that versions other than the one shown
     in the download URLs have not been tested in a BLFS environment.</para>
 
-    <para>&lfssvn_checked;20101029&lfssvn_checked2;</para>
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -104,8 +104,7 @@
     and group is strongly encouraged:</para>
 
 <screen role="root"><userinput>groupadd -g 40 mysql &amp;&amp;
-useradd -c "MySQL Server" -d /dev/null -g mysql -s /bin/false \
+useradd -c "MySQL Server" -d /dev/null -g mysql -s /bin/false -u 40 mysql</userinput></screen>
-        -u 40 mysql</userinput></screen>
 
     <note><para>There are a great many options available to
     <userinput>./configure</userinput>.  Check the output of the
@@ -117,20 +116,20 @@ useradd -c "MySQL Server" -d /dev/null -g mysql -s /bin/false \
 
 <screen><userinput>patch -Np1 -i ../mysql-&mysql-version;-makefile-1.patch &amp;&amp;
 CFLAGS="-O3" \
-CXX=gcc \
+CXX=gcc      \
 CXXFLAGS="-O3 -felide-constructors -fno-exceptions -fno-rtti" \
-./configure --prefix=/usr \
+./configure --prefix=/usr                  \
-            --sysconfdir=/etc \
+            --sysconfdir=/etc              \
-            --libexecdir=/usr/sbin \
+            --libexecdir=/usr/sbin         \
-            --localstatedir=/srv/mysql \
+            --localstatedir=/srv/mysql     \
-            --enable-thread-safe-client \
+            --enable-thread-safe-client    \
-            --enable-assembler \
+            --enable-assembler             \
-            --enable-local-infile \
+            --enable-local-infile          \
             --with-unix-socket-path=/var/run/mysql/mysql.sock \
-            --without-debug \
+            --without-debug                \
-            --without-readline \
+            --without-readline             \
             --with-plugins=innobase,myisam \
-            --with-extra-charsets=all \
+            --with-extra-charsets=all      \
             --with-ssl=/usr &amp;&amp;
 make</userinput></screen>