Attachment 306289 Details for Bug 447772 – patch to correct minor issues in current spec file

[patch] patch to correct minor issues in current spec file

gnupg-1.4.9-1.diff (text/plain), 6.52 KB, created by Todd Zullinger on 2008-05-21 18:16:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Todd Zullinger

Created: 2008-05-21 18:16:21 UTC

Size: 6.52 KB

patch

obsolete

>Index: gnupg-1.4.2-curl.patch
>===================================================================
>RCS file: gnupg-1.4.2-curl.patch
>diff -N gnupg-1.4.2-curl.patch
>--- gnupg-1.4.2-curl.patch	25 Feb 2008 15:22:42 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,16 +0,0 @@
>-Use the gpgkeys_ldap helper instead of the gpgkeys_curl helper.
>-
>-diff -u -p -r1.90 -r1.91
>---- g10/keyserver.c	22 Jul 2005 16:28:40 -0000	1.90
>-+++ g10/keyserver.c	27 Jul 2005 01:24:57 -0000	1.91
>-@@ -860,7 +860,9 @@ curl_can_handle(const char *scheme)
>- static const char *
>- keyserver_typemap(const char *type)
>- {
>--  if(strcmp(type,"ldaps")==0)
>-+  if(strcmp(type,"ldap")==0)
>-+    return "ldap";
>-+  else if(strcmp(type,"ldaps")==0)
>-     return "ldap";
>-   else if(curl_can_handle(type))
>-     return "curl";
>Index: gnupg-1.4.9-curl.patch
>===================================================================
>RCS file: gnupg-1.4.9-curl.patch
>diff -N gnupg-1.4.9-curl.patch
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ gnupg-1.4.9-curl.patch	21 May 2008 18:15:23 -0000
>@@ -0,0 +1,116 @@
>+Index: keyserver/gpgkeys_curl.c
>+===================================================================
>+--- keyserver/gpgkeys_curl.c	(revision 4741)
>++++ keyserver/gpgkeys_curl.c	(revision 4743)
>+@@ -1,5 +1,5 @@
>+ /* gpgkeys_curl.c - fetch a key via libcurl
>+- * Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
>++ * Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
>+  *
>+  * This file is part of GnuPG.
>+  *
>+@@ -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: keyserver/curl-shim.c
>+===================================================================
>+--- keyserver/curl-shim.c	(revision 4741)
>++++ keyserver/curl-shim.c	(revision 4743)
>+@@ -1,7 +1,7 @@
>+ /* curl-shim.c - Implement a small subset of the curl API in terms of
>+  * the iobuf HTTP API
>+  *
>+- * Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
>++ * Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
>+  *
>+  * This file is part of GnuPG.
>+  *
>+@@ -129,16 +129,16 @@
>+       curl->proxy=va_arg(ap,char *);
>+       break;
>+     case CURLOPT_POST:
>+-      curl->flags.post=va_arg(ap,unsigned int);
>++      curl->flags.post=va_arg(ap,long)?1:0;
>+       break;
>+     case CURLOPT_POSTFIELDS:
>+       curl->postfields=va_arg(ap,char *);
>+       break;
>+     case CURLOPT_FAILONERROR:
>+-      curl->flags.failonerror=va_arg(ap,unsigned int);
>++      curl->flags.failonerror=va_arg(ap,long)?1:0;
>+       break;
>+     case CURLOPT_VERBOSE:
>+-      curl->flags.verbose=va_arg(ap,unsigned int);
>++      curl->flags.verbose=va_arg(ap,long)?1:0;
>+       break;
>+     case CURLOPT_STDERR:
>+       curl->errors=va_arg(ap,FILE *);
>+Index: keyserver/ChangeLog
>+===================================================================
>+--- keyserver/ChangeLog	(revision 4741)
>++++ keyserver/ChangeLog	(revision 4743)
>+@@ -1,3 +1,11 @@
>++2008-04-14  David Shaw  <dshaw@jabberwocky.com>
>++
>++	* gpgkeys_curl.c (main), gpgkeys_hkp.c (main): Make sure all
>++	libcurl number options are passed as long.
>++
>++	* curl-shim.c (curl_easy_setopt): Minor tweak to match the real
>++	curl better - libcurl uses 'long', not 'unsigned int'.
>++
>+ 2008-03-25  Werner Koch  <wk@g10code.com>
>+ 
>+ 	* gpgkeys_ldap.c (build_attrs): Take care of char defaulting to
>+Index: keyserver/gpgkeys_hkp.c
>+===================================================================
>+--- keyserver/gpgkeys_hkp.c	(revision 4741)
>++++ keyserver/gpgkeys_hkp.c	(revision 4743)
>+@@ -1,6 +1,6 @@
>+ /* gpgkeys_hkp.c - talk to an HKP keyserver
>+- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
>+- *               2007 Free Software Foundation, Inc.
>++ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
>++ *               2008 Free Software Foundation, Inc.
>+  *
>+  * This file is part of GnuPG.
>+  *
>+@@ -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)
>Index: gnupg.spec
>===================================================================
>RCS file: /cvs/extras/rpms/gnupg/devel/gnupg.spec,v
>retrieving revision 1.74
>diff -u -p -r1.74 gnupg.spec
>--- gnupg.spec	26 Mar 2008 20:56:11 -0000	1.74
>+++ gnupg.spec	21 May 2008 18:15:23 -0000
>@@ -1,14 +1,14 @@
> Summary: A GNU utility for secure communication and data storage
> Name: gnupg
> Version: 1.4.9
>-Release: 1%{?dist}
>-License: GPLv3
>+Release: 2%{?dist}
>+License: GPLv3+
> Group: Applications/System
> Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
> Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
> Source2: gnupg-shm-coprocessing.expect
> Patch0: gnupg-1.4.1-gcc.patch
>-Patch1: gnupg-1.4.2-curl.patch
>+Patch1: gnupg-1.4.9-curl.patch
> Patch3: gnupg-1.4.6-dir.patch
> URL: http://www.gnupg.org/
> # Requires autoconf >= 2.60 because earlier autoconf didn't define $localedir.
>@@ -106,6 +106,12 @@ exit 0
> %{_mandir}/man7/*
> 
> %changelog
>+* Mon May 19 2008 Todd Zullinger <tmz@pobox.com> - 1.4.9-2
>+- Apply upstream patch to fix building with curl-7.18.1
>+  (http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html)
>+- Drop old curl ldap keyserver patch, it is no longer needed
>+- License is GPLv3 or later
>+
> * Wed Mar 26 2008 Nalin Dahyabhai <nalin@redhat.com> - 1.4.9-1
> - update to 1.4.9 to fix a possible vulnerability in 1.4.8
> - add a disttag

Actions: View | Diff

Attachments on bug 447772: 306289