* configure.ac: Define FTPS flag if we're using curl, and FTPS is

available.

* README: Fix some typos (noted by Norihiko Murase), update to 1.4.1,
and tweak some descriptions.

* NEWS: Note FTPS.

4 files changed, 45 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index 6dc781640..93e31885a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-01-22  David Shaw  <[email protected]>
+
+	* configure.ac: Define FTPS flag if we're using curl, and FTPS is
+	available.
+
+	* README: Fix some typos (noted by Norihiko Murase), update to
+	1.4.1, and tweak some descriptions.
+
+	* NEWS: Note FTPS.
+
 2005-01-18  Werner Koch  <[email protected]>
 
 	* configure.ac (HAVE_W32_SYSTEM): Define it.
diff --git a/NEWS b/NEWS
index eb6ae7340..5344261af 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 Noteworthy changes in version 1.4.1
--------------------------------------------------
+------------------------------------------------
 
     * New --rfc2440-text option which controls how text is handled in
       signatures.  This is in response to some problems seen with
@@ -12,11 +12,12 @@ Noteworthy changes in version 1.4.1
       default, and cause GnuPG to not import or export key signatures
       that are not usable (e.g. expired signatures).
 
-    * New experimental HTTP, HTTPS, and FTP keyserver helper that uses
-      the cURL library (http://curl.haxx.se) to retrieve keys.  This
-      is disabled by default, but may be enabled with the configure
-      option --with-libcurl.  Without this option, the existing HTTP
-      code is used for HTTP, and HTTPS and FTP are not supported.
+    * New experimental HTTP, HTTPS, FTP, and FTPS keyserver helper
+      that uses the cURL library <http://curl.haxx.se> to retrieve
+      keys.  This is disabled by default, but may be enabled with the
+      configure option --with-libcurl.  Without this option, the
+      existing HTTP code is used for HTTP, and HTTPS, FTP, and FTPS
+      are not supported.
 
     * When running a --card-status or --card-edit and a public key is
       available, missing secret key stubs will be created on the fly.
@@ -42,7 +43,7 @@ Noteworthy changes in version 1.4.1
 
 
 Noteworthy changes in version 1.4.0 (2004-12-16)
--------------------------------------------------
+------------------------------------------------
 
     * See the file doc/highlights-1.4.txt for an overview of all
       changes in respect to the 1.2 series.
@@ -1729,8 +1730,8 @@ Noteworthy changes in version 0.2.3
       is generated on a system without a good random number generator.
 
 
-Copyright 1998, 1999, 2000, 2001, 2002, 2003,
-          2004  Free Software Foundation, Inc.
+Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+          2005 Free Software Foundation, Inc.
 
 This file is free software; as a special exception the author gives
 unlimited permission to copy and/or distribute it, with or without
diff --git a/README b/README
index 0e17792da..4798caf1f 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
 
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
-			    Version 1.4.0
+			    Version 1.4.1
 
-	    Copyright 1998, 1999, 2000, 2001, 2002, 2003,
-		 2004 Free Software Foundation, Inc.
+	 Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+		 2005 Free Software Foundation, Inc.
 
     This file is free software; as a special exception the author
     gives unlimited permission to copy and/or distribute it, with or
@@ -488,9 +488,9 @@
                      GnuPG home directory which is "~/.gnupg" by default.
  
      --without-readline
-                     Do not include support for the readline libary
+                     Do not include support for the readline library
                      even if it is available.  The default is to check
-                     whether the readline libarry is a availbale and
+                     whether the readline library is a available and
                      use it to allow fancy command line editing.
   
      --with-included-zlib
@@ -561,7 +561,7 @@
      --disable-twofish
      --disable-sha256
      --disable-sha512
-		    Removes support for the selected symmetric
+		    Removes support for the selected symmetric or hash
 		    algorithm.  This can give a smaller gpg binary for
 		    places where space is tight.
 
@@ -574,21 +574,22 @@
 		    The public key preference list can be updated to
 		    match the list of available algorithms by using
 		    "gpg --edit-key (thekey)", and running the
-		    "updpref" command.
+		    "setpref" command.
 
      --enable-minimal
-		    Build the smallest gpg possible (disables all
-		    optional algorithms, disables keyserver access,
-		    and disables photo IDs).  Specifically, this means
-		    --disable-rsa --disable-idea, --disable-cast5,
-		    --disable-blowfish, --disable-aes,
-		    --disable-twofish, --disable-sha256,
-		    --disable-sha512, --without-bzip2, and
-		    --disable-exec.  Configure command lines are read
-		    from left to right, so if you want to have an
-		    "almost minimal" configuration, you can do (for
-		    example) "--enable-minimal --enable-rsa" to have
-		    RSA added to the minimal build.
+		    Build the smallest gpg binary possible (disables
+		    all optional algorithms, disables keyserver
+		    access, and disables photo IDs).  Specifically,
+		    this means --disable-rsa --disable-idea,
+		    --disable-cast5, --disable-blowfish,
+		    --disable-aes, --disable-twofish,
+		    --disable-sha256, --disable-sha512,
+		    --without-bzip2, and --disable-exec.  Configure
+		    command lines are read from left to right, so if
+		    you want to have an "almost minimal"
+		    configuration, you can do (for example)
+		    "--enable-minimal --enable-rsa" to have RSA added
+		    to the minimal build.
 
      --enable-key-cache=SIZE
                     Set the internal key and UID cache size.  This has
@@ -614,7 +615,7 @@
                     give different output than with the limited old
                     support.  This option allows to explicity disable
                     the use of iconv.  Note, that iconv is also
-                    disabled if getext has been disabled.
+                    disabled if gettext has been disabled.
 
      --enable-backsigs
                     Enables "backsigs" support.  This is a currently
diff --git a/configure.ac b/configure.ac
index 38c1c45a6..2b3644d15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -669,8 +669,11 @@ fi
 # Are we doing FTP?  We only do FTP if we have libcurl.
 
 if test x"$try_ftp" = xyes && test x$libcurl_protocol_FTP = xyes ; then
-   AC_DEFINE(FTP_VIA_LIBCURL,1,[Define if FTP is handled via libcurl])
    AC_SUBST(GPGKEYS_CURL,"gpgkeys_curl$EXEEXT")
+   AC_DEFINE(FTP_VIA_LIBCURL,1,[Define if FTP is handled via libcurl])
+   if test x$libcurl_protocol_FTPS = xyes ; then
+      AC_DEFINE(FTPS_VIA_LIBCURL,1,[Define if FTPS is handled via libcurl])
+   fi
 fi
 
 dnl This isn't necessarily sendmail itself, but anything that gives a