From 1af0f9d255b78a45d6a68b1db0dcfef589988389 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Jul 2022 17:02:47 +0200 Subject: [PATCH] package/libgpg-error: bump to version 1.45 Drop patches (already in version) https://dev.gnupg.org/T5352 https://dev.gnupg.org/T5676 https://dev.gnupg.org/T5802 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...tion-of-lock-obj-pub.native.h-for-cr.patch | 34 ---------------- .../0002-build-Fix-disable-threads.patch | 39 ------------------- package/libgpg-error/libgpg-error.hash | 8 ++-- package/libgpg-error/libgpg-error.mk | 2 +- 4 files changed, 5 insertions(+), 78 deletions(-) delete mode 100644 package/libgpg-error/0001-build-Fix-generation-of-lock-obj-pub.native.h-for-cr.patch delete mode 100644 package/libgpg-error/0002-build-Fix-disable-threads.patch diff --git a/package/libgpg-error/0001-build-Fix-generation-of-lock-obj-pub.native.h-for-cr.patch b/package/libgpg-error/0001-build-Fix-generation-of-lock-obj-pub.native.h-for-cr.patch deleted file mode 100644 index 621f070ee2..0000000000 --- a/package/libgpg-error/0001-build-Fix-generation-of-lock-obj-pub.native.h-for-cr.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7350874f6f62314af4c8ec1973c91d305a6f4ddc Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Fri, 26 Mar 2021 16:06:50 +0900 -Subject: [PATCH] build: Fix generation of lock-obj-pub.native.h for cross - build. - -* src/gen-lock-obj.sh: Capture echo output with quotes. - --- - -Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374 -Signed-off-by: David Michael -Upstream: 33593864cd54143db594c4237bba41e14179061c -Signed-off-by: Thomas Petazzoni ---- - src/gen-lock-obj.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh -index a710f0c..258eec6 100755 ---- a/src/gen-lock-obj.sh -+++ b/src/gen-lock-obj.sh -@@ -38,7 +38,7 @@ - # AWK=gawk ./gen-lock-obj.sh - # - --if test -n `echo -n`; then -+if test -n "`echo -n`"; then - ECHO_C='\c' - ECHO_N='' - else --- -2.31.1 - diff --git a/package/libgpg-error/0002-build-Fix-disable-threads.patch b/package/libgpg-error/0002-build-Fix-disable-threads.patch deleted file mode 100644 index 6ed0f83070..0000000000 --- a/package/libgpg-error/0002-build-Fix-disable-threads.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7ede0d4ce19e0ed14cd1cec81ba7df4e467f1eeb Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 21 Jun 2021 12:16:20 +0900 -Subject: [PATCH] build: Fix --disable-threads. - -* src/gen-lock-obj.sh: Fix generating '}}}'. - --- - -GnuPG-bug-id: 5495 -Reported-by: Fabrice Fontaine -Fixes-commit: 1fb90a7da186ee2ee098a666f6f3a35bb1720e59 -Signed-off-by: NIIBE Yutaka -[Retrieved from: -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=220a427b4f997ef6af1b2d4e82ef1dc96e0cd6ff] -Signed-off-by: Fabrice Fontaine ---- - src/gen-lock-obj.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh -index 258eec6..014667f 100755 ---- a/src/gen-lock-obj.sh -+++ b/src/gen-lock-obj.sh -@@ -121,10 +121,10 @@ while test "$i" -lt $ac_mtx_size; do - fi - i=$(( i + 1 )) - done -+echo '}}}' - fi - - cat <<'EOF' --}}} - ## - ## Local Variables: - ## mode: c --- -2.31.1 - diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index 4e124941cd..b29ec37598 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,10 +1,10 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 5e620d71fc24d287a7ac2460b1d819074bb8b9bb libgpg-error-1.42.tar.bz2 +sha1 fe724ed37b4935964059a47b7c64d5f8246659d8 libgpg-error-1.45.tar.bz2 # Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2.sig -# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23 libgpg-error-1.42.tar.bz2 +# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.45.tar.bz2.sig +# using key 6DAA6E64A76D2840571B4902528897B826403ADA +sha256 570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26 libgpg-error-1.45.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index babcbdaded..86dea6ad2a 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.42 +LIBGPG_ERROR_VERSION = 1.45 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+