From 64fc86437139727c0f0312dfeba3c2bef675fe1b Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Sun, 8 Oct 2017 03:55:40 +0000
Subject: [PATCH] Update to samba-4.7.0. Fixes #9809.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19305 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  4 ++++
 networking/netprogs/samba.xml      | 27 ++++++---------------------
 packages.ent                       |  2 +-
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 4f8cb80bc7..cf0b6b5d59 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>October 8th, 2017</para>
       <itemizedlist>
+        <listitem>
+          <para>[dj] - Update to samba-4.7.0. Fixes
+          <ulink url="&blfs-ticket-root;9809">#9809</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[dj] - Use upstream tarball for systemd with meson build.</para>
         </listitem>
diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml
index 079cfa28eb..a33f0b1163 100644
--- a/networking/netprogs/samba.xml
+++ b/networking/netprogs/samba.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY samba-download-http "https://www.samba.org/ftp/samba/stable/samba-&samba-version;.tar.gz">
   <!ENTITY samba-download-ftp  " ">
-  <!ENTITY samba-md5sum        "c6ee5c766016d59908c8fb672fbbd445">
-  <!ENTITY samba-size          "21 MB">
-  <!ENTITY samba-buildsize     "566 MB (add 371 MB for quicktest, add up to 1.6 GB additional for developer tests)">
-  <!ENTITY samba-time          "8.5 SBU (add 4.2 SBU for quicktest, and up to 280 SBU to run developer tests)">
+  <!ENTITY samba-md5sum        "cf5eaf34f510e3d5643c0dcfd49fcc40">
+  <!ENTITY samba-size          "17 MB">
+  <!ENTITY samba-buildsize     "535 MB (add 14 MB for quicktest)">
+  <!ENTITY samba-time          "8.1 SBU (add 0.4 SBU for quicktest)">
 ]>
 
 <sect1 id="samba" xreflabel="Samba-&samba-version;">
@@ -175,21 +175,6 @@ make</userinput></screen>
     --enable-selftest                  &amp;&amp;
 make</userinput></screen>
 
-<!--
-    <para>According to <application>Samba</application> developers, the
-    limitation to 108 characters of the path length of a unix named pipe socket
-    may be the cause of errors, so that over 1/3 of the tests might fail. For
-    this reason, the switch <option>- -with-selftest-prefix=/tmp/quick</option>
-    (or another path with small number of characters) can be used with
-    configure. Even so, the
-    <quote><replaceable>samba3.raw.eas</replaceable></quote> test may fail,
-    apparently for the same reason. If one quicktest fails, it can be disabled.
-    For example, <quote><replaceable>samba3.raw.eas</replaceable></quote> may
-    be disabled with the following command:</para>
-
-<screen><userinput>sed -i "/samba3.blackbox.failure.failure/i \^samba3.raw.eas" selftest/knownfail</userinput></screen>
--->
-
     <para>To test the results, as the
     <systemitem class="username">root</systemitem> user, issue:
     <command>make quicktest</command>. The test suite will produce lines that
@@ -202,8 +187,8 @@ make</userinput></screen>
       <para>Additionally, developer test suites are available. If you've
       installed the optional python modules above, you can run these tests with
       <command>make test</command>. It is not recommended for the average
-      builder at nearly 100 SBU, and you should expect ~80 errors and ~30
-      failures from the 3000+ tests.</para>
+      builder at nearly 100 SBU and over a gigabyte of disk space, and you
+      should expect ~80 errors and ~30 failures from the 3000+ tests.</para>
     </note>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
diff --git a/packages.ent b/packages.ent
index 73f6d00d14..57beff05f6 100644
--- a/packages.ent
+++ b/packages.ent
@@ -425,7 +425,7 @@
 <!ENTITY ntp-version                  "4.2.8p10">
 <!ENTITY rpcbind-version              "0.2.4">
 <!ENTITY rsync-version                "3.1.2">
-<!ENTITY samba-version                "4.6.7">
+<!ENTITY samba-version                "4.7.0">
 <!ENTITY wget-version                 "1.19.1">
 <!ENTITY wireless-tools-version       "29">
 <!ENTITY wpa_supplicant-version       "2.6">