[SCM] GNU gnutls branch, master, updated. gnutls_3_0_4-45-g16a0688

[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=16a068802c6540f2f04b4d893a33fd82695a8f9c

The branch, master has been updated
       via  16a068802c6540f2f04b4d893a33fd82695a8f9c (commit)
       via  1790ba91f21c233d5cfb920992bb3fc56280c7b5 (commit)
       via  73cb8999395fd24c07b58ad729d8a32738e903ae (commit)
      from  9bd5a3d4b391b909fe039176826c15152e887959 (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 16a068802c6540f2f04b4d893a33fd82695a8f9c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Oct 27 09:17:17 2011 +0200

    Added gnulib close module.

commit 1790ba91f21c233d5cfb920992bb3fc56280c7b5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Oct 27 09:16:41 2011 +0200

    do not use NULL for device_fd in windows.

commit 73cb8999395fd24c07b58ad729d8a32738e903ae
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Oct 27 09:15:30 2011 +0200

    no need to include windows.h here.

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

Summary of changes:
 gl/Makefile.am         |   11 ++++++++++-
 gl/{tests => }/close.c |    0
 gl/m4/gnulib-cache.m4  |    3 ++-
 gl/m4/gnulib-comp.m4   |   12 ++++++------
 gl/tests/Makefile.am   |    9 ---------
 lib/nettle/rnd.c       |    4 ++--
 lib/opencdk/main.c     |    3 ---
 7 files changed, 20 insertions(+), 22 deletions(-)
 rename gl/{tests => }/close.c (100%)

diff --git a/gl/Makefile.am b/gl/Makefile.am
index 9bf8f9c..22dc37b 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override 
--lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc 
--tests-base=gl/tests --aux-dir=build-aux --with-tests --avoid=alignof-tests 
--avoid=lseek-tests --no-conditional-dependencies --libtool --macro-prefix=gl 
--no-vc-files accept alloca alphasort argp bind byteswap c-ctype 
crypto/hmac-md5 crypto/md5 error extensions func getpass getsubopt gettext 
gettime havelib inet_pton lib-msvc-compat lib-symbol-versions listen 
maintainer-makefile manywarnings memmem-simple minmax netdb netinet_in progname 
read-file recvfrom scandir select sendto setsockopt shutdown snprintf socket 
sockets socklen stdint strcase strverscmp sys_socket sys_stat time_r timespec 
u64 unistd valgrind-tests vasprintf version-etc version-etc-fsf vfprintf-posix 
vprintf-posix vsnprintf warnings
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override 
--lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc 
--tests-base=gl/tests --aux-dir=build-aux --with-tests --avoid=alignof-tests 
--avoid=lseek-tests --no-conditional-dependencies --libtool --macro-prefix=gl 
--no-vc-files accept alloca alphasort argp bind byteswap c-ctype close 
crypto/hmac-md5 crypto/md5 error extensions func getpass getsubopt gettext 
gettime havelib inet_pton lib-msvc-compat lib-symbol-versions listen 
maintainer-makefile manywarnings memmem-simple minmax netdb netinet_in progname 
read-file recvfrom scandir select sendto setsockopt shutdown snprintf socket 
sockets socklen stdint strcase strverscmp sys_socket sys_stat time_r timespec 
u64 unistd valgrind-tests vasprintf version-etc version-etc-fsf vfprintf-posix 
vprintf-posix vsnprintf warnings
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
@@ -199,6 +199,15 @@ libgnu_la_SOURCES += c-ctype.h c-ctype.c
 
 ## end   gnulib module c-ctype
 
+## begin gnulib module close
+
+
+EXTRA_DIST += close.c
+
+EXTRA_libgnu_la_SOURCES += close.c
+
+## end   gnulib module close
+
 ## begin gnulib module closedir
 
 
diff --git a/gl/tests/close.c b/gl/close.c
similarity index 100%
rename from gl/tests/close.c
rename to gl/close.c
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index b8318a3..3390739 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu 
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests 
--aux-dir=build-aux --with-tests --avoid=alignof-tests --avoid=lseek-tests 
--no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept 
alloca alphasort argp bind byteswap c-ctype crypto/hmac-md5 crypto/md5 error 
extensions func getpass getsubopt gettext gettime havelib inet_pton 
lib-msvc-compat lib-symbol-versions listen maintainer-makefile manywarnings 
memmem-simple minmax netdb netinet_in progname read-file recvfrom scandir 
select sendto setsockopt shutdown snprintf socket sockets socklen stdint 
strcase strverscmp sys_socket sys_stat time_r timespec u64 unistd 
valgrind-tests vasprintf version-etc version-etc-fsf vfprintf-posix 
vprintf-posix vsnprintf warnings
+#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu 
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests 
--aux-dir=build-aux --with-tests --avoid=alignof-tests --avoid=lseek-tests 
--no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept 
alloca alphasort argp bind byteswap c-ctype close crypto/hmac-md5 crypto/md5 
error extensions func getpass getsubopt gettext gettime havelib inet_pton 
lib-msvc-compat lib-symbol-versions listen maintainer-makefile manywarnings 
memmem-simple minmax netdb netinet_in progname read-file recvfrom scandir 
select sendto setsockopt shutdown snprintf socket sockets socklen stdint 
strcase strverscmp sys_socket sys_stat time_r timespec u64 unistd 
valgrind-tests vasprintf version-etc version-etc-fsf vfprintf-posix 
vprintf-posix vsnprintf warnings
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([gl/override])
@@ -39,6 +39,7 @@ gl_MODULES([
   bind
   byteswap
   c-ctype
+  close
   crypto/hmac-md5
   crypto/md5
   error
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 359ff39..461cac0 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -383,6 +383,11 @@ fi
 gl_SYS_SOCKET_MODULE_INDICATOR([bind])
 gl_BYTESWAP
 gl_CLOCK_TIME
+gl_FUNC_CLOSE
+if test $REPLACE_CLOSE = 1; then
+  AC_LIBOBJ([close])
+fi
+gl_UNISTD_MODULE_INDICATOR([close])
 gl_FUNC_CLOSEDIR
 if test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1; then
   AC_LIBOBJ([closedir])
@@ -821,11 +826,6 @@ changequote([, ])dnl
   AC_SUBST([gltests_WITNESS])
   gl_module_indicator_condition=$gltests_WITNESS
   m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
-gl_FUNC_CLOSE
-if test $REPLACE_CLOSE = 1; then
-  AC_LIBOBJ([close])
-fi
-gl_UNISTD_MODULE_INDICATOR([close])
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
 if test "$ac_cv_header_winsock2_h" = yes; then
   AC_LIBOBJ([connect])
@@ -1090,6 +1090,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/byteswap.in.h
   lib/c-ctype.c
   lib/c-ctype.h
+  lib/close.c
   lib/closedir.c
   lib/dirent-private.h
   lib/dirent.in.h
@@ -1578,7 +1579,6 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-wchar.c
   tests/zerosize-ptr.h
   tests=lib/binary-io.h
-  tests=lib/close.c
   tests=lib/connect.c
   tests=lib/dup2.c
   tests=lib/fcntl.in.h
diff --git a/gl/tests/Makefile.am b/gl/tests/Makefile.am
index f1e68b6..205b736 100644
--- a/gl/tests/Makefile.am
+++ b/gl/tests/Makefile.am
@@ -134,15 +134,6 @@ EXTRA_DIST += test-c-ctype.c macros.h
 
 ## end   gnulib module c-ctype-tests
 
-## begin gnulib module close
-
-
-EXTRA_DIST += close.c
-
-EXTRA_libtests_a_SOURCES += close.c
-
-## end   gnulib module close
-
 ## begin gnulib module close-tests
 
 TESTS += test-close
diff --git a/lib/nettle/rnd.c b/lib/nettle/rnd.c
index 13a1184..6e7c69a 100644
--- a/lib/nettle/rnd.c
+++ b/lib/nettle/rnd.c
@@ -61,7 +61,7 @@ static void *rnd_mutex;
 #define DEVICE_READ_SIZE 16
 #define DEVICE_READ_SIZE_MAX 32
 
-static HCRYPTPROV device_fd = NULL;
+static HCRYPTPROV device_fd = 0;
 
 static int
 do_trivia_source (int init)
@@ -112,7 +112,7 @@ do_device_source (int init)
       read_size = DEVICE_READ_SIZE_MAX; /* initially read more data */
     }
 
-  if ((device_fd != NULL)
+  if ((device_fd != 0)
       && (init || ((now - device_last_read) > DEVICE_READ_INTERVAL)))
     {
 
diff --git a/lib/opencdk/main.c b/lib/opencdk/main.c
index 6d32bd1..bb1a163 100644
--- a/lib/opencdk/main.c
+++ b/lib/opencdk/main.c
@@ -28,9 +28,6 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef _WIN32
-#include <windows.h>
-#endif
 
 #include "opencdk.h"
 #include "main.h"


hooks/post-receive
-- 
GNU gnutls