From c7614c60a4c2fc7a621b8bb58609eeab4a1efa62 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Thu, 14 Oct 2010 21:23:38 +0200
Subject: gnupg1, port nettoyé
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extra/gnupg1/Pkgfile        |  2 +-
 extra/gnupg1/buildfix.patch | 51 ---------------------------------------------
 2 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 extra/gnupg1/buildfix.patch

(limited to 'extra')

diff --git a/extra/gnupg1/Pkgfile b/extra/gnupg1/Pkgfile
index 1ec736d11..4e950c929 100644
--- a/extra/gnupg1/Pkgfile
+++ b/extra/gnupg1/Pkgfile
@@ -8,7 +8,7 @@ name=gnupg1
 version=1.4.9
 release=1
 source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$version.tar.bz2\
-	buildfix.patch)
+	http://nutyx.meticul.eu/files/patchs/$name/buildfix.patch)
 
 build() {
 	cd gnupg-$version
diff --git a/extra/gnupg1/buildfix.patch b/extra/gnupg1/buildfix.patch
deleted file mode 100644
index bf165d09c..000000000
--- a/extra/gnupg1/buildfix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: gpgkeys_curl.c
-===================================================================
---- keyserver/gpgkeys_curl.c	(revision 4741)
-+++ keyserver/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
-===================================================================
---- keyserver/gpgkeys_hkp.c	(revision 4741)
-+++ keyserver/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)
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2