gnupg: update to v2.5.19 (with libgpg-error 1.60 and libassuan 3.0.2)#29232
Draft
dscho wants to merge 3 commits intomsys2:masterfrom
Draft
gnupg: update to v2.5.19 (with libgpg-error 1.60 and libassuan 3.0.2)#29232dscho wants to merge 3 commits intomsys2:masterfrom
dscho wants to merge 3 commits intomsys2:masterfrom
Conversation
Assisted-by: Claude Opus 4.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Assisted-by: Claude Opus 4.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The version bump from 2.4.9 to 2.5.19 crosses into the development branch of GnuPG. Patch 05-gnupg-include-winber.patch was dropped because upstream already includes winldap.h and winber.h in dirmngr/ks-engine-ldap.c since the 2.5.x series. Patches 02 and 04 were refreshed against the new source (shifted line numbers and a copyright year change in configure.ac). A new patch 05-test-stringhelp-compare-filenames.patch fixes a pre-existing test failure in common/t-stringhelp where the make_filename_try tests compared tilde-expanded paths using strcmp, which fails on Windows because change_slashes() converts forward slashes to backslashes when the home directory (from $HOME) already contains backslashes. The fix uses compare_filenames() which treats both separators as equivalent on DOSISH systems. Assisted-by: Claude Opus 4.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Contributor
Author
|
Note: the |
Member
|
lgtm, we need rebuilds for pinentry and gpgme. I don't have permissions to push. |
Contributor
Author
|
"Semi-retracted" after reading up about the self-inflicted backward-incompatibility: https://lwn.net/Articles/1055053/ |
Collaborator
|
You've probably seen this already, but I split out the update for libgpg-error into a separate pull request: #29259 That is the part which should not contain any of this backwards-incompatible stuff and should therefore pass without much ado. Edit: I merged the libgpg-error 1.60 update over there. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This upgrades GnuPG from v2.4.9 to v2.5.19, the current stable release, together with its dependencies libgpg-error (v1.60) and libassuan (v3.0.2).
Why now?
GnuPG v2.5 has been promoted from "development" to stable. The download page now labels v2.5.19 as "GnuPG (stable)" and v2.4.9 as "GnuPG (oldstable)".
Werner Koch's (i.e. the primary GnuPG maintainer's) release announcement for v2.5.19 is explicit:
The EOL date for v2.4 is 2026-06-30, i.e. about two months from now. A companion PR for the MSYS2 build of GnuPG has been opened at msys2/MSYS2-packages#6224.
Dependency bumps
GnuPG v2.5 requires newer versions of two core libraries that the v2.4 series did not need:
These are separate commits so they can be reviewed and merged independently.
Patch changes
libgpg-error: Version bump only. All existing patches apply cleanly against v1.60.
libassuan: Dropped
0001-fix-def-files.mingw.patch(thegpgcedev.deffile no longer exists upstream, andlibassuan.defalready hasEXPORTSin the right place in v3.0.2). Refreshed the remaining four patches for context drift.gnupg:
05-gnupg-include-winber.patch: upstream already includeswinldap.handwinber.hindirmngr/ks-engine-ldap.csince the v2.5 series.02-mingw-sysconfigdir-under-prefix.patchand04-dos-extra-defs.patchfor shifted line numbers and a copyright year change inconfigure.ac.05-test-stringhelp-compare-filenames.patch: fixes a pre-existing test failure incommon/t-stringhelpwheremake_filename_trytests compared tilde-expanded paths usingstrcmp. On Windows,change_slashes()converts forward slashes to backslashes when$HOMEalready contains backslashes, so the comparison must usecompare_filenames()which treats both separators as equivalent.