[arch-commits] Commit in gnupg2/trunk (PKGBUILD gcc-43.patch)
Tobias Powalowski
tpowa at archlinux.org
Wed Jan 14 08:30:29 UTC 2009
Date: Wednesday, January 14, 2009 @ 03:30:29
Author: tpowa
Revision: 24137
upgpkg: gnupg2 2.0.10-1
Modified:
gnupg2/trunk/PKGBUILD
Deleted:
gnupg2/trunk/gcc-43.patch
--------------+
PKGBUILD | 9 +++------
gcc-43.patch | 49 -------------------------------------------------
2 files changed, 3 insertions(+), 55 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-01-14 08:18:38 UTC (rev 24136)
+++ PKGBUILD 2009-01-14 08:30:29 UTC (rev 24137)
@@ -1,14 +1,14 @@
# $Id$
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=gnupg2
-pkgver=2.0.9
+pkgver=2.0.10
pkgrel=1
pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool"
arch=(i686 x86_64)
depends=('libldap' 'curl>=7.16.2' 'bzip2' 'zlib' 'libksba>=1.0.2' 'libgcrypt' 'pth' 'libusb' 'libassuan>=1.0.4' 'pinentry' 'dirmngr')
license=('GPL')
options=('!makeflags')
-source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2 gcc-43.patch)
+source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2)
url="http://www.gnupg.org/"
build() {
@@ -16,13 +16,10 @@
# O2 breaks it on x86_64
[ "$CARCH" = "x86_64" ] && EXTRAOPTS="--disable-optimization"
- # fix gcc 43 compilation
- patch -Np0 -i ../gcc-43.patch || return 1
./configure --prefix=/usr --libexecdir=/usr/lib/gnupg2 $EXTRAOPTS
make || return 1
make DESTDIR=$startdir/pkg install
# move conflicting files
mv $startdir/pkg/usr/share/gnupg{,2}
}
-md5sums=('b41f3f6716a74c46a609a71853e85c7b'
- '185f19690d175cd21221ffb806f958ed')
+md5sums=('1cb778dd555f87685a8fde2f7113725e')
Deleted: gcc-43.patch
===================================================================
--- gcc-43.patch 2009-01-14 08:18:38 UTC (rev 24136)
+++ gcc-43.patch 2009-01-14 08:30:29 UTC (rev 24137)
@@ -1,49 +0,0 @@
---- 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)
More information about the arch-commits
mailing list