From 15b96a83e6b651234054aad58a46392129dc3e79 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Sun, 5 Feb 2017 21:27:47 +0000
Subject: [PATCH] Add ntfs-3g security patch

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18259 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  4 ++++
 postlfs/filesystems/ntfs-3g.xml    | 19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 888fbeb87b..90377565f8 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,6 +45,10 @@
     <listitem>
       <para>February 5th, 2017</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Add a security patch from upstream to ntfs-3g. Fixes
+          <ulink url="&blfs-ticket-root;8851">#8851</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to shadow-4.4.</para>
         </listitem>
diff --git a/postlfs/filesystems/ntfs-3g.xml b/postlfs/filesystems/ntfs-3g.xml
index f7816f7a53..9dc24d364d 100644
--- a/postlfs/filesystems/ntfs-3g.xml
+++ b/postlfs/filesystems/ntfs-3g.xml
@@ -78,6 +78,16 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/ntfs-3g-&ntfs-3g-version;-security_fix-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Ntfs-3g Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -114,7 +124,8 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static --with-fuse=external &amp;&amp;
+<screen><userinput>patch -Np1 -i ../ntfs-3g-&ntfs-3g-version;-security_fix-1.patch &amp;&amp;
+./configure --prefix=/usr --disable-static --with-fuse=external &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -146,6 +157,12 @@ ln -sv ntfs-3g.8 /usr/share/man/man8/mount.ntfs.8</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
 
+    <para>
+      <command>patch -Np1 -i ...</command>: This command applies a security
+      patch from upstream to fix ntfs-3g on systems that use setuid for the
+      executable.
+    </para>
+
     <para>
       <parameter>--with-fuse=external</parameter>: This switch dynamically
       links <command>lowntfs-3g</command> and <command>ntfs-3g</command> to