From 147450c82339e4c75544376ffa2f6fed6296c617 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 19 Dec 2023 17:33:12 +0800 Subject: gpgme: upgrade 1.23.1 -> 1.23.2 Changelog: ============ * Preserve more specific existing failure code. * qt: Start dirmngr with gpgconf to avoid multiple instances. * qt: On Windows, use UTF-8 when logging the error text. * qt: Remove left-over partial files more persistently. * qt: Use a temporary file name when creating signed or encrypted archives. * qt: Build Qt 6 bindings with -fPIC if requested or Qt 6 was built with this flag. 0001-autogen.sh-remove-unknown-in-version.patch0001-pkgconfig.patch 0001-pkgconfig.patch 0001-use-closefrom-on-linux-and-glibc-2.34.patch 0003-Correctly-install-python-modules.patch 0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch 0006-fix-build-path-issue.patch 0008-do-not-auto-check-var-PYTHON.patch refreshed for 1.23.2 (From OE-Core rev: 178dab3a479729aa0980a40846a81f5f3da8d709) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...0001-autogen.sh-remove-unknown-in-version.patch | 10 ++- .../gpgme/gpgme/0001-pkgconfig.patch | 8 +-- ...001-use-closefrom-on-linux-and-glibc-2.34.patch | 10 ++- .../0003-Correctly-install-python-modules.patch | 12 ++-- ...g-skip-all-lib-or-usr-lib-directories-in-.patch | 12 ++-- .../gpgme/gpgme/0006-fix-build-path-issue.patch | 12 ++-- .../gpgme/0008-do-not-auto-check-var-PYTHON.patch | 6 +- meta/recipes-support/gpgme/gpgme_1.23.1.bb | 81 ---------------------- meta/recipes-support/gpgme/gpgme_1.23.2.bb | 81 ++++++++++++++++++++++ 9 files changed, 111 insertions(+), 121 deletions(-) delete mode 100644 meta/recipes-support/gpgme/gpgme_1.23.1.bb create mode 100644 meta/recipes-support/gpgme/gpgme_1.23.2.bb diff --git a/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch b/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch index 81af86e7b2..6d67e6d6c9 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-autogen.sh-remove-unknown-in-version.patch @@ -1,4 +1,4 @@ -From 46f346dff73122caffe62eda84596a3a3bec859e Mon Sep 17 00:00:00 2001 +From acc4750ffa79a5c2ef3c95cf31ef51352a68837b Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 28 Feb 2023 13:43:51 +0800 Subject: [PATCH] autogen.sh: remove '-unknown' in version @@ -12,15 +12,16 @@ Remove the '-unknown' suffix to fix this issue. Upstream-Status: Submitted [https://lists.gnupg.org/pipermail/gnupg-devel/2023-February/035293.html] Signed-off-by: Chen Qi + --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh -index 9b36158..d5cccd2 100755 +index 4e1665b..a55326d 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -266,7 +266,7 @@ if [ "$myhost" = "find-version" ]; then +@@ -269,7 +269,7 @@ if [ "$myhost" = "find-version" ]; then else ingit=no beta=yes @@ -29,6 +30,3 @@ index 9b36158..d5cccd2 100755 rev="0000000" rvd="0" fi --- -2.17.1 - diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 738b23cd58..831771ca2d 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch @@ -1,4 +1,4 @@ -From f8221238d51066b7a1a5f2917cce2791876ea8b0 Mon Sep 17 00:00:00 2001 +From 7b3a00cb0fc27c896dd85c9afc474bd9c2aea30d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 10 May 2019 14:23:55 +0800 Subject: [PATCH] pkgconfig @@ -26,10 +26,10 @@ Signed-off-by: Wang Mingyu create mode 100644 src/gpgme-pthread.pc.in diff --git a/configure.ac b/configure.ac -index d1b9aca..9c4f97c 100644 +index ae4c7da..df892c9 100644 --- a/configure.ac +++ b/configure.ac -@@ -1043,6 +1043,7 @@ AC_CONFIG_FILES(Makefile src/Makefile +@@ -1112,6 +1112,7 @@ AC_CONFIG_FILES(Makefile src/Makefile src/gpgme-glib.pc src/gpgme.h) AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) @@ -38,7 +38,7 @@ index d1b9aca..9c4f97c 100644 AC_CONFIG_FILES(lang/cpp/tests/Makefile) AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) diff --git a/src/Makefile.am b/src/Makefile.am -index 67805a8..d38ba02 100644 +index ca70950..bda5498 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,11 +20,11 @@ diff --git a/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch b/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch index f3de55f7b3..3d05808d63 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch @@ -1,4 +1,4 @@ -From adb1d4e5498a19e9d591ac8f42f9ddfdb23a1354 Mon Sep 17 00:00:00 2001 +From e1fc4b06dcb62e1c2d85ae99f39ef1a8860570e1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 15 Jul 2021 12:33:13 -0700 Subject: [PATCH] use closefrom() on linux and glibc 2.34+ @@ -8,15 +8,16 @@ Signed-off-by: Khem Raj Rebase to 1.17.0 Signed-off-by: Wang Mingyu + --- src/posix-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/posix-io.c b/src/posix-io.c -index 5c6cf1d..52e513a 100644 +index a422d8f..0d0a98b 100644 --- a/src/posix-io.c +++ b/src/posix-io.c -@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags, +@@ -577,7 +577,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags, if (fd_list[i].fd > fd) fd = fd_list[i].fd; fd++; @@ -25,6 +26,3 @@ index 5c6cf1d..52e513a 100644 closefrom (fd); max_fds = fd; #else /*!__sun */ --- -2.25.1 - diff --git a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch index de1689ec05..204fe5934d 100644 --- a/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch +++ b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch @@ -1,7 +1,7 @@ -From f632148fcc8757bb9a9601a6dab275e88cd309d2 Mon Sep 17 00:00:00 2001 +From 8c850aa109c42d0c193bccc7af45dbc2689b23f6 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 30 Jan 2018 15:28:49 +0800 -Subject: [PATCH 3/7] Correctly install python modules +Subject: [PATCH] Correctly install python modules Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin @@ -12,15 +12,16 @@ Signed-off-by: Hongxu Jia Rebase to 1.10.0 Signed-off-by: Hongxu Jia + --- lang/python/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 6988faf..36c6f7b 100644 +index 68b98e8..bbb9111 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am -@@ -93,6 +93,7 @@ install-exec-local: +@@ -97,6 +97,7 @@ install-exec-local: --build-base="$$(basename "$${PYTHON}")-gpg" \ install \ --prefix "$(DESTDIR)$(prefix)" \ @@ -28,6 +29,3 @@ index 6988faf..36c6f7b 100644 --verbose ; \ done --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch index 50bf21463f..7fe0c9538a 100644 --- a/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch +++ b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch @@ -1,7 +1,7 @@ -From 8d9613c34ae495bbcbd725a2e7ac48138ba53c30 Mon Sep 17 00:00:00 2001 +From 57475742b0288b4ee53c01c59c3ab03c1ef7932e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 13 Apr 2017 16:40:27 +0300 -Subject: [PATCH 5/7] gpgme-config: skip all /lib* or /usr/lib* directories in +Subject: [PATCH] gpgme-config: skip all /lib* or /usr/lib* directories in output The logic was not working in multilib setups which use other @@ -9,15 +9,16 @@ directory names than plain /lib or /usr/lib. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + --- src/gpgme-config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gpgme-config.in b/src/gpgme-config.in -index a4d152e..8342865 100644 +index 56b98f8..e96f3c3 100644 --- a/src/gpgme-config.in +++ b/src/gpgme-config.in -@@ -154,7 +154,7 @@ while test $# -gt 0; do +@@ -157,7 +157,7 @@ while test $# -gt 0; do for i in $libs $tmp_l $assuan_libs $gpg_error_libs $tmp_x; do skip=no case $i in @@ -26,6 +27,3 @@ index a4d152e..8342865 100644 skip=yes ;; -L*|-l*) --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch b/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch index 1471184d67..8d48db2feb 100644 --- a/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch +++ b/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch @@ -1,7 +1,7 @@ -From ef920688bfe1c7328c9e97229d62ccd35304ad84 Mon Sep 17 00:00:00 2001 +From 7938a5a760827aec737ea49d2f8719051abda188 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 31 Jan 2018 11:01:09 +0800 -Subject: [PATCH 6/7] fix build path issue +Subject: [PATCH] fix build path issue Get the "--root" directory supplied to the "install" command, and use it as a prefix to strip off the purported filename @@ -12,15 +12,16 @@ to use relative path. Upstream-Status: Submitted [gnupg-devel@gnupg.org] Signed-off-by: Hongxu Jia + --- lang/python/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 36c6f7b..ce9a108 100644 +index bbb9111..cee499e 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am -@@ -92,8 +92,9 @@ install-exec-local: +@@ -96,8 +96,9 @@ install-exec-local: build \ --build-base="$$(basename "$${PYTHON}")-gpg" \ install \ @@ -32,6 +33,3 @@ index 36c6f7b..ce9a108 100644 --verbose ; \ done --- -2.7.4 - diff --git a/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch index 214cf348e4..a11621ed64 100644 --- a/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch +++ b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch @@ -1,4 +1,4 @@ -From 94cf9f8fc79c0d1d4529cebdd74328927fda36a2 Mon Sep 17 00:00:00 2001 +From 84c389705e7742d2b68e144a5733e618441d293e Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 10 May 2019 16:19:54 +0800 Subject: [PATCH] do not auto check var-PYTHON @@ -18,10 +18,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index df218ec..6a619ef 100644 +index df892c9..8c6194e 100644 --- a/configure.ac +++ b/configure.ac -@@ -521,9 +521,8 @@ if test "$found_py" = "1"; then +@@ -590,9 +590,8 @@ if test "$found_py" = "1"; then if test "$found_py" = "1" -o "$found_py3" = "1"; then # Reset everything, so that we can look for another Python. m4_foreach([mym4pythonver], diff --git a/meta/recipes-support/gpgme/gpgme_1.23.1.bb b/meta/recipes-support/gpgme/gpgme_1.23.1.bb deleted file mode 100644 index 023cf894df..0000000000 --- a/meta/recipes-support/gpgme/gpgme_1.23.1.bb +++ /dev/null @@ -1,81 +0,0 @@ -SUMMARY = "High-level GnuPG encryption/signing API" -DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, decryption, signing, signature verification and key management" -HOMEPAGE = "http://www.gnupg.org/gpgme.html" -BUGTRACKER = "https://bugs.g10code.com/gnupg/index" - -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ - file://src/gpgme.h.in;endline=23;md5=2f0bf06d1c7dcb28532a9d0f94a7ca1d \ - file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" - -UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" -SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ - file://0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch \ - file://0001-pkgconfig.patch \ - file://0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch \ - file://0003-Correctly-install-python-modules.patch \ - file://0004-python-import.patch \ - file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ - file://0006-fix-build-path-issue.patch \ - file://0008-do-not-auto-check-var-PYTHON.patch \ - file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \ - file://0001-posix-io.c-Use-off_t-instead-of-off64_t.patch \ - file://0001-autogen.sh-remove-unknown-in-version.patch \ - " - -SRC_URI[sha256sum] = "a0c316f7ab7d3bfb01a8753c3370dc906e5b61436021f3b54ff1483b513769bd" - -PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}" - -DEPENDS = "libgpg-error libassuan ${PYTHON_DEPS}" -RDEPENDS:${PN}-cpp += "libstdc++" - -RDEPENDS:python3-gpg += "python3-unixadmin" - -BINCONFIG = "${bindir}/gpgme-config" - -# Default in configure.ac: "cl cpp python qt" -# Supported: "cl cpp python python2 python3 qt" -# python says 'search and find python2 or python3' - -# Building the C++ bindings for native requires a C++ compiler with C++11 -# support. Since these bindings are currently not needed, we can disable them. -DEFAULT_LANGUAGES = "" -DEFAULT_LANGUAGES:class-target = "cpp" -LANGUAGES ?= "${DEFAULT_LANGUAGES}" - -PYTHON_INHERIT = "${@bb.utils.contains('LANGUAGES', 'python', 'setuptools3-base', '', d)}" - -EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ - --disable-gpgconf-test \ - --disable-gpg-test \ - --disable-gpgsm-test \ - --disable-g13-test \ -' - -inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} python3native multilib_header - -export PKG_CONFIG='pkg-config' - -BBCLASSEXTEND = "native nativesdk" - -PACKAGES =+ "${PN}-cpp python3-gpg" - -FILES:${PN}-cpp = "${libdir}/libgpgmepp.so.*" -FILES:python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" -FILES:${PN}-dev += "${datadir}/common-lisp/source/gpgme/*" - -CFLAGS:append:libc-musl = " -D__error_t_defined " -CACHED_CONFIGUREVARS:libc-musl = "ac_cv_sys_file_offset_bits=no" - -do_configure:prepend () { - # Else these could be used in preference to those in aclocal-copy - rm -f ${S}/m4/gpg-error.m4 - rm -f ${S}/m4/libassuan.m4 - rm -f ${S}/m4/python.m4 -} - -do_install:append() { - oe_multilib_header gpgme.h -} diff --git a/meta/recipes-support/gpgme/gpgme_1.23.2.bb b/meta/recipes-support/gpgme/gpgme_1.23.2.bb new file mode 100644 index 0000000000..b29c182f36 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme_1.23.2.bb @@ -0,0 +1,81 @@ +SUMMARY = "High-level GnuPG encryption/signing API" +DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, decryption, signing, signature verification and key management" +HOMEPAGE = "http://www.gnupg.org/gpgme.html" +BUGTRACKER = "https://bugs.g10code.com/gnupg/index" + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ + file://src/gpgme.h.in;endline=23;md5=2f0bf06d1c7dcb28532a9d0f94a7ca1d \ + file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" + +UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" +SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ + file://0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch \ + file://0001-pkgconfig.patch \ + file://0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch \ + file://0003-Correctly-install-python-modules.patch \ + file://0004-python-import.patch \ + file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \ + file://0006-fix-build-path-issue.patch \ + file://0008-do-not-auto-check-var-PYTHON.patch \ + file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \ + file://0001-posix-io.c-Use-off_t-instead-of-off64_t.patch \ + file://0001-autogen.sh-remove-unknown-in-version.patch \ + " + +SRC_URI[sha256sum] = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224" + +PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}" + +DEPENDS = "libgpg-error libassuan ${PYTHON_DEPS}" +RDEPENDS:${PN}-cpp += "libstdc++" + +RDEPENDS:python3-gpg += "python3-unixadmin" + +BINCONFIG = "${bindir}/gpgme-config" + +# Default in configure.ac: "cl cpp python qt" +# Supported: "cl cpp python python2 python3 qt" +# python says 'search and find python2 or python3' + +# Building the C++ bindings for native requires a C++ compiler with C++11 +# support. Since these bindings are currently not needed, we can disable them. +DEFAULT_LANGUAGES = "" +DEFAULT_LANGUAGES:class-target = "cpp" +LANGUAGES ?= "${DEFAULT_LANGUAGES}" + +PYTHON_INHERIT = "${@bb.utils.contains('LANGUAGES', 'python', 'setuptools3-base', '', d)}" + +EXTRA_OECONF += '--enable-languages="${LANGUAGES}" \ + --disable-gpgconf-test \ + --disable-gpg-test \ + --disable-gpgsm-test \ + --disable-g13-test \ +' + +inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} python3native multilib_header + +export PKG_CONFIG='pkg-config' + +BBCLASSEXTEND = "native nativesdk" + +PACKAGES =+ "${PN}-cpp python3-gpg" + +FILES:${PN}-cpp = "${libdir}/libgpgmepp.so.*" +FILES:python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" +FILES:${PN}-dev += "${datadir}/common-lisp/source/gpgme/*" + +CFLAGS:append:libc-musl = " -D__error_t_defined " +CACHED_CONFIGUREVARS:libc-musl = "ac_cv_sys_file_offset_bits=no" + +do_configure:prepend () { + # Else these could be used in preference to those in aclocal-copy + rm -f ${S}/m4/gpg-error.m4 + rm -f ${S}/m4/libassuan.m4 + rm -f ${S}/m4/python.m4 +} + +do_install:append() { + oe_multilib_header gpgme.h +} -- cgit v1.2.3-54-g00ecf