[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_9-12-g18e25c1

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=18e25c1586a9681bccfcd5cbbe19fbb8eb0890da

The branch, gnutls_2_12_x has been updated
       via  18e25c1586a9681bccfcd5cbbe19fbb8eb0890da (commit)
       via  97059c48c51da6ab5001117a9cfd132481e88dc9 (commit)
       via  84a1e42a3a0455eaa3753dbf001825336962bc07 (commit)
      from  0e03d097ade12cfb170154b6065bd6c3115606c3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 18e25c1586a9681bccfcd5cbbe19fbb8eb0890da
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Sep 1 10:17:15 2011 +0200

    bumped version

commit 97059c48c51da6ab5001117a9cfd132481e88dc9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Sep 1 10:05:25 2011 +0200

    compiled with newer gaa.

commit 84a1e42a3a0455eaa3753dbf001825336962bc07
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Sep 1 09:54:07 2011 +0200

    explicitly enable openpgp certtype in tests.

-----------------------------------------------------------------------

Summary of changes:
 NEWS                  |    2 +-
 configure.ac          |    2 +-
 lib/configure.ac      |    2 +-
 lib/m4/hooks.m4       |    2 +-
 libextra/configure.ac |    2 +-
 src/crypt-gaa.c       |    2 +-
 tests/openpgpself.c   |    4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 6cc45f0..1591784 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
               2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-* Version 2.12.10 (unreleased)
+* Version 2.12.10 (released 2011-09-01)
 
 ** libgnutls: OpenPGP certificate type is not enabled
 by default.
diff --git a/configure.ac b/configure.ac
index 1e40605..ef9e6cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # USA
 
 AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [2.12.9], address@hidden)
+AC_INIT([GnuTLS], [2.12.10], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/lib/configure.ac b/lib/configure.ac
index 63164ce..920f1d8 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # MA 02110-1301, USA
 
 AC_PREREQ(2.61)
-AC_INIT([libgnutls], [2.12.9], address@hidden)
+AC_INIT([libgnutls], [2.12.10], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index 68bf8c5..9974550 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -27,7 +27,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   # Interfaces added:                             AGE++
   # Interfaces removed:                           AGE=0
   AC_SUBST(LT_CURRENT, 47)
-  AC_SUBST(LT_REVISION, 3)
+  AC_SUBST(LT_REVISION, 4)
   AC_SUBST(LT_AGE, 21)
 
   AC_SUBST(LT_SSL_CURRENT, 27)
diff --git a/libextra/configure.ac b/libextra/configure.ac
index 0ae259d..a3cb4dc 100644
--- a/libextra/configure.ac
+++ b/libextra/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # 02110-1301, USA.
 
 AC_PREREQ(2.61)
-AC_INIT([libgnutls-extra], [2.12.9], address@hidden)
+AC_INIT([libgnutls-extra], [2.12.10], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/src/crypt-gaa.c b/src/crypt-gaa.c
index f83cf9d..ea5f639 100644
--- a/src/crypt-gaa.c
+++ b/src/crypt-gaa.c
@@ -822,7 +822,7 @@ static int gaa_internal_get_next_str(FILE *file, 
gaa_str_node *tmp_str, int argc
 
         len++;
         a = fgetc( file);
-        if(a==EOF) return 0; //a = ' ';
+        if(a==EOF) return 0;
     }
 
     len += 1;
diff --git a/tests/openpgpself.c b/tests/openpgpself.c
index 388385c..8fc9c6e 100644
--- a/tests/openpgpself.c
+++ b/tests/openpgpself.c
@@ -170,7 +170,7 @@ client (void)
       gnutls_init (&session, GNUTLS_CLIENT);
 
       /* Use default priorities */
-      gnutls_priority_set_direct (session, "NORMAL", NULL);
+      gnutls_priority_set_direct (session, "NORMAL:+CTYPE-OPENPGP", NULL);
 
       /* put the x509 credentials to the current session
        */
@@ -270,7 +270,7 @@ initialize_tls_session (void)
   /* avoid calling all the priority functions, since the defaults
    * are adequate.
    */
-  gnutls_priority_set_direct (session, "NORMAL", NULL);
+  gnutls_priority_set_direct (session, "NORMAL:+CTYPE-OPENPGP", NULL);
 
   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, pgp_cred);
 


hooks/post-receive
-- 
GNU gnutls