[arch-commits] Commit in emacs/trunk (PKGBUILD gnupg21.patch)

[Gaetan Bisson]

    Date: Saturday, January 17, 2015 @ 21:20:44
  Author: bisson
Revision: 229491

fix FS#42972

Added:
  emacs/trunk/gnupg21.patch
Modified:
  emacs/trunk/PKGBUILD

---------------+
 PKGBUILD      |   14 +++++++++++---
 gnupg21.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-17 12:15:24 UTC (rev 229490)
+++ PKGBUILD	2015-01-17 20:20:44 UTC (rev 229491)
@@ -4,7 +4,7 @@
 
 pkgname=emacs
 pkgver=24.4
-pkgrel=1
+pkgrel=2
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
@@ -11,10 +11,18 @@
 license=('GPL3')
 depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls')
 install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig})
+validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199')
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}
+        gnupg21.patch)
 md5sums=('ad487658ad7421ad8d7b5152192eb945'
-         'SKIP')
+         'SKIP'
+         '0583d868e0e304bac3df95b7518615cd')
 
+prepare() {
+  cd "$srcdir"/$pkgname-$pkgver
+  patch -p1 -i ../gnupg21.patch
+}
+
 build() {
   cd "$srcdir"/$pkgname-$pkgver
   ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \

Added: gnupg21.patch
===================================================================
--- gnupg21.patch	                        (rev 0)
+++ gnupg21.patch	2015-01-17 20:20:44 UTC (rev 229491)
@@ -0,0 +1,28 @@
+From 135a9f4b5aead507c030fb7e3e8ad13aaa91f403 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno at gnu.org>
+Date: Fri, 07 Nov 2014 02:31:12 +0000
+Subject: epg: Adjust to GnuPG 2.1 key listing change
+
+* epg.el (epg--list-keys-1): Ignore fields after the 15th field
+(bug#18979).  Reported by Hideki Saito.
+---
+(limited to 'lisp/epg.el')
+
+diff --git a/lisp/epg.el b/lisp/epg.el
+index 0c74531..e4d8c1e 100644
+--- a/lisp/epg.el
++++ b/lisp/epg.el
+@@ -1278,8 +1278,9 @@ callback data (if any)."
+ 	      string (match-string 0)
+ 	      index 0
+ 	      field 0)
+-	(while (eq index
+-		   (string-match "\\([^:]+\\)?:" string index))
++	(while (and (< field (length (car keys)))
++		    (eq index
++			(string-match "\\([^:]+\\)?:" string index)))
+ 	  (setq index (match-end 0))
+ 	  (aset (car keys) field (match-string 1 string))
+ 	  (setq field (1+ field))))
+--
+cgit v0.9.0.2