Hello,
I tried to compile gnupg-2.0.15rc1 under mingw+msys.
Everything worked fine except the compilation of scd/ccid-driver.c
It required two little fixes:
1) ETIMEDOUT is not defined by common windows headers, so libusb-win32
hardcoded this value into its sources. For this reason, it needs to be defined
here too.
2) libusb-win32 cannot modify errno, so the error code is returned directly
into the return value of various functions.
After doing these fixes gnupg has been compiled successfully.
I still need to test it under cygwin.
Sincerely,
Carlo Bramini.
---------- Initial Header -----------
>From : [email protected]
To : [email protected]
Cc : [email protected]
Date : Thu, 18 Feb 2010 10:41:49 +0100
Subject : Release candidate for 2.0.15
> Hi!
>
> I just prepared a release candidate for GnuPG 2.0.15. The goal of this
> release is to find out whether there are any severe build or runtime
> bugs. There are actually not may changes:
>
> * New command --passwd for GPG.
>
> * Fixes a regression in 2.0.14 which prevented unprotection of new
> or changed gpg-agent passphrases.
>
> * Make use of Libassuan 2.0 which is available as a DSO.
>
> as well as a couple of minor bug fixes and some changes to the German
> translation.
>
> The major point is the move to Libassuan 2.0. This is the first version
> of Libassuan which may be used as a shared library. We took this change
> to cleanup the API a bit with the drawback that some changes to the
> caller are required.
>
> To make development with Libassuan easier we need to get rid of
> Libassuan 1 which developer's package can't be installed side by side
> with Libassuan 2. Thus it is not easy to maintain software written with
> version 1 and 2 at the same time. With the 2.0.15 release we will have
> finished the migration of the GnuPG related tools to Libassuan 2.
>
> Please let us know if there are any problems building this release:
>
> ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-2.0.15rc1.tar.bz2
> ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-2.0.15rc1.tar.bz2.sig
>
>
>
> Shalom-Salam,
>
> Werner
>
>
> --
> Die Gedanken sind frei. Ausnahmen regelt ein Bundesgesetz.
>
diff -r -u gnupg-2.0.15rc1-old/scd/ccid-driver.c
gnupg-2.0.15rc1-new/scd/ccid-driver.c
--- gnupg-2.0.15rc1-old/scd/ccid-driver.c 2009-12-21 14:56:09 +0000
+++ gnupg-2.0.15rc1-new/scd/ccid-driver.c 2010-02-18 14:20:25 +0000
@@ -167,7 +167,9 @@
#define EAGAIN EWOULDBLOCK
#endif
-
+#if !defined ETIMEDOUT && defined _WIN32
+#define ETIMEDOUT 116 /* This value is hardcoded into libusb-win32 */
+#endif
enum {
RDR_to_PC_NotifySlotChange= 0x50,
@@ -2229,7 +2231,11 @@
handle->ep_intr,
(char*)msg, sizeof msg,
0 /* ms timeout */ );
+#ifdef _WIN32
+ if (rc == -(ETIMEDOUT))
+#else
if (rc < 0 && errno == ETIMEDOUT)
+#endif
return 0;
}
else
_______________________________________________
Gnupg-users mailing list
[email protected]
http://lists.gnupg.org/mailman/listinfo/gnupg-users
