[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_11_7-2-g3673780

[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=36737800a82352bb39dcc698ba914b875ab1f5b3

The branch, gnutls_2_12_x has been updated
       via  36737800a82352bb39dcc698ba914b875ab1f5b3 (commit)
       via  a33103c878a67dc9bb3a7546f27a11d488e9b417 (commit)
       via  27661a06352657353ccfe2e6bea98b7681bb3144 (commit)
      from  6ffbec585eb028da7cc659e917560bd1569636b0 (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 36737800a82352bb39dcc698ba914b875ab1f5b3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Mar 10 17:07:03 2011 +0100

    increased the so version of libgnutls-openssl.

commit a33103c878a67dc9bb3a7546f27a11d488e9b417
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Mar 10 17:04:43 2011 +0100

    updated NEWS with Andreas' comments.

commit 27661a06352657353ccfe2e6bea98b7681bb3144
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Mar 9 20:52:23 2011 +0100

    updated

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

Summary of changes:
 NEWS                     |   13 +++++++++++--
 doc/manpages/Makefile.am |   16 +++++-----------
 lib/m4/hooks.m4          |    4 ++++
 libextra/Makefile.am     |    2 +-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index 345eddb..949b2b3 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,14 @@ 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.xx.y (unreleased)
+
+** libgnutls-openssl: modified to use modern gnutls' functions.
+This introduces an ABI incompatibility with previous versions.
+
+** API and ABI modifications:
+No changes since last version.
+
 * Version 2.11.7 (released 2011-03-09)
 
 ** libgnutls: Corrected signature generation and verification
@@ -55,7 +63,7 @@ support it.
 Reported by "Brendan Doherty" <address@hidden>.
 
 ** API and ABI modifications:
-gnutls_transport_set_push_function2: ADDED
+gnutls_transport_set_vec_push_function: ADDED
 gnutls_x509_crl_get_raw_issuer_dn: ADDED
 gnutls_pubkey_import_privkey: ADDED
 gnutls_pubkey_verify_data: ADDED
@@ -84,10 +92,11 @@ gnutls_x509_crt_verify_data: DEPRECATED (use: 
gnutls_pubkey_verify_data)
 gnutls_x509_crt_get_verify_algorithm: DEPRECATED (use: 
gnutls_pubkey_get_verify_algorithm)
 gnutls_x509_crt_get_preferred_hash_algorithm: DEPRECATED (use: 
gnutls_pubkey_get_preferred_hash_algorithm)
 gnutls_openpgp_privkey_sign_hash: DEPRECATED (use: gnutls_privkey_sign_hash)
+gnutls_openpgp_privkey_decrypt_data: REMOVED (was added in 2.11.0)
 gnutls_pkcs11_privkey_sign_hash: REMOVED (was added in 2.11.0)
 gnutls_pkcs11_privkey_decrypt_data: REMOVED (was added in 2.11.0)
 gnutls_pkcs11_privkey_sign_data: REMOVED (was added in 2.11.0)
-gnutls_pkcs11_privkey_sign_hash: REMOVED (was added in 2.11.0)
+gnutls_x509_privkey_sign_data2: REMOVED (was added in 2.11.0)
 
 * Version 2.11.6 (released 2010-12-06)
 
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index f1f707b..1414228 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -116,7 +116,7 @@ APIMANS += gnutls_transport_set_global_errno.3
 APIMANS += gnutls_record_check_pending.3
 APIMANS += gnutls_transport_set_pull_function.3
 APIMANS += gnutls_transport_set_push_function.3
-APIMANS += gnutls_transport_set_push_function2.3
+APIMANS += gnutls_transport_set_vec_push_function.3
 APIMANS += gnutls_transport_set_errno_function.3
 APIMANS += gnutls_certificate_free_keys.3
 APIMANS += gnutls_certificate_free_cas.3
@@ -217,6 +217,7 @@ APIMANS += gnutls_pubkey_get_key_usage.3
 APIMANS += gnutls_pubkey_init.3
 APIMANS += gnutls_pubkey_deinit.3
 APIMANS += gnutls_pubkey_import_x509.3
+APIMANS += gnutls_pubkey_import_privkey.3
 APIMANS += gnutls_pubkey_get_preferred_hash_algorithm.3
 APIMANS += gnutls_pubkey_import_pkcs11.3
 APIMANS += gnutls_pubkey_import_openpgp.3
@@ -231,6 +232,7 @@ APIMANS += gnutls_pubkey_set_key_usage.3
 APIMANS += gnutls_pubkey_import_pkcs11_url.3
 APIMANS += gnutls_pubkey_import_rsa_raw.3
 APIMANS += gnutls_pubkey_import_dsa_raw.3
+APIMANS += gnutls_pubkey_verify_data.3
 APIMANS += gnutls_pubkey_verify_hash.3
 APIMANS += gnutls_pubkey_get_verify_algorithm.3
 APIMANS += gnutls_protocol_get_version.3
@@ -267,10 +269,6 @@ APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
 APIMANS += gnutls_handshake_set_private_extensions.3
 APIMANS += gnutls_prf_raw.3
 APIMANS += gnutls_prf.3
-APIMANS += gnutls_session_get_client_random.3
-APIMANS += gnutls_session_get_server_random.3
-APIMANS += gnutls_session_get_master_secret.3
-APIMANS += gnutls_session_set_finished_function.3
 APIMANS += gnutls_session_is_resumed.3
 APIMANS += gnutls_session_get_ptr.3
 APIMANS += gnutls_session_set_ptr.3
@@ -336,10 +334,7 @@ APIMANS += gnutls_pkcs11_privkey_init.3
 APIMANS += gnutls_pkcs11_privkey_deinit.3
 APIMANS += gnutls_pkcs11_privkey_get_pk_algorithm.3
 APIMANS += gnutls_pkcs11_privkey_get_info.3
-APIMANS += gnutls_pkcs11_privkey_sign_data.3
-APIMANS += gnutls_pkcs11_privkey_sign_hash.3
 APIMANS += gnutls_pkcs11_privkey_import_url.3
-APIMANS += gnutls_pkcs11_privkey_decrypt_data.3
 APIMANS += gnutls_pkcs11_privkey_export_url.3
 APIMANS += gnutls_pkcs11_copy_secret_key.3
 APIMANS += gnutls_pkcs11_copy_x509_crt.3
@@ -389,6 +384,7 @@ APIMANS += gnutls_x509_crl_get_this_update.3
 APIMANS += gnutls_x509_crl_get_next_update.3
 APIMANS += gnutls_x509_crl_get_crt_count.3
 APIMANS += gnutls_x509_crl_get_crt_serial.3
+APIMANS += gnutls_x509_crl_get_raw_issuer_dn.3
 APIMANS += gnutls_x509_crl_export.3
 APIMANS += gnutls_x509_crl_get_authority_key_id.3
 APIMANS += gnutls_x509_crl_get_number.3
@@ -502,7 +498,6 @@ APIMANS += gnutls_x509_privkey_export_rsa_raw2.3
 APIMANS += gnutls_x509_privkey_export_dsa_raw.3
 APIMANS += gnutls_x509_privkey_generate.3
 APIMANS += gnutls_x509_privkey_get_key_id.3
-APIMANS += gnutls_x509_privkey_sign_data2.3
 APIMANS += gnutls_x509_privkey_sign_hash.3
 APIMANS += gnutls_x509_privkey_sign_data.3
 APIMANS += gnutls_x509_privkey_verify_data.3
@@ -607,8 +602,6 @@ APIMANS += gnutls_certificate_set_openpgp_key_file2.3
 APIMANS += gnutls_certificate_set_openpgp_keyring_file.3
 APIMANS += gnutls_certificate_set_openpgp_keyring_mem.3
 APIMANS += gnutls_openpgp_set_recv_key_function.3
-APIMANS += gnutls_openpgp_privkey_sign_hash.3
-APIMANS += gnutls_openpgp_privkey_decrypt_data.3
 APIMANS += gnutls_openpgp_crt_print.3
 APIMANS += gnutls_openpgp_crt_init.3
 APIMANS += gnutls_openpgp_crt_deinit.3
@@ -665,6 +658,7 @@ APIMANS += gnutls_openpgp_privkey_export_subkey_rsa_raw.3
 APIMANS += gnutls_openpgp_privkey_export_subkey_dsa_raw.3
 APIMANS += gnutls_openpgp_privkey_get_preferred_key_id.3
 APIMANS += gnutls_openpgp_privkey_set_preferred_key_id.3
+APIMANS += gnutls_openpgp_privkey_sign_hash.3
 
 SRPMANS =
 SRPMANS += gnutls_srp_base64_encode.3
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index d75ae3a..d9a91d3 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -30,6 +30,10 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   AC_SUBST(LT_REVISION, 7)
   AC_SUBST(LT_AGE, 18)
 
+  AC_SUBST(LT_SSL_CURRENT, 27)
+  AC_SUBST(LT_SSL_REVISION, 0)
+  AC_SUBST(LT_SSL_AGE, 0)
+
   AC_SUBST(CXX_LT_CURRENT, 27)
   AC_SUBST(CXX_LT_REVISION, 0)
   AC_SUBST(CXX_LT_AGE, 0)
diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index fd95a9e..1daa7fb 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -64,7 +64,7 @@ libgnutls_openssl_la_SOURCES = gnutls_openssl.c 
openssl_compat.h      \
 libgnutls_openssl_la_LIBADD = ../lib/gl/liblgnu.la $(LIBSOCKET) \
        ../lib/libgnutls.la
 
-libgnutls_openssl_la_LDFLAGS += -version-info 
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libgnutls_openssl_la_LDFLAGS += -version-info 
$(LT_SSL_CURRENT):$(LT_SSL_REVISION):$(LT_SSL_AGE)
 
 if ENABLE_MINITASN1
 libgnutls_openssl_la_LIBADD += ../lib/minitasn1/libminitasn1.la


hooks/post-receive
-- 
GNU gnutls