From 461c584c360845f0b19e1847bc46f064b5529f15 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 22 Feb 2018 00:57:23 +0000
Subject: [PATCH] Update to btrfs-progs-v4.15.1

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19842 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/graphlib/libraw.xml         | 13 +++++++------
 introduction/welcome/changelog.xml  |  4 ++++
 packages.ent                        |  2 +-
 postlfs/filesystems/btrfs-progs.xml |  8 ++++----
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/general/graphlib/libraw.xml b/general/graphlib/libraw.xml
index 2669148465..a885325a74 100644
--- a/general/graphlib/libraw.xml
+++ b/general/graphlib/libraw.xml
@@ -99,12 +99,13 @@
     </para>
 
 <screen><userinput>sed -i "s#powf64#dc_&amp;#g" internal/dcraw_common.cpp &amp;&amp;
-./configure --prefix=/usr                           \
-            --enable-jpeg                           \
-            --enable-jasper                         \
-            --enable-lcms                           \
-            --disable-static                        \
-            --docdir=/usr/share/doc/libraw-&libraw-version;  &amp;&amp;
+
+./configure --prefix=/usr    \
+            --enable-jpeg    \
+            --enable-jasper  \
+            --enable-lcms    \
+            --disable-static \
+            --docdir=/usr/share/doc/libraw-&libraw-version; &amp;&amp;
 make</userinput></screen>
 
     <para>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 725be46b2f..dc5b2e64b8 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>February 21st, 2018</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to btrfs-progs-v4.15.1. Fixes
+          <ulink url="&blfs-ticket-root;10388">#10388</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[pierre] - Various fixes for lightdm: allow building
           without itstool and exo, and allow a DE in /opt.</para>
diff --git a/packages.ent b/packages.ent
index 239825f3fc..effec2025b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -47,7 +47,7 @@
 <!ENTITY volume_key-version           "0.3.9">
 
 <!-- Chapter 5 -->
-<!ENTITY btrfs-progs-version          "4.15">
+<!ENTITY btrfs-progs-version          "4.15.1">
 <!ENTITY dosfstools-version           "4.1">
 <!ENTITY fuse3-version                "3.2.1">
 <!ENTITY fuse2-version                "2.9.7">
diff --git a/postlfs/filesystems/btrfs-progs.xml b/postlfs/filesystems/btrfs-progs.xml
index 1e8348766f..308412edeb 100644
--- a/postlfs/filesystems/btrfs-progs.xml
+++ b/postlfs/filesystems/btrfs-progs.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY btrfs-progs-download-http "&kernel-dl;/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz">
   <!ENTITY btrfs-progs-download-ftp  " ">
-  <!ENTITY btrfs-progs-md5sum        "e7dd633a27e8edca98457dc9d3e4912c">
+  <!ENTITY btrfs-progs-md5sum        "94229b39c246797525b7366eff547a4b">
   <!ENTITY btrfs-progs-size          "1.8 MB">
-  <!ENTITY btrfs-progs-buildsize     "46 MB (add 206 MB for tests)">
-  <!ENTITY btrfs-progs-time          "0.3 SBU (add 10 SBU for tests)">
+  <!ENTITY btrfs-progs-buildsize     "46 MB (add 34 MB for tests)">
+  <!ENTITY btrfs-progs-time          "0.3 SBU (add 13 SBU for tests)">
 ]>
 
 <sect1 id="btrfs-progs" xreflabel="btrfs-progs-&btrfs-progs-version;">
@@ -106,7 +106,7 @@
     <para>Install <application>btrfs-progs</application> by running the following
     commands:</para>
 
-<screen><userinput>sed -i '1,100 s/\.gz//g' Documentation/Makefile.in &amp;&amp;
+<screen><userinput>sed -i '40,107 s/\.gz//g' Documentation/Makefile.in &amp;&amp;
 
 ./configure --prefix=/usr  \
             --bindir=/bin  \