[arch-commits] Commit in gnupg/repos (3 files)

[andyrtr at archlinux.org]

    Date: Friday, September 4, 2009 @ 14:46:22
  Author: andyrtr
Revision: 51081

Merged revisions 51076 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gnupg/trunk

........
  r51076 | andyrtr | 2009-09-04 20:42:58 +0200 (Fr, 04 Sep 2009) | 2 lines
  
  upgpkg: gnupg 1.4.10-1
      new version 1.4.10; drop unneeded patch; fix a fileconflict with gnupg2
........

Modified:
  gnupg/repos/extra-i686/	(properties)
  gnupg/repos/extra-i686/PKGBUILD
Deleted:
  gnupg/repos/extra-i686/buildfix.patch

----------------+
 PKGBUILD       |   28 ++++++++++++----------------
 buildfix.patch |   51 ---------------------------------------------------
 2 files changed, 12 insertions(+), 67 deletions(-)


Property changes on: gnupg/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnupg/trunk:1-42858
   + /gnupg/trunk:1-51078

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-09-04 18:46:00 UTC (rev 51080)
+++ extra-i686/PKGBUILD	2009-09-04 18:46:22 UTC (rev 51081)
@@ -1,29 +1,25 @@
 # $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Committer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=gnupg
-pkgver=1.4.9
-pkgrel=4
+pkgver=1.4.10
+pkgrel=1
 pkgdesc="GNU Privacy Guard - a PGP replacement tool"
 arch=(i686 x86_64)
 license=('GPL3')
 depends=('zlib' 'bzip2' 'libldap' 'libusb' 'curl>=7.16.2' 'readline>=6.0.00')
-source=(ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/$pkgname-$pkgver.tar.bz2
-        buildfix.patch)
+source=(ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/$pkgname-$pkgver.tar.bz2)
 install=gnupg.install
 url="http://www.gnupg.org/"
-md5sums=('cc52393087480ac8d245625004a6a30c'
-         'f7e9f40964bed7e9722ec07ba4fae9a6')
+md5sums=('dcf7ed712997888d616e029637bfc303')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  # http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html
-  patch -Np0 -i ../buildfix.patch || return 1
-  ./configure --prefix=/usr --libexecdir=/usr/lib
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --libexecdir=/usr/lib # docdir can't be set properly
   make || return 1
-  ln -s $pkgname-$pkgver/scripts ..
-  make DESTDIR=$startdir/pkg install
-
-  for i in $pkgdir/usr/share/info/*; do gzip -9 $i; done
-  rm -f $pkgdir/usr/share/info/dir
+  ln -s ${pkgname}-${pkgver}/scripts ..
+  make DESTDIR=${pkgdir} install || return 1
+  
+  # fix fileconflict with gnupg2 pkg
+  rm ${pkgdir}/usr/share/man/man1/gpg-zip.1
 }

Deleted: extra-i686/buildfix.patch
===================================================================
--- extra-i686/buildfix.patch	2009-09-04 18:46:00 UTC (rev 51080)
+++ extra-i686/buildfix.patch	2009-09-04 18:46:22 UTC (rev 51081)
@@ -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