From 6ef71d2f2f1e488d2bf2bd7f0d0d9bd423ce78a0 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Thu, 17 Jun 2021 13:20:59 -0500
Subject: [PATCH] A few package updates

Update to nfs-utils-2.5.4
Update to proftpd-1.3.7b
Update to nano-5.8
---
 introduction/welcome/changelog.xml | 18 ++++++++++++++++++
 networking/netprogs/nfs-utils.xml  |  8 ++++----
 packages.ent                       |  6 +++---
 postlfs/editors/nano.xml           |  4 ++--
 server/major/proftpd.xml           |  8 +++++---
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index bb12aaba96..1cd82062bf 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -42,6 +42,24 @@
     </listitem>
     -->
 
+    <listitem>
+      <para>June 17th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to nano-5.8. Fixes
+          <ulink url="&blfs-ticket-root;15186">#15186</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to proftpd-1.3.7b. Fixes
+          <ulink url="&blfs-ticket-root;15185">#15185</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to nfs-utils-2.5.4. Fixes
+          <ulink url="&blfs-ticket-root;15184">#15184</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>June 16th, 2021</para>
       <itemizedlist>
diff --git a/networking/netprogs/nfs-utils.xml b/networking/netprogs/nfs-utils.xml
index 1054a4e1f9..656a0123f3 100644
--- a/networking/netprogs/nfs-utils.xml
+++ b/networking/netprogs/nfs-utils.xml
@@ -7,9 +7,9 @@
   <!ENTITY nfs-utils-root "&kernel-dl;/linux/utils/nfs-utils" >
   <!ENTITY nfs-utils-download-http "&nfs-utils-root;/&nfs-utils-version;/nfs-utils-&nfs-utils-version;.tar.xz">
   <!ENTITY nfs-utils-download-ftp  " ">
-  <!ENTITY nfs-utils-md5sum        "24353242a96549fc697d25dc29a961db">
-  <!ENTITY nfs-utils-size          "684 KB">
-  <!ENTITY nfs-utils-buildsize     "16 MB">
+  <!ENTITY nfs-utils-md5sum        "7e330130ac9677c34bba5ab512036bef">
+  <!ENTITY nfs-utils-size          "688 KB">
+  <!ENTITY nfs-utils-buildsize     "19 MB">
   <!ENTITY nfs-utils-time          "0.2 SBU">
 ]>
 
@@ -199,7 +199,7 @@ useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup \
 
 <screen><userinput>./configure --prefix=/usr          \
             --sysconfdir=/etc      \
-            --sbindir=/sbin        \
+            --sbindir=/usr/sbin    \
             --disable-nfsv4        \
             --disable-gss &amp;&amp;
 make</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 3645007297..1e7151640b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -61,7 +61,7 @@
 <!ENTITY gedit-version                "40.1">
 <!ENTITY joe-version                  "4.6">
 <!ENTITY juffed-version               "0.10.r71.gc3c1a3f">
-<!ENTITY nano-version                 "5.7">
+<!ENTITY nano-version                 "5.8">
 <!ENTITY vim-version                  "8.2.2890">
 <!ENTITY vim-majmin                   "82">
 
@@ -591,7 +591,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY iw-version                   "5.9">
 <!ENTITY ncftp-version                "3.2.6">
 <!ENTITY net-tools-version            "CVS_20101030">
-<!ENTITY nfs-utils-version            "2.5.3">
+<!ENTITY nfs-utils-version            "2.5.4">
 <!ENTITY ntp-version                  "4.2.8p15">
 <!ENTITY rpcbind-version              "1.2.6">
 <!ENTITY rsync-version                "3.2.3">
@@ -656,7 +656,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!-- Part V -->
 <!-- Chapter 20 -->
 <!ENTITY apache-version               "2.4.48">
-<!ENTITY proftpd-version              "1.3.7a">
+<!ENTITY proftpd-version              "1.3.7b">
 <!ENTITY vsftpd-version               "3.0.4">
 
 <!-- Chapter 21 -->
diff --git a/postlfs/editors/nano.xml b/postlfs/editors/nano.xml
index 4186d2cb75..a29879dcf7 100644
--- a/postlfs/editors/nano.xml
+++ b/postlfs/editors/nano.xml
@@ -7,9 +7,9 @@
   <!-- Note minor version in URL -->
   <!ENTITY nano-download-http "https://www.nano-editor.org/dist/v5/nano-&nano-version;.tar.xz">
   <!ENTITY nano-download-ftp  " ">
-  <!ENTITY nano-md5sum        "c2d6540a33248edc31a5830861b4b4ea">
+  <!ENTITY nano-md5sum        "d2249e3dd108c830df00efd7c1b79d86">
   <!ENTITY nano-size          "1.4 MB">
-  <!ENTITY nano-buildsize     "20 MB">
+  <!ENTITY nano-buildsize     "23 MB">
   <!ENTITY nano-time          "0.2 SBU">
 ]>
 
diff --git a/server/major/proftpd.xml b/server/major/proftpd.xml
index c50d9b376f..f7e9a3790f 100644
--- a/server/major/proftpd.xml
+++ b/server/major/proftpd.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY proftpd-download-http " ">
   <!ENTITY proftpd-download-ftp  "ftp://ftp.proftpd.org/distrib/source/proftpd-&proftpd-version;.tar.gz">
-  <!ENTITY proftpd-md5sum        "4a9b8877b2e9b08d70e71ad56c19e2c9">
+  <!ENTITY proftpd-md5sum        "50f9d8abc44b4ef600d884ba9803bfba">
   <!ENTITY proftpd-size          "19 MB">
-  <!ENTITY proftpd-buildsize     "68 MB">
+  <!ENTITY proftpd-buildsize     "76 MB">
   <!ENTITY proftpd-time          "0.3 SBU">
 ]>
 
@@ -318,7 +318,9 @@ EOF</userinput></screen>
           None
         </seg>
         <seg>
-          /usr/{include,lib}/proftpd
+          /usr/{include,lib}/proftpd,
+          /usr/share/doc/proftpd-&proftpd-version;, and
+          /srv/ftp
         </seg>
       </seglistitem>
     </segmentedlist>