[pkg-gnupg-maint] Bug#895770: gnupg2 FTCBFS: yat2m: Exec format error

[Helmut Grohne]

Package: libgpg-error-dev
Version: 1.29-3
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

Since libgpg-error-dev ships the yat2m binary, gnupg2 fails to cross
build from source. gnupg2 checks for a yat2m binary. When that fails, it
falls back to its own internal copy of yat2m. Now it no longer does and
since yat2m is stuffed into the development package, gnupg2 now fails
with an Exec format error while running libgpg-error-dev's yat2m.

One solution is not to ship yat2m. Another is splitting it out into a
package that is marked Multi-Arch: foreign. The latter solution is
implemented in the attached patch. Please choose wisely.

Helmut
-------------- next part --------------
diff --minimal -Nru libgpg-error-1.29/debian/changelog libgpg-error-1.29/debian/changelog
--- libgpg-error-1.29/debian/changelog	2018-04-14 20:49:44.000000000 +0200
+++ libgpg-error-1.29/debian/changelog	2018-04-15 21:37:07.000000000 +0200
@@ -1,3 +1,10 @@
+libgpg-error (1.29-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move yat2m to a Multi-Arch: foreign package. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sun, 15 Apr 2018 21:37:07 +0200
+
 libgpg-error (1.29-3) unstable; urgency=medium
 
   * fix yat2m build for cross-compilation
diff --minimal -Nru libgpg-error-1.29/debian/control libgpg-error-1.29/debian/control
--- libgpg-error-1.29/debian/control	2018-04-13 23:11:11.000000000 +0200
+++ libgpg-error-1.29/debian/control	2018-04-15 21:37:05.000000000 +0200
@@ -22,6 +22,7 @@
 Architecture: any
 Depends:
  libgpg-error0 (= ${binary:Version}),
+ libgpg-error-dev-bin (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: library for common error values and messages in GnuPG components (development)
@@ -32,6 +33,22 @@
  This package contains the headers and other files needed to compile
  against this library.
 
+Package: libgpg-error-dev-bin
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Breaks: libgpg-error-dev (<< 1.29-3.1~)
+Replaces: libgpg-error-dev (<< 1.29-3.1~)
+Description: library for common error values and messages in GnuPG components (development tools)
+ Library that defines common error values for all GnuPG
+ components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
+ pinentry, SmartCard Daemon and possibly more in the future.
+ .
+ This package is an implementation detail. Please use libgpg-error-dev.
+
 Package: libgpg-error0
 Architecture: any
 Multi-Arch: same
diff --minimal -Nru libgpg-error-1.29/debian/libgpg-error-dev-bin.install libgpg-error-1.29/debian/libgpg-error-dev-bin.install
--- libgpg-error-1.29/debian/libgpg-error-dev-bin.install	1970-01-01 01:00:00.000000000 +0100
+++ libgpg-error-1.29/debian/libgpg-error-dev-bin.install	2018-04-15 21:36:01.000000000 +0200
@@ -0,0 +1 @@
+usr/bin/yat2m
diff --minimal -Nru libgpg-error-1.29/debian/libgpg-error-dev-bin.manpages libgpg-error-1.29/debian/libgpg-error-dev-bin.manpages
--- libgpg-error-1.29/debian/libgpg-error-dev-bin.manpages	1970-01-01 01:00:00.000000000 +0100
+++ libgpg-error-1.29/debian/libgpg-error-dev-bin.manpages	2018-04-15 21:36:22.000000000 +0200
@@ -0,0 +1 @@
+debian/yat2m.1
diff --minimal -Nru libgpg-error-1.29/debian/libgpg-error-dev.install.in libgpg-error-1.29/debian/libgpg-error-dev.install.in
--- libgpg-error-1.29/debian/libgpg-error-dev.install.in	2018-03-16 17:30:28.000000000 +0100
+++ libgpg-error-1.29/debian/libgpg-error-dev.install.in	2018-04-15 21:35:48.000000000 +0200
@@ -1,4 +1,4 @@
-usr/bin/*
+usr/bin/g*
 usr/include/* usr/include/@DEB_HOST_MULTIARCH@/
 usr/lib/*/libgpg-error.a
 usr/lib/*/libgpg-error.so
diff --minimal -Nru libgpg-error-1.29/debian/libgpg-error-dev.manpages libgpg-error-1.29/debian/libgpg-error-dev.manpages
--- libgpg-error-1.29/debian/libgpg-error-dev.manpages	2018-03-16 17:30:28.000000000 +0100
+++ libgpg-error-1.29/debian/libgpg-error-dev.manpages	2018-04-15 21:36:24.000000000 +0200
@@ -1,3 +1,2 @@
 debian/gpg-error.1
 debian/tmp/usr/share/man/man1/gpg-error-config.1
-debian/yat2m.1