PGG incompatible with GnuPG >=2.0.10 (patch included)

PGG incompatible with GnuPG >=2.0.10 (patch included)

[Ulrich Mueller]

GnuPG has changed the output format for listing of keys with
"gpg --with-colons --list-keys". It doesn't merge the primary user ID
and the primary key any more:

,----[ GnuPG 2.0.9 ]
| tru::1:1245322604:0:3:1:5
| pub:-:1024:17:39EA32FE8222EEEC:2007-03-15:::-:Ulrich Mueller <ulm@kph.uni-mainz.de>::scESC:
| uid:-::::2007-04-14::6C417503DC0A22396443B86A6D17B18D33765C41::Ulrich Mueller <ulm@gentoo.org>:
| sub:-:2048:16:4CC72125BEE5C5AF:2007-03-15::::::e:
`----

,----[ GnuPG 2.0.11 ]
| tru::1:1245322604:0:3:1:5
| pub:-:1024:17:39EA32FE8222EEEC:1173998442:::-:::scESC:
| uid:-::::1176565513::5F7ECDB3196B011228D6B4CE204DC59E1E588022::Ulrich Mueller <ulm@kph.uni-mainz.de>:
| uid:-::::1176565069::6C417503DC0A22396443B86A6D17B18D33765C41::Ulrich Mueller <ulm@gentoo.org>:
| sub:-:2048:16:4CC72125BEE5C5AF:1173998442::::::e:
`----

The format of the "colon listings" is described here:
<http://cvs.gnupg.org/cgi-bin/viewcvs.cgi/*checkout*/tags/gnupg-2.0.11/doc/DETAILS?rev=4943&root=GnuPG>

Unfortunately, PGG expects the user ID in the "pub" line and therefore
fails to parse the new output format. Attached is a patch that fixes
the problem for me.

Ulrich


2009-06-18  Ulrich Mueller  <ulm@kph.uni-mainz.de>

	* pgg-gpg.el (pgg-gpg-lookup-key-owner): Change regexp to make
	parsing of keys work with GnuPG 2.0.10 and later.

--- emacs-orig/lisp/pgg-gpg.el
+++ emacs-lisp/pgg-gpg.el
@@ -189,9 +189,9 @@
   (let ((args (list "--with-colons" "--no-greeting" "--batch"
 		    (if all "--list-secret-keys" "--list-keys")
 		    string))
-	(key-regexp (concat "^\\(sec\\|pub\\)"
+	(key-regexp (concat "^\\(sec\\|pub\\|uid\\)"
 			    ":[^:]*:[^:]*:[^:]*:\\([^:]*\\):[^:]*"
-			    ":[^:]*:[^:]*:[^:]*:\\([^:]*\\):")))
+			    ":[^:]*:[^:]*:[^:]*:\\([^:]+\\):")))
     (with-temp-buffer
       (apply #'call-process pgg-gpg-program nil t nil args)
       (goto-char (point-min))

Re: PGG incompatible with GnuPG >=2.0.10 (patch included)

[Chong Yidong]

Ulrich Mueller <ulm@kph.uni-mainz.de> writes:

> GnuPG has changed the output format for listing of keys with
> "gpg --with-colons --list-keys". It doesn't merge the primary user ID
> and the primary key any more:
>
> Unfortunately, PGG expects the user ID in the "pub" line and therefore
> fails to parse the new output format. Attached is a patch that fixes
> the problem for me.

Does this patch behave properly for prior versions of GnuPG?  Could you
test?

Re: PGG incompatible with GnuPG >=2.0.10 (patch included)

[Ulrich Mueller]

>>>>> On Thu, 18 Jun 2009, Chong Yidong wrote:

>> Unfortunately, PGG expects the user ID in the "pub" line and therefore
>> fails to parse the new output format. Attached is a patch that fixes
>> the problem for me.

> Does this patch behave properly for prior versions of GnuPG?  Could you
> test?

Sorry, I forgot to mention this. I've tested it with GnuPG versions
2.0.11, 2.0.9, and 1.4.9. It seems to work fine with all of them.

Ulrich

Re: PGG incompatible with GnuPG >=2.0.10 (patch included)

[Chong Yidong]

Ulrich Mueller <ulm@gentoo.org> writes:

>>>>>> On Thu, 18 Jun 2009, Chong Yidong wrote:
>
>>> Unfortunately, PGG expects the user ID in the "pub" line and therefore
>>> fails to parse the new output format. Attached is a patch that fixes
>>> the problem for me.
>
>> Does this patch behave properly for prior versions of GnuPG?  Could you
>> test?
>
> Sorry, I forgot to mention this. I've tested it with GnuPG versions
> 2.0.11, 2.0.9, and 1.4.9. It seems to work fine with all of them.

Thanks.  I went ahead and checked it in, so that it will be in the
upcoming pretest.  Daiki, do you see any problem with the patch?

--- emacs-orig/lisp/pgg-gpg.el
+++ emacs-lisp/pgg-gpg.el
@@ -189,9 +189,9 @@
   (let ((args (list "--with-colons" "--no-greeting" "--batch"
 		    (if all "--list-secret-keys" "--list-keys")
 		    string))
-	(key-regexp (concat "^\\(sec\\|pub\\)"
+	(key-regexp (concat "^\\(sec\\|pub\\|uid\\)"
 			    ":[^:]*:[^:]*:[^:]*:\\([^:]*\\):[^:]*"
-			    ":[^:]*:[^:]*:[^:]*:\\([^:]*\\):")))
+			    ":[^:]*:[^:]*:[^:]*:\\([^:]+\\):")))
     (with-temp-buffer
       (apply #'call-process pgg-gpg-program nil t nil args)
       (goto-char (point-min))

Re: PGG incompatible with GnuPG >=2.0.10 (patch included)

[Daiki Ueno]

>>>>> In <87d491o2g7.fsf@stupidchicken.com> 
>>>>>	Chong Yidong <cyd@stupidchicken.com> wrote:
> >>> Unfortunately, PGG expects the user ID in the "pub" line and therefore
> >>> fails to parse the new output format. Attached is a patch that fixes
> >>> the problem for me.

> Thanks.  I went ahead and checked it in, so that it will be in the
> upcoming pretest.  Daiki, do you see any problem with the patch?

Looks fine with me.  Thanks Ulrich for the patch.

Regards,
-- 
Daiki Ueno