From abf26df86792e3c300c934f11bf009ab81906320 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Mon, 30 Aug 2021 17:33:20 -0500
Subject: [PATCH] Update to ntfs-3g-2021.8.22 (security update) as well as
 reverify affected packages (gparted/udisks)

---
 introduction/welcome/changelog.xml |  4 ++++
 packages.ent                       |  2 +-
 postlfs/filesystems/ntfs-3g.xml    | 15 +++++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index f80a6e5884..d5016c191c 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>August 30th, 2021</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to ntfs-3g-2021.8.22 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;15483">#14583</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Fix a regression in Samba's default configuration.
           Fixes <ulink url="&blfs-ticket-root;15474">#15474</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 74a7099b2e..7afca2cba2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -46,7 +46,7 @@
 <!ENTITY jfsutils-version             "1.1.15">
 <!ENTITY lvm2-version                 "2.03.13">
 <!ENTITY mdadm-version                "4.1">
-<!ENTITY ntfs-3g-version              "2017.3.23">
+<!ENTITY ntfs-3g-version              "2021.8.22">
 <!ENTITY gptfdisk-version             "1.0.8">
 <!ENTITY parted-version               "3.4">
 <!ENTITY reiser-version               "3.6.27">
diff --git a/postlfs/filesystems/ntfs-3g.xml b/postlfs/filesystems/ntfs-3g.xml
index 66c7cd8c83..817da00fdc 100644
--- a/postlfs/filesystems/ntfs-3g.xml
+++ b/postlfs/filesystems/ntfs-3g.xml
@@ -7,9 +7,9 @@
   <!ENTITY ntfs-3g-download-http
            "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-&ntfs-3g-version;.tgz">
   <!ENTITY ntfs-3g-download-ftp  " ">
-  <!ENTITY ntfs-3g-md5sum        "d97474ae1954f772c6d2fa386a6f462c">
-  <!ENTITY ntfs-3g-size          "1.2 MB">
-  <!ENTITY ntfs-3g-buildsize     "20 MB">
+  <!ENTITY ntfs-3g-md5sum        "90da343e78877d388eb34cefae6799ae">
+  <!ENTITY ntfs-3g-size          "1.3 MB">
+  <!ENTITY ntfs-3g-buildsize     "22 MB">
   <!ENTITY ntfs-3g-time          "0.2 SBU">
 ]>
 
@@ -107,12 +107,14 @@
   <sect2 role="installation">
     <title>Installation of Ntfs-3g</title>
 
+<!--
     <para>
       First, adapt <application>Ntfs-3g</application> to the merged-/usr
       changes:
     </para>
 
 <screen><userinput remap="pre">sed -i 's|/sbin|$(rootsbindir)|' {ntfsprogs,src}/Makefile.in</userinput></screen>
+-->
 
     <para>
       Install <application>Ntfs-3g</application> by running the following
@@ -226,8 +228,7 @@ ln -sv ntfs-3g.8 /usr/share/man/man8/mount.ntfs.8</userinput></screen>
         <seg>
           lowntfs-3g, mkfs.ntfs, mkntfs, mount.lowntfs-3g,
           mount.ntfs, mount.ntfs-3g, ntfs-3g, ntfs-3g.probe,
-          ntfs-3g.secaudit, ntfs-3g.usermap, ntfscat,
-          ntfsclone, ntfscluster, ntfscmp, ntfscp, ntfsfix,
+          ntfscat, ntfsclone, ntfscluster, ntfscmp, ntfscp, ntfsfix,
           ntfsinfo, ntfslabel, ntfsls, ntfsresize and
           ntfsundelete
         </seg>
@@ -349,6 +350,7 @@ ln -sv ntfs-3g.8 /usr/share/man/man8/mount.ntfs.8</userinput></screen>
         </listitem>
       </varlistentry>
 
+<!-- Not present in 2021.8.22
       <varlistentry id="ntfs-3g.secaudit">
         <term><command>ntfs-3g.secaudit</command></term>
         <listitem>
@@ -374,6 +376,7 @@ ln -sv ntfs-3g.8 /usr/share/man/man8/mount.ntfs.8</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
+-->
 
       <varlistentry id="ntfscluster">
         <term><command>ntfscluster</command></term>
@@ -451,7 +454,7 @@ ln -sv ntfs-3g.8 /usr/share/man/man8/mount.ntfs.8</userinput></screen>
         <term><command>ntfscmp</command></term>
         <listitem>
           <para>
-            compares two NTFS filesystems and tells the differences
+            compares two NTFS filesystems and shows the differences
           </para>
           <indexterm zone="ntfs-3g ntfscmp">
             <primary sortas="b-ntfscmp">ntfscmp</primary>