[W32] gnutls-2.12.18 fixes

[LRN]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09.04.2012 19:55, Nikos Mavrogiannopoulos wrote:
> On 04/09/2012 04:13 PM, LRN wrote:
> 
>>>> W32 support in GNUTLS 2.x deteriorated a little bit since my 
>>>> last patching session. Here's a few things that require
>>>> fixing: 1) gnutls-2.12.18/lib/nettle/egd.* is incompatible
>>>> with W32 (uses UNIX domain sockets, absolute UNIX-style
>>>> paths, calls stat() on integer file descriptors thought to be
>>>> sockets, and uses S_IFSOCK). It should be disabled at
>>>> configure time. 2) gnutls-2.12.18/lib/nettle/rnd.c requires
>>>> #include <wincrypt.h> on W32
>>> Hello, Do these issues occur in gnutls 3.0.18?
>> No idea, haven't tried 3.x yet (should i?).
> 
> 
> I'd suggest yes, because 3.0 is the current stable branch. The
> 2.12.x is pretty much end of life.
> 
libopts depends on libintl on W32, but -lintl is not added to its
dependencies.
The attached patch is W32-only, because it adds -lintl
unconditionally. I can get away with that, but you'll probably need to
set some variable to "-lintl" in configure, AC_SUBST() it, and use it
to set libopts_la_LIBADD in src/libopts/Makefile.am

Other than that, everything is fine - all enabled tests pass.
gl tests fail to compile, but after patching (i've attached the patch)
they all pass too.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJPg0qGAAoJEOs4Jb6SI2CwMqYIAIouMGIZaOquzCPXPEsTrRsq
p7xmorQkspkWyk2PpSNPOoPkfzkIV00eOVc7A8n+V1XI68InGu73UEQ49n7WsQPk
4HO5MgjqLT1y7CqjQ6c2PVfSgiFslzXUjRMMu+ZI935txBdIVWj7GUXAboZ0diMi
VNIEjGLmaz0sd7qJL0QuOV1o3SO4Z5n+CljR4vmz4Xoa5XNhpkbiwpD1cL67mhef
FchPlugP483omLJNpWuWewDfPXLhdC8EObtqAA/4j6qZzKainkpHN9X3DgOmnESJ
dNkW4hB2s5u3boLfZjIRDiIedN3w566ff3UQD1sILEA1szm/giuuTC5/M8ZWAaQ=
=lokj
-----END PGP SIGNATURE-----
-------------- next part --------------
--- gnutls-3.0.18/src/libopts/Makefile.am.orig	2012-03-22 23:08:06 +0400
+++ gnutls-3.0.18/src/libopts/Makefile.am	2012-04-09 21:14:01 +0400
@@ -8,6 +8,7 @@
 libopts_la_SOURCES      = libopts.c
 libopts_la_CPPFLAGS     = -I$(top_srcdir)
 libopts_la_LDFLAGS      = -version-info  36:3:11
+libopts_la_LIBADD       = -lintl
 EXTRA_DIST              = \
     ag-char-map.h           alias.c                 ao-strs.c  \
     ao-strs.h               autoopts/project.h      autoopts/options.h  \
-------------- next part --------------
--- gnutls-3.0.18/gl/tests/ioctl.c.orig	2012-02-08 13:38:01 +0400
+++ gnutls-3.0.18/gl/tests/ioctl.c	2012-04-09 23:40:46 +0400
@@ -49,6 +49,8 @@
 # include "fd-hook.h"
 /* Get _get_osfhandle.  */
 # include "msvc-nothrow.h"
+/* Get HANDLE */
+# include <windows.h>
 
 static int
 primary_ioctl (int fd, int request, void *arg)