[pkg-gnupg-maint] Bug#906545: Bug#906545: gnupg 2.1 (in stretch) fails to fetch some ECC keys

[Roger Shimizu]

Dear Niibe-san,

Thanks for your checking!

On Mon, Aug 20, 2018 at 6:04 PM, NIIBE Yutaka <gniibe at fsij.org> wrote:
>
> In the upstream, it was fixed by the commit:
>
>     commit 9b12b45aa5e67d4d422bf75a3879df1d52dbe67f
>     Author: Justus Winter <justus at g10code.com>
>     Date:   Tue Jun 13 15:35:01 2017 +0200
>
>         gpg: Check and fix keys on import.
>
>         * doc/gpg.texi: Document the new import option.
>         * g10/gpg.c (main): Make the new option default to yes.
>         * g10/import.c (parse_import_options): Parse the new option.
>         (import_one): Act on the new option.
>         * g10/options.h (IMPORT_REPAIR_KEYS): New macro.
>
>         GnuPG-bug-id: 2236
>         Signed-off-by: Justus Winter <justus at g10code.com>

Above commit seems to depend on 404fa8211b6188a0abe83ef43a4b44d528c0b035
I cherry-picked both commits, and pushed to salsa, branch rosh/Bug906545:
- https://salsa.debian.org/debian/gnupg2/tree/rosh/Bug906545

But the build failed, enclosed is the error log:

gcc -DHAVE_CONFIG_H -I. -I../../g10 -I..  -I../../common
-DLOCALEDIR=\"/usr/share/locale\" -DGNUPG_BINDIR="\"/usr/bin\"" -
DGNUPG_LIBEXECDIR="\"/usr/lib/x86_64-linux-gnu\""
-DGNUPG_LIBDIR="\"/usr/lib/x86_64-linux-gnu/gnupg\""
-DGNUPG_DATADIR="\"/usr/share/gnupg\""
-DGNUPG_SYSCONFDIR="\"/etc/gnupg\"" -DGNUPG_LOCALSTATEDIR="\"/var\""
    -Wdate-time -D_FORTIFY_SOURCE=2     -Wall -Wno-pointer-sign
-Wpointer-arith  -g -O2 -fdebug-prefix-map=/data/rosh/working/gnupg2=.
-fstack-protector-strong -Wformat -Werror=format-security -c -o
keyedit.o ../../g10/keyedit.c
../../g10/keyedit.c: In function ‘fix_keyblock’:
../../g10/keyedit.c:1176:30: error: ‘ctrl’ undeclared (first use in
this function)
   if (key_check_all_keysigs (ctrl, *keyblockp, 0, 1))
                              ^~~~
../../g10/keyedit.c:1176:30: note: each undeclared identifier is
reported only once for each function it appears in
Makefile:889: recipe for target 'keyedit.o' failed

I'd like to leave this to pkg maintainer, whether to backport those
patches, or release a latest 2.1.x for stretch.

Cheers,
-- 
Roger Shimizu, GMT +9 Tokyo
PGP/GPG: 4096R/6C6ACD6417B3ACB1