From 6f8ecea6809756b5ac14cd31734b3ee830415bf1 Mon Sep 17 00:00:00 2001
From: Dan Nichilson <dnicholson@linuxfromscratch.org>
Date: Thu, 2 Aug 2007 21:49:44 +0000
Subject: [PATCH] Updated to ncftp-3.2.1

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7006 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 basicnet/netprogs/ncftp.xml        | 52 +++++++++++++-----------------
 general.ent                        |  2 +-
 introduction/welcome/changelog.xml |  3 ++
 3 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/basicnet/netprogs/ncftp.xml b/basicnet/netprogs/ncftp.xml
index b1a2485e56..bfa364c772 100644
--- a/basicnet/netprogs/ncftp.xml
+++ b/basicnet/netprogs/ncftp.xml
@@ -4,25 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
   <!ENTITY ncftp-download-http "http://gd.tuwien.ac.at/infosys/clients/ftp/ncftp/ncftp-&ncftp-version;-src.tar.bz2">
-  <!-- <!ENTITY ncftp-download-ftp  "ftp://ftp.ncftp.com/ncftp/ncftp-&ncftp-version;-src.tar.bz2"> -->
   <!ENTITY ncftp-download-ftp  "ftp://ftp.ncftp.com/ncftp/ncftp-&ncftp-version;-src.tar.bz2">
-  <!ENTITY ncftp-md5sum        "66cf8dacec848eb11a70632fe9f21807">
-  <!ENTITY ncftp-size          "401 KB">
-  <!ENTITY ncftp-buildsize     "9.9 MB">
-  <!ENTITY ncftp-time          "0.3 SBU">
+  <!ENTITY ncftp-md5sum        "d82cdfe0d5448172c03b434607414fb8">
+  <!ENTITY ncftp-size          "409 KB">
+  <!ENTITY ncftp-buildsize     "9.8 MB">
+  <!ENTITY ncftp-time          "0.2 SBU">
 ]>
 
 <sect1 id="ncftp" xreflabel="NcFTP-&ncftp-version;">
@@ -93,19 +80,15 @@
     first (and optimal) method, run the following commands:</para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
-make -C libncftp shared</userinput></screen>
+make -C libncftp shared &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role='root'><userinput>make -C libncftp soinstall</userinput></screen>
-
-    <para>Again, as an unprivileged user:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Again, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install</userinput></screen>
+<screen role='root'><userinput>make -C libncftp soinstall &amp;&amp;
+make install</userinput></screen>
 
     <para>To install <application>NcFTP</application> using the
     second method (with the <filename class="libraryfile">libncftp</filename>
@@ -114,6 +97,8 @@ make -C libncftp shared</userinput></screen>
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
+    <para>This package does not come with a test suite.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role='root'><userinput>make install</userinput></screen>
@@ -136,13 +121,19 @@ make</userinput></screen>
     <sect3 id="ncftp-config">
       <title>Config Files</title>
 
-      <para><filename>~/.ncftp/*</filename>; especially
+      <para><filename>/etc/ncftp.*</filename> and
+      <filename>~/.ncftp/*</filename>; especially
+      <filename>/etc/ncftp.prefs_v3</filename> and
       <filename>~/.ncftp/prefs_v3</filename></para>
 
       <indexterm zone="ncftp ncftp-config">
         <primary sortas="e-AA.ncftp/*">~/.ncftp/*</primary>
       </indexterm>
 
+      <indexterm zone="ncftp ncftp-config">
+        <primary sortas="e-etc-ncftp.*">/etc/ncftp.*</primary>
+      </indexterm>
+
     </sect3>
 
     <sect3>
@@ -158,8 +149,9 @@ make</userinput></screen>
       <para>This disables the splash screen advertising the
       <application>NcFTPd</application> server.</para>
 
-      <para>There are other options in the <filename>prefs_v3</filename> file. Most
-      of these are self-explanatory.</para>
+      <para>There are other options in the <filename>prefs_v3</filename> file.
+      Most of these are self-explanatory. Global defaults can be set in
+      <filename>/etc/ncftp.prefs_v3</filename>.</para>
 
     </sect3>
 
diff --git a/general.ent b/general.ent
index 7040aaef93..44c4b5b561 100644
--- a/general.ent
+++ b/general.ent
@@ -321,7 +321,7 @@ $Date$
 <!-- Chapter 18 -->
 <!ENTITY cvs-version                  "1.11.22">
 <!ENTITY inetutils-version            "1.5">
-<!ENTITY ncftp-version                "3.1.9">
+<!ENTITY ncftp-version                "3.2.1">
 <!-- <!ENTITY ncpfs-version                "2.2.4"> -->
 <!ENTITY net-tools-version            "1.60">
 <!ENTITY wireless-tools-version       "28">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 902ce99806..1252818b29 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <para>August 2nd, 2007</para>
       <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Updated to NcFTP-3.2.1.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated to gedit-2.18.2.</para>
         </listitem>