Build failure with curl-7.18.1 and GCC 4.3

[David Shaw]

On Sun, Apr 13, 2008 at 01:04:49PM +0200, Ladislav Hagara wrote:
>
>> Hello.  I'm getting a compilation error building gnupg-2.0.9 using GCC
>> 4.3 and curl-7.18.1.
>
>
> V Source Mage GNU/Linux we have this path 
> http://bugs.sourcemage.org/attachment.cgi?id=6992
> The same problem is with gnupg-1.4.9, patch 
> http://bugs.sourcemage.org/attachment.cgi?id=6991
>
> Our Bugzilla Bug 14446
> http://bugs.sourcemage.org/show_bug.cgi?id=14446

This is an issue with how GPG is passing arguments to curl.  I've
attached the patch I'm about to commit.  It applies to either 1.4.9 or
2.0.9.

David
-------------- next part --------------
Index: gpgkeys_curl.c
===================================================================
--- gpgkeys_curl.c	(revision 4741)
+++ gpgkeys_curl.c	(working copy)
@@ -286,7 +286,7 @@
 
   if(follow_redirects)
     {
-      curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1);
+      curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1L);
       if(follow_redirects>0)
 	curl_easy_setopt(curl,CURLOPT_MAXREDIRS,follow_redirects);
     }
@@ -298,10 +298,10 @@
     {
       fprintf(console,"gpgkeys: curl version = %s\n",curl_version());
       curl_easy_setopt(curl,CURLOPT_STDERR,console);
-      curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
+      curl_easy_setopt(curl,CURLOPT_VERBOSE,1L);
     }
 
-  curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,opt->flags.check_cert);
+  curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,(long)opt->flags.check_cert);
   curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file);
 
   if(proxy)
Index: gpgkeys_hkp.c
===================================================================
--- gpgkeys_hkp.c	(revision 4741)
+++ gpgkeys_hkp.c	(working copy)
@@ -202,9 +202,9 @@
     fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request);
 
   curl_easy_setopt(curl,CURLOPT_URL,request);
-  curl_easy_setopt(curl,CURLOPT_POST,1);
+  curl_easy_setopt(curl,CURLOPT_POST,1L);
   curl_easy_setopt(curl,CURLOPT_POSTFIELDS,key);
-  curl_easy_setopt(curl,CURLOPT_FAILONERROR,1);
+  curl_easy_setopt(curl,CURLOPT_FAILONERROR,1L);
 
   res=curl_easy_perform(curl);
   if(res!=0)
@@ -661,7 +661,7 @@
     {
       fprintf(console,"gpgkeys: curl version = %s\n",curl_version());
       curl_easy_setopt(curl,CURLOPT_STDERR,console);
-      curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
+      curl_easy_setopt(curl,CURLOPT_VERBOSE,1L);
     }
 
   if(proxy)