[Emacs-diffs] /srv/bzr/emacs/trunk r106288: Increase required GnuTLS version (bug#9929)

[Glenn Morris]

------------------------------------------------------------
revno: 106288
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-11-04 18:16:46 -0400
message:
  Increase required GnuTLS version (bug#9929)
  
  * configure.in: Increase minimum GnuTLS version to 2.6.6.
  Do not include GnuTLS version info in final summary message.
  
  * etc/NEWS: Add FIXME related to GnuTLS version.
modified:
  ChangeLog
  configure.in
  etc/NEWS

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-10-31 17:49:10 +0000
+++ b/ChangeLog 2011-11-04 22:16:46 +0000
@@ -1,3 +1,8 @@
+2011-11-04  Glenn Morris  <address@hidden>
+
+       * configure.in: Increase minimum GnuTLS version to 2.6.6. (Bug#9929)
+       Do not include GnuTLS version info in final summary message.
+
 2011-10-31  Eli Zaretskii  <address@hidden>
 
        * config.bat: Use config.in and Makefile.in from src/ and lib/, if

=== modified file 'configure.in'
--- a/configure.in      2011-10-31 02:25:01 +0000
+++ b/configure.in      2011-11-04 22:16:46 +0000
@@ -2063,7 +2063,7 @@
 HAVE_GNUTLS=no
 HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=no
 if test "${with_gnutls}" = "yes" ; then
-  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.0], HAVE_GNUTLS=yes, 
HAVE_GNUTLS=no)
+  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6], HAVE_GNUTLS=yes, 
HAVE_GNUTLS=no)
   if test "${HAVE_GNUTLS}" = "yes"; then
     AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.])
   fi
@@ -3720,7 +3720,7 @@
 echo "  Does Emacs use -lgconf?                                 ${HAVE_GCONF}"
 echo "  Does Emacs use GSettings?                               
${HAVE_GSETTINGS}"
 echo "  Does Emacs use -lselinux?                               
${HAVE_LIBSELINUX}"
-echo "  Does Emacs use -lgnutls (2.6.x or higher)?              ${HAVE_GNUTLS}"
+echo "  Does Emacs use -lgnutls?                                ${HAVE_GNUTLS}"
 echo "  Does Emacs use -lxml2?                                  
${HAVE_LIBXML2}"
 
 echo "  Does Emacs use -lfreetype?                              
${HAVE_FREETYPE}"

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2011-10-30 01:56:03 +0000
+++ b/etc/NEWS  2011-11-04 22:16:46 +0000
@@ -1294,6 +1294,8 @@
 STARTTLS opportunistically or use plain SSL, depending on your needs.
 
 Only versions 2.8.x and higher or GnuTLS have been tested.
+[FIXME: this statement needs clarifying, given that GnuTLS >= 2.6.6
+is the test used by configure.]
 
 *** gnutls-log-level
 Set `gnutls-log-level' higher than 0 to get debug output.  1 is for