From f33f9a2d37c0cf62821e34b8976f573920b9125d Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Thu, 2 Jul 2020 21:11:23 +0000
Subject: [PATCH] mercurial-5.4.2 wireshark-3.2.5

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23357 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/prog/mercurial.xml         | 6 +++---
 introduction/welcome/changelog.xml | 8 ++++++++
 networking/netutils/wireshark.xml  | 6 +++---
 packages.ent                       | 4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/general/prog/mercurial.xml b/general/prog/mercurial.xml
index 2a91020b04..985ddcc8b4 100644
--- a/general/prog/mercurial.xml
+++ b/general/prog/mercurial.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
   <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "b2ffa0bab0836d6d7dfac24419d2aa7c">
+  <!ENTITY mercurial-md5sum        "c8cd94895b75abc862e8dc35228086b8">
   <!ENTITY mercurial-size          "7.4 MB">
-  <!ENTITY mercurial-buildsize     "79 MB (with docs, add 1.1 GB for tests)">
-  <!ENTITY mercurial-time          "0.4 SBU (with docs, add 10 SBU for tests using -j4)">
+  <!ENTITY mercurial-buildsize     "110 MB (with docs, add 1.1 GB for tests)">
+  <!ENTITY mercurial-time          "0.4 SBU (with docs, add 16 SBU for tests using -j4)">
 ]>
 
 <sect1 id="mercurial" xreflabel="Mercurial-&mercurial-version;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 08909f9838..6eea5f8add 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,14 @@
     <listitem>
       <para>July 2nd, 2020</para>
       <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to wireshark-3.2.5. Fixes
+          <ulink url="&blfs-ticket-root;13750">#13750</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to mercurial-5.4.2. Fixes
+          <ulink url="&blfs-ticket-root;13749">#13749</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to samba-4.12.5 (Security Update). Fixes
           <ulink url="&blfs-ticket-root;13751">#13751</ulink>.</para>
diff --git a/networking/netutils/wireshark.xml b/networking/netutils/wireshark.xml
index ff398c1b81..c28d500296 100644
--- a/networking/netutils/wireshark.xml
+++ b/networking/netutils/wireshark.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY wireshark-download-http "https://www.wireshark.org/download/src/all-versions/wireshark-&wireshark-version;.tar.xz">
   <!ENTITY wireshark-download-ftp  " ">
-  <!ENTITY wireshark-md5sum        "4bbee1bdd5b88343733590fabfffddf3">
+  <!ENTITY wireshark-md5sum        "56d7c971d6d8f03175183cc411653e6c">
   <!ENTITY wireshark-size          "30 MB">
-  <!ENTITY wireshark-buildsize     "672 MB (with all optional dependencies available in the BLFS book)">
-  <!ENTITY wireshark-time          "2.6 SBU (with parallelism=4 and all optional dependencies available in the BLFS book)">
+  <!ENTITY wireshark-buildsize     "718 MB (with all optional dependencies available in the BLFS book)">
+  <!ENTITY wireshark-time          "2.4 SBU (with parallelism=4 and all optional dependencies available in the BLFS book)">
 ]>
 
 <sect1 id="wireshark" xreflabel="Wireshark-&wireshark-version;">
diff --git a/packages.ent b/packages.ent
index 550adadf2e..731f48d8e2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -339,7 +339,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY llvm-version                 "&llvm-majmin-version;.&llvm-point-version;">
 <!ENTITY lua-version                  "5.4.0">
 <!ENTITY lua52-version                "5.2.4">
-<!ENTITY mercurial-version            "5.4.1">
+<!ENTITY mercurial-version            "5.4.2">
 <!ENTITY nasm-version                 "2.15.01">
 <!ENTITY ninja-version                "1.9.0">
 <!ENTITY npapi-sdk-version            "0.27.2">
@@ -597,7 +597,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY traceroute-version           "2.1.0">
 <!ENTITY whois-version                "5.4.3">
 <!ENTITY wicd-version                 "1.7.4">
-<!ENTITY wireshark-version            "3.2.4">  <!-- even minor versions only -->
+<!ENTITY wireshark-version            "3.2.5">  <!-- even minor versions only -->
 
 <!ENTITY wicd-major-version           "1.7">