From 046c0f7e9a12fa2377ce041865040cb446986b3e Mon Sep 17 00:00:00 2001
From: Thierry N <thierryn1 at hispeed dot ch>
Date: Fri, 14 Aug 2009 20:27:32 +0200
Subject: Ajout de buildfix.patch

---
 extra/gnupg1/.md5sum        |  1 +
 extra/gnupg1/Pkgfile        |  6 ++++--
 extra/gnupg1/buildfix.patch | 51 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 extra/gnupg1/buildfix.patch

(limited to 'extra/gnupg1')

diff --git a/extra/gnupg1/.md5sum b/extra/gnupg1/.md5sum
index 8abd3f31f..505ddb918 100644
--- a/extra/gnupg1/.md5sum
+++ b/extra/gnupg1/.md5sum
@@ -1 +1,2 @@
+f7e9f40964bed7e9722ec07ba4fae9a6  buildfix.patch
 cc52393087480ac8d245625004a6a30c  gnupg-1.4.9.tar.bz2
diff --git a/extra/gnupg1/Pkgfile b/extra/gnupg1/Pkgfile
index 2cc1af1a1..b59f81737 100644
--- a/extra/gnupg1/Pkgfile
+++ b/extra/gnupg1/Pkgfile
@@ -2,15 +2,17 @@
 # URL: 	http://www.gnupg.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: 
+# Depends on: bzip2,libusb, curl
 
 name=gnupg1
 version=1.4.9
 release=1
-source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$version.tar.bz2)
+source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$version.tar.bz2\
+	buildfix.patch)
 
 build() {
 	cd gnupg-$version
+	patch -Np0 -i ../buildfix.patch
 	./configure --prefix=/usr \
 	--libexecdir=/usr/lib
 	make
diff --git a/extra/gnupg1/buildfix.patch b/extra/gnupg1/buildfix.patch
new file mode 100644
index 000000000..bf165d09c
--- /dev/null
+++ b/extra/gnupg1/buildfix.patch
@@ -0,0 +1,51 @@
+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