[SCM] GNU gnutls branch, master, updated. gnutls_2_11_4-51-gc94d0b2

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

The branch, master has been updated
       via  c94d0b26f45ff1eeeac2fbdca87af538ace176f1 (commit)
       via  4409823b767f78945b379fdbf06f370f30bc23f9 (commit)
       via  07e964d147b5628c09673c75a5a31862d4405f4a (commit)
      from  abdea773135cde901a5102db32480fc4d0057171 (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 c94d0b26f45ff1eeeac2fbdca87af538ace176f1
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Dec 1 22:42:25 2010 +0100

    Added p11tool.h

commit 4409823b767f78945b379fdbf06f370f30bc23f9
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Dec 1 22:35:44 2010 +0100

    released 2.11.5

commit 07e964d147b5628c09673c75a5a31862d4405f4a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Dec 1 22:34:24 2010 +0100

    escaped chars.

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

Summary of changes:
 NEWS                   |    2 +-
 doc/cha-internals.texi |    4 ++--
 src/Makefile.am        |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index ca2f73a..2a78328 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
               2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-* Version 2.11.5 (unreleased)
+* Version 2.11.5 (released 2010-12-01)
 
 ** libgnutls: Reverted default behavior for verification and
 introduced GNUTLS_VERIFY_DO_NOT_ALLOW_X509_V1_CA_CRT. Thus by default
diff --git a/doc/cha-internals.texi b/doc/cha-internals.texi
index c462b7c..0cf96c3 100644
--- a/doc/cha-internals.texi
+++ b/doc/cha-internals.texi
@@ -156,7 +156,7 @@ Most likely you'll need to add an @code{#include 
"ext_foobar.h"}, that
 will contain something like
 like:
 @example
-  extension_entry_st foobar_ext = {
+  extension_entry_st foobar_ext = @{
     .name = "FOOBAR",
     .type = GNUTLS_EXTENSION_FOOBAR,
     .parse_type = GNUTLS_EXT_TLS,
@@ -165,7 +165,7 @@ like:
     .pack_func = _foobar_pack,
     .unpack_func = _foobar_unpack,
     .deinit_func = NULL
-  }
+  @}
 @end example
 
 The GNUTLS_EXTENSION_FOOBAR is the integer value you added to
diff --git a/src/Makefile.am b/src/Makefile.am
index 8607f82..509a446 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,7 +107,7 @@ 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_SOURCES = p11tool.gaa p11tool.c pkcs11.c certtool-common.c p11tool.h
 p11tool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la
 p11tool_LDADD += libcmd-p11tool.la ../gl/libgnu.la
 p11tool_LDADD += $(LTLIBGCRYPT)


hooks/post-receive
-- 
GNU gnutls