@@ -1,8 +1,8 @@
# From https://www.gnupg.org/download/integrity_check.html
-sha1 ec4f67c0117ccd17007c748a392ded96dc1b1ae9 libassuan-2.5.5.tar.bz2
+sha1 b1e8754dbf89b3a3eb175f5df75048dbca1fce57 libassuan-2.5.6.tar.bz2
+sha256 e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426 libassuan-2.5.6.tar.bz2
# Locally calculated after checking signature
-# https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2.sig
+# https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.6.tar.bz2.sig
# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
-sha256 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 libassuan-2.5.5.tar.bz2
sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB
sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING
@@ -4,7 +4,7 @@
#
################################################################################
-LIBASSUAN_VERSION = 2.5.5
+LIBASSUAN_VERSION = 2.5.6
LIBASSUAN_SITE = https://gnupg.org/ftp/gcrypt/libassuan
LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2
LIBASSUAN_LICENSE = LGPL-2.1+ (library), GPL-3.0 (tests, doc)
@@ -15,4 +15,8 @@ LIBASSUAN_CONF_OPTS = \
--with-gpg-error-prefix=$(STAGING_DIR)/usr
LIBASSUAN_CONFIG_SCRIPTS = libassuan-config
+# Force the path to "gpgrt-config" (from the libgpg-error package) to
+# avoid using the one on host, if present.
+LIBASSUAN_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config
+
$(eval $(autotools-package))
For change log, see [1] and [2]. This commit also moves the archive SHA256 hash to the section of hashes published upstream. libassuan 2.5.6 updated its gpg-error.m4 macro files 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" [3] for a complete explanation. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libassuan.git;a=log;h=libassuan-2.5.6 [2] https://dev.gnupg.org/T6542 [3] https://git.buildroot.org/buildroot/commit/?id=d7f2d8403ec82f3b1772ec17bf1df8c42987a1f8 Signed-off-by: Julien Olivain <ju.o@free.fr> --- Patch series tested on branch next at commit bfa4a7c woth commands: make check-package ... 0 warnings generated utils/test-pkg -p libassuan ... 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed # Note: libassuan is a dependency of gnupg2 support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_gnupg2 ... OK --- package/libassuan/libassuan.hash | 6 +++--- package/libassuan/libassuan.mk | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-)