Date: Tuesday, June 24, 2014 @ 18:13:52 Author: bisson Revision: 215418
upstream update Modified: gnupg/trunk/PKGBUILD Deleted: gnupg/trunk/libgcrypt.patch -----------------+ PKGBUILD | 13 +++++-------- libgcrypt.patch | 28 ---------------------------- 2 files changed, 5 insertions(+), 36 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-06-24 15:10:27 UTC (rev 215417) +++ PKGBUILD 2014-06-24 16:13:52 UTC (rev 215418) @@ -5,8 +5,8 @@ # Contributor: Judd Vinet <[email protected]> pkgname=gnupg -pkgver=2.0.23 -pkgrel=2 +pkgver=2.0.24 +pkgrel=1 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' license=('GPL') @@ -17,11 +17,9 @@ makedepends=('curl' 'libldap' 'libusb-compat') depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr') source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} - 'protect-tool-env.patch' - 'libgcrypt.patch') -sha1sums=('c90e47ab95a40dd070fd75faef0a05c7b679553b' 'SKIP' - '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db' - '700c462d7d106b845b655165b127e2b66cad3e30') + 'protect-tool-env.patch') +sha1sums=('010e027d5f622778cadc4c124013fe515ed705cf' 'SKIP' + '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db') install=install @@ -32,7 +30,6 @@ prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../protect-tool-env.patch # FS#31900 - patch -p1 -i ../libgcrypt.patch # FS#40552 } build() { Deleted: libgcrypt.patch =================================================================== --- libgcrypt.patch 2014-06-24 15:10:27 UTC (rev 215417) +++ libgcrypt.patch 2014-06-24 16:13:52 UTC (rev 215418) @@ -1,28 +0,0 @@ -From ceef5568d53b286efe639c6fd1d37f154be133ef Mon Sep 17 00:00:00 2001 -From: Werner Koch <[email protected]> -Date: Mon, 23 Jun 2014 13:16:44 +0200 -Subject: [PATCH] ssh: Fix for newer Libgcrypt versions. - -* common/ssh-utils.c (get_fingerprint): Add GCRY_PK_ECC case. --- - -Reported-by: Anatol Pomozov ---- - common/ssh-utils.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/common/ssh-utils.c b/common/ssh-utils.c -index d8f057d..11ff0fb 100644 ---- a/common/ssh-utils.c -+++ b/common/ssh-utils.c -@@ -89,6 +89,7 @@ get_fingerprint (gcry_sexp_t key, void **r_fpr, size_t *r_len, - elems = "pqgy"; - gcry_md_write (md, "\0\0\0\x07ssh-dss", 11); - break; -+ case GCRY_PK_ECC: - case GCRY_PK_ECDSA: - /* We only support the 3 standard curves for now. It is just a - quick hack. */ --- -2.0.0 -
