[SCM] GNU gnutls branch, master, updated. gnutls_2_11_4-43-g3e345f7

[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=3e345f79812efc6074682473203b25c420d6b962

The branch, master has been updated
       via  3e345f79812efc6074682473203b25c420d6b962 (commit)
       via  3e10337253f0ee309483fd11f593654a4e995ddd (commit)
       via  fba21b7503bab9a939da7c941adfad85c78dbdf7 (commit)
      from  ba0d3011de2aabee00cb3ce7a38127e9f4aa8b7f (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 3e345f79812efc6074682473203b25c420d6b962
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Nov 27 15:38:46 2010 +0100

    Use rusage if present.
    Moved check to correct config and included resource.h header.

commit 3e10337253f0ee309483fd11f593654a4e995ddd
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Nov 27 15:31:38 2010 +0100

    More details on the text

commit fba21b7503bab9a939da7c941adfad85c78dbdf7
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Nov 27 15:27:58 2010 +0100

    Corrected copyright statement

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

Summary of changes:
 configure.ac     |    2 +-
 lib/configure.ac |    1 +
 lib/nettle/rnd.c |    8 ++++++--
 lib/pkcs11.c     |    6 ++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9b8d1e8..fdce646 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ AC_DEFINE([HAVE_CTYPE_H], 1, [Hard-code for src/cfg/.])
 AC_DEFINE([HAVE_ERRNO_H], 1, [Hard-code for src/cfg/.])
 
 # No fork on MinGW, disable some self-tests until we fix them.
-AC_CHECK_FUNCS(fork getrusage,,)
+AC_CHECK_FUNCS(fork,,)
 AM_CONDITIONAL(HAVE_FORK, test "$ac_cv_func_fork" != "no")
 
 AC_CHECK_TYPES(uint,,, [
diff --git a/lib/configure.ac b/lib/configure.ac
index 0d30e8a..3a89288 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -82,6 +82,7 @@ fi
 
 lgl_INIT
 
+AC_CHECK_FUNCS(getrusage,,)
 AC_LIB_HAVE_LINKFLAGS(pthread,, [#include <pthread.h>], [pthread_mutex_lock 
(0);])
 
 LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
diff --git a/lib/nettle/rnd.c b/lib/nettle/rnd.c
index 4c5709f..6f6aa8e 100644
--- a/lib/nettle/rnd.c
+++ b/lib/nettle/rnd.c
@@ -24,8 +24,9 @@
  */
 
 /* Here is the random generator layer. This code was based on the LSH 
- * random generator and modified to fit gnutls' needs. Relicenced with 
- * permission. Original author Niels Möller.
+ * random generator (the trivia and device source functions for POSIX)
+ * and modified to fit gnutls' needs. Relicenced with permission. 
+ * Original author Niels Möller.
  */
 
 #include <gnutls_int.h>
@@ -154,6 +155,9 @@ wrap_nettle_rnd_deinit (void *ctx)
 #include <sys/time.h>
 #include <fcntl.h>
 #include <locks.h>
+#ifdef HAVE_GETRUSAGE
+# include <sys/resource.h>
+#endif
 #include "egd.h"
 
 #define DEVICE_READ_SIZE 16
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 2ed329a..dd7951c 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -1,11 +1,13 @@
 /*
  * GnuTLS PKCS#11 support
  * Copyright (C) 2010 Free Software Foundation
+ * Copyright (C) 2008, Joe Orton <address@hidden>
  * 
  * Author: Nikos Mavrogiannopoulos
  *
- * Inspired and some parts based on neon PKCS #11 support by Joe Orton.
- * More ideas came from the pkcs11-helper library by Alon Bar-Lev.
+ * Inspired and some parts (pkcs11_login) based on neon PKCS #11 support 
+ * by Joe Orton. More ideas came from the pkcs11-helper library by 
+ * Alon Bar-Lev.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public


hooks/post-receive
-- 
GNU gnutls