Merge ~adrien/ubuntu/+source/gnupg2:plucky-broken into ubuntu/+source/gnupg2:ubuntu/devel

[Adrien Nader]

Remove the logic in d/rules that builds gpgv-win32.exe which a) needs a
mingw-w64 toolchain, and b) is only used by debian-installer.
It seems to cause more failures than should be warranted because it's
custom build logic in d/rules. Since we don't need it, we can just drop
it.

Please review this merge request. In addition to the git commits, a
debdiff will be posted in the comments.

# 📊 PPA
A PPA is available at:
 https://launchpad.net/~adrien/+archive/ubuntu/plucky-gnupg2-broken

# 🧪 Autopkgtest results
- ✅ gnupg2 on plucky for arm64 @ 10.01.25 15:05:41
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-adrien-plucky-gnupg2-broken/plucky/arm64/g/gnupg2/20250110_150541_9ed87@/log.gz
- ✅ gnupg2 on plucky for armhf @ 10.01.25 15:08:09
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-adrien-plucky-gnupg2-broken/plucky/armhf/g/gnupg2/20250110_150809_8f6ca@/log.gz
- ✅ gnupg2 on plucky for ppc64el @ 10.01.25 15:04:27
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-adrien-plucky-gnupg2-broken/plucky/ppc64el/g/gnupg2/20250110_150427_45643@/log.gz

Waiting for results on other arches. My -20 version was passing and this was a simple rebase. At the moment, amd64 and i386 are stuck so there won't be results for them probably, only for s390x.

# 🔍 Lintian diff from most recent published package
No change

[Simon Quigley (tsimonq2)]

Comments inline

review: Needs Fixing

21a0980... by Adrien Nader on 2025-01-10

reconstruct-changelog

[Adrien Nader (adrien)]

I've rebased the branch on top of the latest gnupg2 version and all the diff markers in LP's diff preview have indeed vanished. :)

[Simon Quigley (tsimonq2)]

review: Approve

[Erich Eickmeyer (eeickmeyer)]

LGTM

review: Approve

Unmerged commits

21a0980... by Adrien Nader on 2025-01-10

reconstruct-changelog

6d8230d... by Adrien Nader on 2024-12-02

  * Don't build the gpgv-win32 package which only debian-installer uses

diff --git a/debian/changelog b/debian/changelog
index 02b2490..8d526d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnupg2 (2.4.4-2ubuntu22) plucky; urgency=medium
+
+  * Don't build the gpgv-win32 package which only debian-installer uses
+
+ -- Adrien Nader <[e-mail]>  Fri, 10 Jan 2025 14:24:01 +0100
+
 gnupg2 (2.4.4-2ubuntu21) plucky; urgency=medium
 
   * revert-rfc4880bis.patch: Revert the "LibrePGP" changes that introduce
diff --git a/debian/control b/debian/control
index 704833d..0bcf4e7 100644
--- a/debian/control
+++ b/debian/control
@@ -29,15 +29,6 @@ Build-Depends:
  pkg-config,
  texinfo,
  zlib1g-dev | libz-dev,
-Build-Depends-Indep:
- binutils-multiarch [!amd64 !i386],
- libassuan-mingw-w64-dev (>= 2.5.0),
- libgcrypt-mingw-w64-dev (>= 1.9.1),
- libgpg-error-mingw-w64-dev (>= 1.46),
- libksba-mingw-w64-dev (>= 1.6.3),
- libnpth-mingw-w64-dev (>= 1.2),
- libz-mingw-w64-dev,
- mingw-w64,
 Vcs-Git: https://salsa.debian.org/debian/gnupg2.git -b debian/main
 Vcs-Browser: https://salsa.debian.org/debian/gnupg2
 Homepage: https://www.gnupg.org/
@@ -423,24 +414,6 @@ Description: minimal signature verification tool (static build)
  installs on these platforms by using the full Debian signature
  verification that is present in all official Debian mirrors.
 
-Package: gpgv-win32
-Architecture: all
-Multi-Arch: foreign
-Depends:
- ${misc:Depends},
-Suggests:
- wine,
-Description: GNU privacy guard - signature verification tool (win32 build)
- GnuPG is GNU's tool for secure communication and data storage.
- .
- gpgv is a stripped-down version of gnupg which is only able to check
- signatures.  It is smaller than the full-blown gnupg and uses a
- different (and simpler) way to check that the public keys used to
- make the signature are trustworthy.
- .
- This is a win32 version of gpgv.  It's meant to be used by the win32-loader
- component of Debian-Installer.
-
 Package: gnupg-l10n
 Section: localization
 Architecture: all
diff --git a/debian/gpgv-win32.install b/debian/gpgv-win32.install
deleted file mode 100644
index cf3cd8c..0000000
--- a/debian/gpgv-win32.install
+++ /dev/null
@@ -1 +0,0 @@
-build-gpgv-win32/g10/gpgv.exe usr/share/win32
diff --git a/debian/rules b/debian/rules
index 81590a1..b9e0d31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,24 +64,6 @@ override_dh_auto_build-arch:
 	cd build-gpgv-static/g10 && $(MAKE) LDFLAGS="$$LDFLAGS $(GPGV_STATIC_HARDENING) -static" gpgv
 	mv build-gpgv-static/g10/gpgv build-gpgv-static/g10/gpgv-static
 
-override_dh_auto_build-indep:
-	mkdir -p build-gpgv-win32
-	cd build-gpgv-win32 && $(WIN32_FLAGS) ../configure \
-	   	$(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x)) \
-		$(foreach x, libgpg-error libgcrypt libassuan ksba npth, --with-$x-prefix=/usr/i686-w64-mingw32) \
-		--enable-gpg2-is-gpg \
-		--with-zlib=/usr/i686-w64-mingw \
-		--prefix=/usr/i686-w64-mingw32 \
-		--host i686-w64-mingw32
-	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libgpgrl.a
-	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libsimple-pwquery.a
-	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libcommonpth.a
-	cd build-gpgv-win32/kbx && $(WIN32_FLAGS) $(MAKE) libkeybox.a
-	cd build-gpgv-win32/regexp && $(WIN32_FLAGS) $(MAKE) libregexp.a
-	cd build-gpgv-win32/g10 && $(WIN32_FLAGS) $(MAKE) gpgv.exe
-	strip build-gpgv-win32/g10/gpgv.exe
-
-
 override_dh_auto_test:
 	dh_auto_test --builddirectory=build -- verbose=3 TESTFLAGS=$(AUTOTEST_FLAGS)
 
diff --git a/debian/tests/gpgv-win32 b/debian/tests/gpgv-win32
deleted file mode 100755
index 035c060..0000000
--- a/debian/tests/gpgv-win32
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export GNUPGHOME=$(mktemp -d)
-gpgargs=(--batch --quiet --pinentry-mode=loopback --passphrase '' --with-colons)
-
-# Generate a minimal signing key:
-gpg "${gpgargs[@]}" --quick-gen-key 'Test key for gpgv-win32 <[e-mail]>'
-
-gpg "${gpgargs[@]}" -o "$GNUPGHOME/key.gpg" --export [e-mail]
-
-# Sign this very script
-rm -f "${0}.gpg"
-gpg "${gpgargs[@]}" --output "${0}.gpg" --detach-sign "${0}"
-
-# Verify using gpgv
-gpgv --quiet --status-fd 3 3> native.status --keyring "$GNUPGHOME/key.gpg" "${0}.gpg" "${0}"
-
-WINE=/usr/lib/wine/wine
-export WINESERVER=/usr/lib/wine/wineserver32
-
-# Verify using gpgv.exe (using --status-fd 1 because i don't know how
-# to pass a non-standard file descriptor into wine)
-"$WINE" /usr/share/win32/gpgv.exe --quiet --status-fd 1 > win32.status --keyring "Z://${GNUPGHOME}/key.gpg" "${0}.gpg" "${0}" 
-
-# convert to unix newlines if necessary:
-sed -i 's/\r$//' win32.status
-
-diff -u native.status win32.status
-
-head -v win32.status
-
-rm -rf "$GNUPGHOME"