[SCM] GNU gnutls branch, master, updated. gnutls_3_0_7-44-g133478c

[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=133478c1ea66e62cb1671dc8105364f900a557fa

The branch, master has been updated
       via  133478c1ea66e62cb1671dc8105364f900a557fa (commit)
       via  7823fbbd53bcdb32a39c02d85b598b16f6f4c95a (commit)
      from  95bec0fb1aa37dad34cbd8411ca51bbe51262b3e (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 133478c1ea66e62cb1671dc8105364f900a557fa
Author: Simon Josefsson <address@hidden>
Date:   Wed Nov 9 13:26:10 2011 +0100

    Remove redundant const keyword in (confuses gtk-doc parser).

commit 7823fbbd53bcdb32a39c02d85b598b16f6f4c95a
Author: Simon Josefsson <address@hidden>
Date:   Wed Nov 9 13:11:24 2011 +0100

    Mention libidn dependency for crywrap.

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

Summary of changes:
 README-alpha                 |    7 ++++---
 lib/includes/gnutls/pkcs11.h |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README-alpha b/README-alpha
index ff802e0..7939b38 100644
--- a/README-alpha
+++ b/README-alpha
@@ -1,5 +1,5 @@
 GnuTLS README-alpha -- Information for developers.              -*- outline -*-
-Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 2009-2011  Free Software Foundation, Inc.
 See the end for copying conditions.
 
 This file contains instructions for developers and advanced users that
@@ -27,7 +27,8 @@ We require several tools to build the software, including:
 - Gaa <http://gaa.sf.net> (optional)
 - libtasn1 <http://josefsson.org/libtasn1/> (optional)
 - p11-kit <http://p11-glue.freedesktop.org/p11-kit.html>
-- datefudge <packages.debian.org/datefudge> (optional)
+- datefudge <http://packages.debian.org/datefudge> (optional)
+- Libidn <http://www.gnu.org/software/libidn/> (optional, for crywrap)
 
 The required software is typically distributed with your operating
 system, and the instructions for installing them differ.  Here are
@@ -38,7 +39,7 @@ sudo apt-get install git-core autoconf automake libtool 
gettext autopoint
 sudo apt-get install texinfo texlive texlive-generic-recommended 
texlive-extra-utils
 sudo apt-get install help2man gtk-doc-tools valgrind
 sudo apt-get install nettle-dev guile-1.8-dev libtasn1-3-dev libp11-kit-dev
-sudo apt-get install datefudge
+sudo apt-get install datefudge libidn11-dev
 
 To download the version controlled sources:
 
diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h
index 7db5d9e..31fa551 100644
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -50,7 +50,7 @@
  **/
 typedef int (*gnutls_pkcs11_token_callback_t) (void *const userdata,
                                                const char *const label,
-                                               const unsigned retry);
+                                               unsigned retry);
 
 /**
  * gnutls_pkcs11_pin_flag_t:


hooks/post-receive
-- 
GNU gnutls