From 041db652cc89a1e4ab61f00fceaa09b1ea475873 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Thu, 6 Jul 2017 19:36:33 +0000
Subject: [PATCH] PCRE-8.41 Subversion-1.9.6

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18923 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/pcre.xml            | 8 ++++----
 general/prog/subversion.xml        | 6 +++---
 introduction/welcome/changelog.xml | 8 ++++++++
 packages.ent                       | 4 ++--
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/general/genlib/pcre.xml b/general/genlib/pcre.xml
index 642270fed6..6f8b8fc0a5 100644
--- a/general/genlib/pcre.xml
+++ b/general/genlib/pcre.xml
@@ -7,10 +7,10 @@
   <!ENTITY pcre-download-http " ">
 <!--  <!ENTITY pcre-download-http "&sourceforge-repo;/pcre/pcre-&pcre-version;.tar.bz2">-->
   <!ENTITY pcre-download-ftp  "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-&pcre-version;.tar.bz2">
-  <!ENTITY pcre-md5sum        "41a842bf7dcecd6634219336e2167d1d">
+  <!ENTITY pcre-md5sum        "c160d22723b1670447341b08c58981c1">
   <!ENTITY pcre-size          "1.5 MB">
-  <!ENTITY pcre-buildsize     "19 MB (with tests)">
-  <!ENTITY pcre-time          "0.4 SBU (with tests)">
+  <!ENTITY pcre-buildsize     "24 MB (with tests)">
+  <!ENTITY pcre-time          "0.3 SBU (with tests)">
 ]>
 
 <sect1 id="pcre" xreflabel="PCRE-&pcre-version;">
@@ -179,7 +179,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libpcre.so) /usr/lib/libpcre.so</userinput
 
       <seglistitem>
         <seg>
-          pcregrep, pcretest and pcre-config
+          pcregrep, pcretest, and pcre-config
         </seg>
         <seg>
           libpcre.so, libpcre16.so, libpcre32.so,
diff --git a/general/prog/subversion.xml b/general/prog/subversion.xml
index 95c0449c5d..4d91ddc74a 100644
--- a/general/prog/subversion.xml
+++ b/general/prog/subversion.xml
@@ -7,10 +7,10 @@
   <!ENTITY subversion-download-http
   "http://www.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
   <!ENTITY subversion-download-ftp  " ">
-  <!ENTITY subversion-md5sum        "9fcbae352a5efe73d46a88c97c6bba14">
+  <!ENTITY subversion-md5sum        "f27e00338d4a9f7f9aec9d4a3f8b418b">
   <!ENTITY subversion-size          "7.5 MB">
-  <!ENTITY subversion-buildsize     "177 MB (add 173 MB for bindings, 24 MB for docs, 1 GB for tests)">
-  <!ENTITY subversion-time          "1.3 SBU (add 1.4 SBU for bindings, 24 SBU for tests)">
+  <!ENTITY subversion-buildsize     "171 MB (add 173 MB for bindings, 24 MB for docs, 1 GB for tests)">
+  <!ENTITY subversion-time          "1.2 SBU (add 1.4 SBU for bindings, 72 SBU for tests)">
 ]>
 
 <sect1 id="subversion" xreflabel="Subversion-&subversion-version;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index bfa43b6fd3..bc734eaba7 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,6 +45,14 @@
     <listitem>
       <para>July 6th, 2017</para>
       <itemizedlist>
+       <listitem>
+         <para>[pierre] - Update to subversion-1.9.6. Fixes
+         <ulink url="&blfs-ticket-root;9453">#9453</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[pierre] - Update to pcre-8.41. Fixes
+         <ulink url="&blfs-ticket-root;9448">#9448</ulink>.</para>
+       </listitem>
         <listitem>
           <para>[pierre] - Add Error-0.17024 to perl modules,
           as it is a recommended dependency of git.</para>
diff --git a/packages.ent b/packages.ent
index c06a2042e2..9657e63150 100644
--- a/packages.ent
+++ b/packages.ent
@@ -168,7 +168,7 @@
 <!ENTITY npth-version                 "1.5">
 <!ENTITY nspr-version                 "4.15">
 <!ENTITY openobex-version             "1.7.2">
-<!ENTITY pcre-version                 "8.40">
+<!ENTITY pcre-version                 "8.41">
 <!ENTITY pcre2-version                "10.23">
 <!ENTITY popt-version                 "1.16">
 <!ENTITY pth-version                  "2.0.7">
@@ -326,7 +326,7 @@
 <!ENTITY rust-version                 "1.16.0">
 <!ENTITY scons-version                "2.5.1">
 <!ENTITY slang-version                "2.3.1">
-<!ENTITY subversion-version           "1.9.5">
+<!ENTITY subversion-version           "1.9.6">
 <!ENTITY swig-version                 "3.0.12">
 <!ENTITY tcl-version                  "8.6.6">
 <!ENTITY tk-version                   "8.6.6">