[SCM] GNU gnutls branch, gnutls_2_10_x, updated. gnutls_2_10_0-16-g39a12ee

[Simon Josefsson]

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=39a12ee34b42ad4461698e71ee9d5befca3dcf99

The branch, gnutls_2_10_x has been updated
       via  39a12ee34b42ad4461698e71ee9d5befca3dcf99 (commit)
       via  0f4cb8f4f5bd0a2365ef61f5dd171286cf72b55b (commit)
       via  34ba7d9932738bc4db91db88ead8e607367f4b71 (commit)
      from  df9038676902b4da243e802ca34f85a40e661b22 (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 39a12ee34b42ad4461698e71ee9d5befca3dcf99
Author: Simon Josefsson <address@hidden>
Date:   Sun Jul 25 11:31:41 2010 +0200

    Bump versions.

commit 0f4cb8f4f5bd0a2365ef61f5dd171286cf72b55b
Author: Simon Josefsson <address@hidden>
Date:   Sun Jul 25 11:12:31 2010 +0200

    Add.

commit 34ba7d9932738bc4db91db88ead8e607367f4b71
Author: Simon Josefsson <address@hidden>
Date:   Sun Jul 25 10:57:02 2010 +0200

    Add OID, from master branch.  To make things build.

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

Summary of changes:
 NEWS                  |    3 +++
 configure.ac          |    2 +-
 lib/configure.ac      |    2 +-
 lib/m4/hooks.m4       |    2 +-
 lib/x509/common.h     |    1 +
 libextra/configure.ac |    2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 141ddf5..5f55220 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,9 @@ certtool: The --pkcs-cipher is taken into account when 
generating a
 private key. The default cipher used now is aes-128. The old behavior can
 be simulated by specifying "--pkcs-cipher 3des-pkcs12".
 
+** API and ABI modifications:
+No changes since last version.
+
 * Version 2.10.0 (released 2010-06-25)
 
 ** API and ABI modifications:
diff --git a/configure.ac b/configure.ac
index b081868..c15fe3a 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.10.0], address@hidden)
+AC_INIT([GnuTLS], [2.10.1], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/lib/configure.ac b/lib/configure.ac
index df34aec..c2a0394 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.10.0], address@hidden)
+AC_INIT([libgnutls], [2.10.1], 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 aad3dff..252efee 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, 42)
-  AC_SUBST(LT_REVISION, 8)
+  AC_SUBST(LT_REVISION, 9)
   AC_SUBST(LT_AGE, 16)
 
   # Used when creating the Windows libgnutls-XX.def files.
diff --git a/lib/x509/common.h b/lib/x509/common.h
index 0853a11..53a94ef 100644
--- a/lib/x509/common.h
+++ b/lib/x509/common.h
@@ -41,6 +41,7 @@
 /* public key algorithm's OIDs
  */
 #define PK_PKIX1_RSA_OID "1.2.840.113549.1.1.1"
+#define PK_X509_RSA_OID "2.5.8.1.1"
 #define PK_DSA_OID "1.2.840.10040.4.1"
 #define PK_GOST_R3410_94_OID "1.2.643.2.2.20"
 #define PK_GOST_R3410_2001_OID "1.2.643.2.2.19"
diff --git a/libextra/configure.ac b/libextra/configure.ac
index b114415..b12e847 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.10.0], address@hidden)
+AC_INIT([libgnutls-extra], [2.10.1], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 


hooks/post-receive
-- 
GNU gnutls