From 7f9b4efce6be49dbf1fcb083ae23181e791cea48 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 19 Apr 2018 03:53:24 +0000
Subject: [PATCH] Update to cmake-3.11.1. Update to poppler-0.64.0. Update to
 zsh-5.5.1.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20094 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/graphlib/poppler.xml       |  4 ++--
 general/prog/cmake.xml             |  2 +-
 introduction/welcome/changelog.xml | 12 ++++++++++++
 packages.ent                       |  6 +++---
 postlfs/shells/zsh.xml             |  6 +++---
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/general/graphlib/poppler.xml b/general/graphlib/poppler.xml
index 6394d56b48..2e4e85cfef 100644
--- a/general/graphlib/poppler.xml
+++ b/general/graphlib/poppler.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY poppler-download-http "https://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
   <!ENTITY poppler-download-ftp  " ">
-  <!ENTITY poppler-md5sum        "66a54da4896b1408611699feda5c1821">
+  <!ENTITY poppler-md5sum        "f7f687ebb60004f8ad61994575018044">
   <!ENTITY poppler-size          "1.4 MB">
   <!ENTITY poppler-buildsize     "59 MB (with Qt5 library and tests)">
-  <!ENTITY poppler-time          "0.5 SBU (with parallelism=4, Qt5 library, and tests)">
+  <!ENTITY poppler-time          "0.6 SBU (with parallelism=4, Qt5 library, and tests)">
 
   <!ENTITY poppler-data-version       "0.4.8">
 
diff --git a/general/prog/cmake.xml b/general/prog/cmake.xml
index db0a219e33..d5f83e0372 100644
--- a/general/prog/cmake.xml
+++ b/general/prog/cmake.xml
@@ -6,7 +6,7 @@
 
   <!ENTITY cmake-download-http "https://cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "f3ebc79b5dec85b49abe75958ffa1a03">
+  <!ENTITY cmake-md5sum        "12a3177477e4e2c7bc514193d421dafe">
   <!ENTITY cmake-size          "7.6 MB">
   <!ENTITY cmake-buildsize     "390 MB (add 424 MB for tests)">
   <!ENTITY cmake-time          "2.3 SBU (add 3.3 SBU for tests, both using parallelism=4)">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 2890093f50..8ee5ac1632 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,18 @@
    <listitem>
       <para>April 18, 2018</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to cmake-3.11.1. Fixes
+          <ulink url="&blfs-ticket-root;10677">#10677</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to poppler-0.64.0. Fixes
+          <ulink url="&blfs-ticket-root;10676">#10676</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to zsh-5.5.1. Fixes
+          <ulink url="&blfs-ticket-root;10675">#10675</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to polkit-0.114. Archived js38. Fixes
           <ulink url="&blfs-ticket-root;10662">#10662</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index eb1f49d4d7..c7c109c80c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -76,7 +76,7 @@
 <!-- Chapter 7 -->
 <!ENTITY dash-version                 "0.5.9.1">
 <!ENTITY tcsh-version                 "6.20.00">
-<!ENTITY zsh-version                  "5.5">
+<!ENTITY zsh-version                  "5.5.1">
 
 <!-- Chapter 8 Virtualization -->
 <!ENTITY qemu-version                 "2.11.1">
@@ -220,7 +220,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY openjpeg-version             "1.5.2">
 <!ENTITY openjpeg2-version            "2.3.0">
 <!ENTITY pixman-version               "0.34.0">   <!-- Even minors only -->
-<!ENTITY poppler-version              "0.63.0">
+<!ENTITY poppler-version              "0.64.0">
 <!ENTITY potrace-version              "1.15">
 <!ENTITY qpdf-version                 "8.0.2">
 
@@ -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.11">
-<!ENTITY cmake-minor-version          "0">
+<!ENTITY cmake-minor-version          "1">
 <!ENTITY cmake-version                "&cmake-major-version;.&cmake-minor-version;">
 <!--<!ENTITY cvs-version                  "1.11.23">-->
 <!ENTITY dejagnu-version              "1.6.1">
diff --git a/postlfs/shells/zsh.xml b/postlfs/shells/zsh.xml
index 755d53a953..658f38d247 100644
--- a/postlfs/shells/zsh.xml
+++ b/postlfs/shells/zsh.xml
@@ -6,12 +6,12 @@
 
   <!ENTITY zsh-download-http "http://www.zsh.org/pub/zsh-&zsh-version;.tar.gz">
   <!ENTITY zsh-download-ftp  " ">
-  <!ENTITY zsh-md5sum        "2430c85bd128c59f5c0806ef00d3ea8d">
+  <!ENTITY zsh-md5sum        "678bc037a7311a46e7fc0adca7ed8266">
   <!ENTITY zsh-size          "4.4 MB">
   <!ENTITY zsh-buildsize     "45 MB (includes documentation and tests)">
-  <!ENTITY zsh-time          "1.2 SBU (includes documentation and tests)">
+  <!ENTITY zsh-time          "1.2 SBU (Using parallelism=4; includes documentation and tests)">
 
-  <!ENTITY zsh-doc-md5sum    "0adfbb6a4eb3e03f4c23c1cc3f71f1f5">
+  <!ENTITY zsh-doc-md5sum    "ae4741a1c5821ff0cb9910be2b23715e">
   <!ENTITY zsh-doc-size      "3.1 MB">
 ]>