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

Proposed by Adrien Nader
Status: Needs review
Proposed branch: ~adrien/ubuntu/+source/gnupg2:plucky-broken
Merge into: ubuntu/+source/gnupg2:ubuntu/devel
Diff against target: 135 lines (+6/-79)
4 files modified
debian/changelog (+6/-0)
debian/control (+0/-27)
debian/rules (+0/-18)
dev/null (+0/-34)
Reviewer Review Type Date Requested Status
Erich Eickmeyer (community) Approve
Simon Quigley (community) Approve
git-ubuntu import Pending
Review via email: mp+477839@code.launchpad.net

Commit message

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.

Description of the change

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

To post a comment you must log in.
Revision history for this message
Simon Quigley (tsimonq2) wrote :

Comments inline

review: Needs Fixing
Revision history for this message
Adrien Nader (adrien) :
21a0980... by Adrien Nader

reconstruct-changelog

Revision history for this message
Adrien Nader (adrien) wrote :

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. :)

Revision history for this message
Simon Quigley (tsimonq2) :
review: Approve
Revision history for this message
Erich Eickmeyer (eeickmeyer) wrote :

LGTM

review: Approve

Unmerged commits

21a0980... by Adrien Nader

reconstruct-changelog

6d8230d... by Adrien Nader

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 02b2490..8d526d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1gnupg2 (2.4.4-2ubuntu22) plucky; urgency=medium
2
3 * Don't build the gpgv-win32 package which only debian-installer uses
4
5 -- Adrien Nader <adrien.nader@canonical.com> Fri, 10 Jan 2025 14:24:01 +0100
6
1gnupg2 (2.4.4-2ubuntu21) plucky; urgency=medium7gnupg2 (2.4.4-2ubuntu21) plucky; urgency=medium
28
3 * revert-rfc4880bis.patch: Revert the "LibrePGP" changes that introduce9 * 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:
29 pkg-config,29 pkg-config,
30 texinfo,30 texinfo,
31 zlib1g-dev | libz-dev,31 zlib1g-dev | libz-dev,
32Build-Depends-Indep:
33 binutils-multiarch [!amd64 !i386],
34 libassuan-mingw-w64-dev (>= 2.5.0),
35 libgcrypt-mingw-w64-dev (>= 1.9.1),
36 libgpg-error-mingw-w64-dev (>= 1.46),
37 libksba-mingw-w64-dev (>= 1.6.3),
38 libnpth-mingw-w64-dev (>= 1.2),
39 libz-mingw-w64-dev,
40 mingw-w64,
41Vcs-Git: https://salsa.debian.org/debian/gnupg2.git -b debian/main32Vcs-Git: https://salsa.debian.org/debian/gnupg2.git -b debian/main
42Vcs-Browser: https://salsa.debian.org/debian/gnupg233Vcs-Browser: https://salsa.debian.org/debian/gnupg2
43Homepage: https://www.gnupg.org/34Homepage: https://www.gnupg.org/
@@ -423,24 +414,6 @@ Description: minimal signature verification tool (static build)
423 installs on these platforms by using the full Debian signature414 installs on these platforms by using the full Debian signature
424 verification that is present in all official Debian mirrors.415 verification that is present in all official Debian mirrors.
425416
426Package: gpgv-win32
427Architecture: all
428Multi-Arch: foreign
429Depends:
430 ${misc:Depends},
431Suggests:
432 wine,
433Description: GNU privacy guard - signature verification tool (win32 build)
434 GnuPG is GNU's tool for secure communication and data storage.
435 .
436 gpgv is a stripped-down version of gnupg which is only able to check
437 signatures. It is smaller than the full-blown gnupg and uses a
438 different (and simpler) way to check that the public keys used to
439 make the signature are trustworthy.
440 .
441 This is a win32 version of gpgv. It's meant to be used by the win32-loader
442 component of Debian-Installer.
443
444Package: gnupg-l10n417Package: gnupg-l10n
445Section: localization418Section: localization
446Architecture: all419Architecture: all
diff --git a/debian/gpgv-win32.install b/debian/gpgv-win32.install
447deleted file mode 100644420deleted file mode 100644
index cf3cd8c..0000000
--- a/debian/gpgv-win32.install
+++ /dev/null
@@ -1 +0,0 @@
1build-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:
64 cd build-gpgv-static/g10 && $(MAKE) LDFLAGS="$$LDFLAGS $(GPGV_STATIC_HARDENING) -static" gpgv64 cd build-gpgv-static/g10 && $(MAKE) LDFLAGS="$$LDFLAGS $(GPGV_STATIC_HARDENING) -static" gpgv
65 mv build-gpgv-static/g10/gpgv build-gpgv-static/g10/gpgv-static65 mv build-gpgv-static/g10/gpgv build-gpgv-static/g10/gpgv-static
6666
67override_dh_auto_build-indep:
68 mkdir -p build-gpgv-win32
69 cd build-gpgv-win32 && $(WIN32_FLAGS) ../configure \
70 $(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x)) \
71 $(foreach x, libgpg-error libgcrypt libassuan ksba npth, --with-$x-prefix=/usr/i686-w64-mingw32) \
72 --enable-gpg2-is-gpg \
73 --with-zlib=/usr/i686-w64-mingw \
74 --prefix=/usr/i686-w64-mingw32 \
75 --host i686-w64-mingw32
76 cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libgpgrl.a
77 cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libsimple-pwquery.a
78 cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libcommonpth.a
79 cd build-gpgv-win32/kbx && $(WIN32_FLAGS) $(MAKE) libkeybox.a
80 cd build-gpgv-win32/regexp && $(WIN32_FLAGS) $(MAKE) libregexp.a
81 cd build-gpgv-win32/g10 && $(WIN32_FLAGS) $(MAKE) gpgv.exe
82 strip build-gpgv-win32/g10/gpgv.exe
83
84
85override_dh_auto_test:67override_dh_auto_test:
86 dh_auto_test --builddirectory=build -- verbose=3 TESTFLAGS=$(AUTOTEST_FLAGS)68 dh_auto_test --builddirectory=build -- verbose=3 TESTFLAGS=$(AUTOTEST_FLAGS)
8769
diff --git a/debian/tests/gpgv-win32 b/debian/tests/gpgv-win32
88deleted file mode 10075570deleted file mode 100755
index 035c060..0000000
--- a/debian/tests/gpgv-win32
+++ /dev/null
@@ -1,34 +0,0 @@
1#!/bin/bash
2
3set -e
4
5export GNUPGHOME=$(mktemp -d)
6gpgargs=(--batch --quiet --pinentry-mode=loopback --passphrase '' --with-colons)
7
8# Generate a minimal signing key:
9gpg "${gpgargs[@]}" --quick-gen-key 'Test key for gpgv-win32 <test-key@example.com>'
10
11gpg "${gpgargs[@]}" -o "$GNUPGHOME/key.gpg" --export test-key@example.com
12
13# Sign this very script
14rm -f "${0}.gpg"
15gpg "${gpgargs[@]}" --output "${0}.gpg" --detach-sign "${0}"
16
17# Verify using gpgv
18gpgv --quiet --status-fd 3 3> native.status --keyring "$GNUPGHOME/key.gpg" "${0}.gpg" "${0}"
19
20WINE=/usr/lib/wine/wine
21export WINESERVER=/usr/lib/wine/wineserver32
22
23# Verify using gpgv.exe (using --status-fd 1 because i don't know how
24# to pass a non-standard file descriptor into wine)
25"$WINE" /usr/share/win32/gpgv.exe --quiet --status-fd 1 > win32.status --keyring "Z://${GNUPGHOME}/key.gpg" "${0}.gpg" "${0}"
26
27# convert to unix newlines if necessary:
28sed -i 's/\r$//' win32.status
29
30diff -u native.status win32.status
31
32head -v win32.status
33
34rm -rf "$GNUPGHOME"

Subscribers

People subscribed via source and target branches