From 62ee2060bbcfdb5b36a0ab41dc212e76b2a08815 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 4 Jun 2024 19:09:11 +0200 Subject: [PATCH] package/pinentry: bump to version 1.3.0 For change log, see [1] License file hash changed, after updating the FSF address in [2]. The sha256 hash is moved out the "Locally computed" section in the hash file, since it is now published on [3]. pinentry 1.3.0 updated its gpg-error.m4 macro file in [4] to detect gpgrt-config. Its path needs to be forced in _CONF_ENV to make sure it will work in all host environments. See the log entry of commit d7f2d8403e "package/gnupg2: fix build failure when host provides an old gpgrt-config" [5] for a complete explanation. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=blob;f=NEWS;h=1ea7e76f836fe15fe7c59b954d7aab768bd090e6 [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=commitdiff;h=66abf7cb1e1bde1ec71e13690dc6d6944c89cae9 [3] https://www.gnupg.org/download/integrity_check.html [4] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=commitdiff;h=21e85333f9669ef369376e83eb80ccd7a8933842 [5] https://gitlab.com/buildroot.org/buildroot/-/commit/d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/pinentry/pinentry.hash | 6 +++--- package/pinentry/pinentry.mk | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/pinentry/pinentry.hash b/package/pinentry/pinentry.hash index 187c86f9bd..9c54520da6 100644 --- a/package/pinentry/pinentry.hash +++ b/package/pinentry/pinentry.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 29daaf45f15cb5b8ec9b4a06284343f7a87082fb pinentry-1.2.1.tar.bz2 +sha1 28effa1722865786cb984f3099a32db40f96ea26 pinentry-1.3.0.tar.bz2 +sha256 9b3cd5226e7597f2fded399a3bc659923351536559e9db0826981bca316494de pinentry-1.3.0.tar.bz2 # Locally computed -sha256 457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067 pinentry-1.2.1.tar.bz2 -sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk index 338d61af2d..b49037c91b 100644 --- a/package/pinentry/pinentry.mk +++ b/package/pinentry/pinentry.mk @@ -4,7 +4,7 @@ # ################################################################################ -PINENTRY_VERSION = 1.2.1 +PINENTRY_VERSION = 1.3.0 PINENTRY_SOURCE = pinentry-$(PINENTRY_VERSION).tar.bz2 PINENTRY_SITE = https://www.gnupg.org/ftp/gcrypt/pinentry PINENTRY_LICENSE = GPL-2.0+ @@ -18,6 +18,10 @@ PINENTRY_CONF_OPTS += \ --with-libgpg-error-prefix=$(STAGING_DIR)/usr \ --without-libcap # requires PAM +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +PINENTRY_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config + ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) PINENTRY_CONF_ENV += LIBS=-latomic endif