summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2013-10-30 14:18:12 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2013-10-30 14:18:23 +0100
commit6a2289966a9c946fae50e283b2a143d259d404c6 (patch)
tree02e0d83e7ac50bd8c4a6924041e8b08cb4c70e87
parentb9db38d7f5451c281f7ba345cc3f71e2240ba23a (diff)
downloadgnutls-6a2289966a9c946fae50e283b2a143d259d404c6.tar.gz
bumped version
-rw-r--r--NEWS5
-rw-r--r--configure.ac2
-rw-r--r--m4/hooks.m46
3 files changed, 9 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 75169e8945..e586186a40 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,11 @@ bits from 727.
** libgnutls: Added function to obtain random data from PKCS #11 tokens.
Contributed by Wolfgang Meyer zu Bergsten.
+** gnulib: updated.
+
+** libdane: Fixed a one-off bug in dane_query_tlsa() introduced by the
+previous fix. Reported by Tomas Mraz.
+
** p11tool: Added option generate-random.
** API and ABI modifications:
diff --git a/configure.ac b/configure.ac
index 970628bf63..3e7ea9a780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl Process this file with autoconf to produce a configure script.
# USA
AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [3.2.5], [bug-gnutls@gnu.org])
+AC_INIT([GnuTLS], [3.2.6], [bug-gnutls@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_HOST
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index 24a760e612..6605370777 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -39,16 +39,16 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
# Interfaces changed/added/removed: CURRENT++ REVISION=0
# Interfaces added: AGE++
# Interfaces removed: AGE=0
- AC_SUBST(LT_CURRENT, 54)
+ AC_SUBST(LT_CURRENT, 55)
AC_SUBST(LT_REVISION, 0)
- AC_SUBST(LT_AGE, 26)
+ AC_SUBST(LT_AGE, 27)
AC_SUBST(LT_SSL_CURRENT, 27)
AC_SUBST(LT_SSL_REVISION, 2)
AC_SUBST(LT_SSL_AGE, 0)
AC_SUBST(LT_DANE_CURRENT, 4)
- AC_SUBST(LT_DANE_REVISION, 0)
+ AC_SUBST(LT_DANE_REVISION, 1)
AC_SUBST(LT_DANE_AGE, 4)
AC_SUBST(LT_XSSL_CURRENT, 0)