[SCM] GNU gnutls branch, master, updated. gnutls_2_99_1-13-ge13d76f

[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=e13d76f950064d753bb3b8c56aada70bb1ca3686

The branch, master has been updated
       via  e13d76f950064d753bb3b8c56aada70bb1ca3686 (commit)
      from  861cf4e7e2096999f7f42456be58bc6b22667827 (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 e13d76f950064d753bb3b8c56aada70bb1ca3686
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat May 7 09:48:00 2011 +0200

    No libgnutls-extra is required for certtool or p11tool.

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

Summary of changes:
 src/Makefile.am |    6 +++---
 src/certtool.c  |    4 ----
 src/p11tool.c   |    1 -
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index c35f569..5a48efe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,7 +86,7 @@ libcmd_cli_debug_la_SOURCES = tls_test.gaa tls_test-gaa.h 
tls_test-gaa.c
 #certtool
 
 certtool_SOURCES = certtool.c prime.c certtool-common.c
-certtool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la
+certtool_LDADD = ../lib/libgnutls.la 
 certtool_LDADD += libcmd-certtool.la ../gl/libgnu.la
 certtool_LDADD += $(LTLIBGCRYPT)
 if HAVE_LIBCFG
@@ -105,13 +105,13 @@ libcmd_certtool_la_CFLAGS =
 libcmd_certtool_la_SOURCES = certtool-gaa.c certtool.gaa certtool-gaa.h        
\
        certtool-cfg.h certtool-cfg.c
 libcmd_certtool_la_LIBADD = ../gl/libgnu.la $(LTLIBREADLINE)
-libcmd_certtool_la_LIBADD += ../lib/libgnutls.la ../libextra/libgnutls-extra.la
+libcmd_certtool_la_LIBADD += ../lib/libgnutls.la 
 libcmd_certtool_la_LIBADD += ../gl/libgnu.la $(INET_PTON_LIB)
 
 # p11 tool
 p11tool_gaa_CFLAGS =
 p11tool_SOURCES = p11tool.gaa p11tool.c pkcs11.c certtool-common.c p11tool.h
-p11tool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la
+p11tool_LDADD = ../lib/libgnutls.la 
 p11tool_LDADD += libcmd-p11tool.la ../gl/libgnu.la
 p11tool_LDADD += $(LTLIBGCRYPT)
 
diff --git a/src/certtool.c b/src/certtool.c
index 1809660..1256a31 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <gnutls/gnutls.h>
-#include <gnutls/extra.h>
 #include <gnutls/x509.h>
 #include <gnutls/openpgp.h>
 #include <gnutls/pkcs12.h>
@@ -1080,9 +1079,6 @@ gaa_parser (int argc, char **argv)
   if ((ret = gnutls_global_init ()) < 0)
     error (EXIT_FAILURE, 0, "global_init: %s", gnutls_strerror (ret));
 
-  if ((ret = gnutls_global_init_extra ()) < 0)
-    error (EXIT_FAILURE, 0, "global_init_extra: %s", gnutls_strerror (ret));
-
   memset (&cinfo, 0, sizeof (cinfo));
   cinfo.privkey = info.privkey;
   cinfo.pubkey = info.pubkey;
diff --git a/src/p11tool.c b/src/p11tool.c
index 4c10f59..7e97fb1 100644
--- a/src/p11tool.c
+++ b/src/p11tool.c
@@ -23,7 +23,6 @@
 #include <config.h>
 
 #include <gnutls/gnutls.h>
-#include <gnutls/extra.h>
 #include <gnutls/x509.h>
 #include <gnutls/openpgp.h>
 #include <gnutls/pkcs12.h>


hooks/post-receive
-- 
GNU gnutls