From f9f0406c22a3eaa4edc1bd80faf0e54ee86f8b89 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 25 Mar 2018 20:47:21 +0000
Subject: [PATCH] Update to links-2.15. Update to pygobject-3.28.1. (python
 module). Update to lxml-4.2.1 (python module). Update to gtk-doc-1.28. Update
 to cmake-3.10.3.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20001 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 ++--
 general/genutils/gtk-doc.xml       |  4 ++--
 general/prog/cmake.xml             |  6 +++---
 general/prog/lxml.xml              |  4 ++--
 general/prog/ojdk-conf.xml         |  2 +-
 general/prog/pygobject3.xml        |  2 +-
 introduction/welcome/changelog.xml | 26 ++++++++++++++++++++++++++
 networking/textweb/links.xml       |  8 ++++----
 packages.ent                       | 10 +++++-----
 9 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/general.ent b/general.ent
index 10c29d7902..caca3a46cf 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "24">                   <!-- Always 2 digits -->
+<!ENTITY day          "25">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 24th, &year;">
+<!ENTITY releasedate  "March 25th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->
diff --git a/general/genutils/gtk-doc.xml b/general/genutils/gtk-doc.xml
index 8e00aaaabf..022c57ec9d 100644
--- a/general/genutils/gtk-doc.xml
+++ b/general/genutils/gtk-doc.xml
@@ -6,8 +6,8 @@
 
   <!ENTITY gtk-doc-download-http "&gnome-download-http;/gtk-doc/&gtk-doc-version;/gtk-doc-&gtk-doc-version;.tar.xz">
   <!ENTITY gtk-doc-download-ftp  "&gnome-download-ftp;/gtk-doc/&gtk-doc-version;/gtk-doc-&gtk-doc-version;.tar.xz">
-  <!ENTITY gtk-doc-md5sum        "b29949e0964762e474b706ce22171602">
-  <!ENTITY gtk-doc-size          "704 KB">
+  <!ENTITY gtk-doc-md5sum        "48550c33f9b9b530f9e5f397979b613a">
+  <!ENTITY gtk-doc-size          "712 KB">
   <!ENTITY gtk-doc-buildsize     "14 MB (with tests)">
   <!ENTITY gtk-doc-time          "0.2 SBU (with tests)">
 ]>
diff --git a/general/prog/cmake.xml b/general/prog/cmake.xml
index eb50711eb2..34077b9ce0 100644
--- a/general/prog/cmake.xml
+++ b/general/prog/cmake.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY cmake-download-http "https://cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "732808e17fc14dc8cee50d51518c34eb">
+  <!ENTITY cmake-md5sum        "1c38c67295ca696aeafd8c059d748b38">
   <!ENTITY cmake-size          "7.5 MB">
-  <!ENTITY cmake-buildsize     "332 MB (add 380 MB for tests)">
-  <!ENTITY cmake-time          "2.1 SBU (add 3.0 SBU for tests, both using parallelism=4)">
+  <!ENTITY cmake-buildsize     "334 MB (add 411 MB for tests)">
+  <!ENTITY cmake-time          "2.1 SBU (add 5.2 SBU for tests, both using parallelism=4)">
 ]>
 
 <sect1 id="cmake" xreflabel="CMake-&cmake-version;">
diff --git a/general/prog/lxml.xml b/general/prog/lxml.xml
index 6615c4ea46..f775ed2ac9 100644
--- a/general/prog/lxml.xml
+++ b/general/prog/lxml.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY lxml-download-http "&pymodules-dl;/l/lxml/lxml-&lxml-version;.tar.gz">
   <!ENTITY lxml-download-ftp  " ">
-  <!ENTITY lxml-md5sum        "04455d43fd587bd11ccef6315258c3ce">
+  <!ENTITY lxml-md5sum        "c266d9062e23b08f66426979a2b36f51">
   <!ENTITY lxml-size          "4.1 MB">
   <!ENTITY lxml-buildsize     "131 MB (add 30 MB for the testsuite)">
-  <!ENTITY lxml-time          "1.4 SBU (add 2.8 SBU for the testsuite)">
+  <!ENTITY lxml-time          "1.4 SBU (add 1.4 SBU for the testsuite)">
 ]>
 
   <!-- Begin lxml -->
diff --git a/general/prog/ojdk-conf.xml b/general/prog/ojdk-conf.xml
index 0e920fa92c..a20b4e760c 100644
--- a/general/prog/ojdk-conf.xml
+++ b/general/prog/ojdk-conf.xml
@@ -74,7 +74,7 @@ MANDB_MAP             /opt/jdk/man     /var/cache/man/jdk
 # End Java addition</literal>
 EOF
 
-mkdir -p /var/cache/man
+mkdir -p /var/cache/man &amp;&amp;
 mandb -c /opt/jdk/man</userinput></screen>
 
   </sect2>
diff --git a/general/prog/pygobject3.xml b/general/prog/pygobject3.xml
index 36318e967d..89b051a269 100644
--- a/general/prog/pygobject3.xml
+++ b/general/prog/pygobject3.xml
@@ -8,7 +8,7 @@
            "&gnome-download-http;/pygobject/&gnome-minor-28;/pygobject-&pygobject3-version;.tar.xz">
   <!ENTITY pygobject3-download-ftp
            "&gnome-download-ftp;/pygobject/&gnome-minor-28;/pygobject-&pygobject3-version;.tar.xz">
-  <!ENTITY pygobject3-md5sum        "b29d69edb63ae1f555afeb19f90b9996">
+  <!ENTITY pygobject3-md5sum        "612e9e2863d117d810e78672f7bc3ad6">
   <!ENTITY pygobject3-size          "980 KB">
   <!ENTITY pygobject3-buildsize     "22 MB (both modules, with tests)">
   <!ENTITY pygobject3-time          "0.4 SBU (both modules, with tests)">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index fca3dd4b8a..babbc706a6 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,32 @@
       </itemizedlist>
     </listitem>
 -->
+   <listitem>
+      <para>March 25th, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to links-2.15. Fixes
+          <ulink url="&blfs-ticket-root;10580">#10580</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pygobject-3.28.1. Fixes
+          <ulink url="&blfs-ticket-root;10579">#10579</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to lxml-4.2.1 (python module). Fixes
+          <ulink url="&blfs-ticket-root;10578">#10578</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gtk-doc-1.28. Fixes
+          <ulink url="&blfs-ticket-root;10577">#10577</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cmake-3.10.3. Fixes
+          <ulink url="&blfs-ticket-root;10550">#10550</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
    <listitem>
       <para>March 24th, 2018</para>
       <itemizedlist>
diff --git a/networking/textweb/links.xml b/networking/textweb/links.xml
index a28c91dca9..2822665f6e 100644
--- a/networking/textweb/links.xml
+++ b/networking/textweb/links.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY links-download-http "http://links.twibright.com/download/links-&links-version;.tar.bz2">
   <!ENTITY links-download-ftp  " ">
-  <!ENTITY links-md5sum        "0d11b388de22ba280008a36a409a34c6">
-  <!ENTITY links-size          "6.2 MB">
-  <!ENTITY links-buildsize     "48 MB (with --enable-graphics)">
-  <!ENTITY links-time          "0.3 SBU (with --enable-graphics)">
+  <!ENTITY links-md5sum        "8f9e46a2bb093e7e1fd96f045b6b4c19">
+  <!ENTITY links-size          "6.4 MB">
+  <!ENTITY links-buildsize     "46 MB (with --enable-graphics)">
+  <!ENTITY links-time          "0.4 SBU (with --enable-graphics)">
 ]>
 
 <sect1 id="Links" xreflabel="Links-&links-version;">
diff --git a/packages.ent b/packages.ent
index 251db37be0..b42ad0bed7 100644
--- a/packages.ent
+++ b/packages.ent
@@ -232,7 +232,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY desktop-file-utils-version   "0.23">
 <!ENTITY gperf-version                "3.0.4">
 <!ENTITY graphviz-version             "2.40.1">   <!-- Even minors only -->
-<!ENTITY gtk-doc-version              "1.27">
+<!ENTITY gtk-doc-version              "1.28">
 <!ENTITY gtkhtml-version              "4.10.0">
 <!ENTITY hd2u-version                 "1.0.4">
 <!ENTITY hicolor-icon-theme-version   "0.17">
@@ -304,7 +304,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY check-version                "0.12.0">
 <!ENTITY clisp-version                "2.49">
 <!ENTITY cmake-major-version          "3.10">
-<!ENTITY cmake-minor-version          "2">
+<!ENTITY cmake-minor-version          "3">
 <!ENTITY cmake-version                "&cmake-major-version;.&cmake-minor-version;">
 <!--<!ENTITY cvs-version                  "1.11.23">-->
 <!ENTITY dejagnu-version              "1.6.1">
@@ -409,7 +409,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY funcsigs-version             "1.0.2">
 <!ENTITY Jinja2-version               "2.10">
 <!-- libxml2 for Python2 shares the version of libxml2 -->
-<!ENTITY lxml-version                 "4.2.0">
+<!ENTITY lxml-version                 "4.2.1">
 <!ENTITY mako-version                 "1.0.4">
 <!ENTITY MarkupSafe-version           "1.0">
 <!ENTITY pyatspi2-version             "2.26.0">
@@ -417,7 +417,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY pycairo-version              "1.16.3">
 <!ENTITY pycrypto-version             "2.6.1">
 <!ENTITY pygobject2-version           "2.28.7">
-<!ENTITY pygobject3-version           "3.28.0">
+<!ENTITY pygobject3-version           "3.28.1">
 <!ENTITY pygtk-version                "2.24.0">
 <!ENTITY pyxdg-version                "0.25">
 <!ENTITY PyYAML-version               "3.12">
@@ -481,7 +481,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY uhttpmock-version            "0.5.1">
 
 <!-- Chapter 18 -->
-<!ENTITY links-version                "2.14">
+<!ENTITY links-version                "2.15">
 <!ENTITY lynx-version                 "2.8.8rel.2">
 <!ENTITY w3m-version                  "0.5.3">