rpms/gnupg/devel gnupg-1.4.9-gcc43.patch, NONE, 1.1 gnupg.spec, 1.74, 1.75

Tom Callaway (spot) fedora-extras-commits at redhat.com
Sat May 24 18:17:28 UTC 2008


Author: spot

Update of /cvs/pkgs/rpms/gnupg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24666/devel

Modified Files:
	gnupg.spec 
Added Files:
	gnupg-1.4.9-gcc43.patch 
Log Message:
fix build failure with curl-7.18.1+ and gcc-4.3+

gnupg-1.4.9-gcc43.patch:

--- NEW FILE gnupg-1.4.9-gcc43.patch ---
diff -up gnupg-1.4.9/keyserver/gpgkeys_curl.c.BAD gnupg-1.4.9/keyserver/gpgkeys_curl.c
--- gnupg-1.4.9/keyserver/gpgkeys_curl.c.BAD	2008-05-24 12:41:24.000000000 -0500
+++ gnupg-1.4.9/keyserver/gpgkeys_curl.c	2008-05-24 12:41:41.000000000 -0500
@@ -286,7 +286,7 @@ main(int argc,char *argv[])
 
   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 @@ main(int argc,char *argv[])
     {
       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)
diff -up gnupg-1.4.9/keyserver/gpgkeys_hkp.c.BAD gnupg-1.4.9/keyserver/gpgkeys_hkp.c
--- gnupg-1.4.9/keyserver/gpgkeys_hkp.c.BAD	2008-05-24 12:41:47.000000000 -0500
+++ gnupg-1.4.9/keyserver/gpgkeys_hkp.c	2008-05-24 12:42:10.000000000 -0500
@@ -202,9 +202,9 @@ send_key(int *eof)
     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 @@ main(int argc,char *argv[])
     {
       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)


Index: gnupg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg/devel/gnupg.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- gnupg.spec	26 Mar 2008 20:56:11 -0000	1.74
+++ gnupg.spec	24 May 2008 18:16:46 -0000	1.75
@@ -1,7 +1,7 @@
 Summary: A GNU utility for secure communication and data storage
 Name: gnupg
 Version: 1.4.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3
 Group: Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
@@ -10,6 +10,9 @@
 Patch0: gnupg-1.4.1-gcc.patch
 Patch1: gnupg-1.4.2-curl.patch
 Patch3: gnupg-1.4.6-dir.patch
+# Fix build failure with curl-7.18.1+ and gcc 4.3+
+# http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html
+Patch4: gnupg-1.4.9-gcc43.patch
 URL: http://www.gnupg.org/
 # Requires autoconf >= 2.60 because earlier autoconf didn't define $localedir.
 BuildRequires: autoconf >= 2.60
@@ -37,6 +40,7 @@
 %patch0 -p1 -b .gcc
 %patch1 -p0 -b .curl
 %patch3 -p1 -b .dir
+%patch4 -p1 -b .gcc43
 autoreconf
 
 %build
@@ -106,6 +110,12 @@
 %{_mandir}/man7/*
 
 %changelog
+* Sat May 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.4.9-2
+- fix build failure with curl-7.18.1+ and gcc-4.3+
+
+* Mon May 19 2008 Dennis Gilmore <dennis at ausil.us> - 1.4.9-1.1
+- rebuild for sparc
+
 * Wed Mar 26 2008 Nalin Dahyabhai <nalin at redhat.com> - 1.4.9-1
 - update to 1.4.9 to fix a possible vulnerability in 1.4.8
 - add a disttag




More information about the fedora-extras-commits mailing list