From patchwork Sun Dec 15 09:29:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 54113 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3719DC02183 for ; Sun, 15 Dec 2024 09:29:51 +0000 (UTC) Received: from a27-31.smtp-out.us-west-2.amazonses.com (a27-31.smtp-out.us-west-2.amazonses.com [54.240.27.31]) by mx.groups.io with SMTP id smtpd.web10.33384.1734254985000764933 for ; Sun, 15 Dec 2024 01:29:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=iiPi+K2F; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=nKs/wr6X; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.31, mailfrom: 01010193c9a711ca-2df29ac4-8952-4b36-b774-83e5059cba89-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1734254989; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=EdtLJOFpxu2rTnNUb4Q/VAaOWQl/IVKrO6djf/x6LrI=; b=iiPi+K2FIuoHNvgYUZFXAPowlTs1sJQUMyUHRyQwckPNi2GQPAPzyTXGSAY1PGp8 1w7RF/oet1VvqCSIUwWoH79krgQw/UJofS8OGsoaHWFTiBqaAGHRRO/HxlH+1B3mhRf vPYgC2zte5vdApqW5ziU2RBgshe4BO+VNh6uTu24= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1734254989; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=EdtLJOFpxu2rTnNUb4Q/VAaOWQl/IVKrO6djf/x6LrI=; b=nKs/wr6XBcQP3wQ38HySsOYE5hz8yYQmqb8WlxU83g3AfZUlH0gSgJET+dazH0Vl lyaPYhwhXeZFH9tNMeGVm1OpNxC9UoujAVW/XfTWDS+XCx6p3GZwkcLmHbJwKQYjJJe nCN96V/XXmw5+f7fONsHsLGG+8jan/rNz96IU0gQ= MIME-Version: 1.0 From: auh@yoctoproject.org To: Hongxu Jia Cc: openembedded-core@lists.openembedded.org Subject: [AUH] gpgme: upgrading to 1.24.1 SUCCEEDED Message-ID: <01010193c9a711ca-2df29ac4-8952-4b36-b774-83e5059cba89-000000@us-west-2.amazonses.com> Date: Sun, 15 Dec 2024 09:29:49 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.12.15-54.240.27.31 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 15 Dec 2024 09:29:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/208740 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *gpgme* to *1.24.1* has Succeeded. Next steps: - apply the patch: git am 0001-gpgme-upgrade-1.24.0-1.24.1.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 03d88fd46c2db6347c4c314a467dd7ca686e3427 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sun, 15 Dec 2024 09:09:29 +0000 Subject: [PATCH] gpgme: upgrade 1.24.0 -> 1.24.1 --- ...ake-gpgme.m4-use-gpgrt-config-with-.pc.patch | 15 +++++++-------- ...1-autogen.sh-remove-unknown-in-version.patch | 7 ++----- .../gpgme/gpgme/0001-pkgconfig.patch | 17 +++++++---------- ...osix-io.c-Use-off_t-instead-of-off64_t.patch | 2 +- ...-use-closefrom-on-linux-and-glibc-2.34.patch | 3 +-- ...hon-gpg-error-config-should-not-be-use.patch | 7 +++---- .../0003-Correctly-install-python-modules.patch | 5 ++--- ...kip-all-lib-or-usr-lib-directories-in-.patch | 3 +-- .../gpgme/gpgme/0006-fix-build-path-issue.patch | 5 ++--- .../gpgme/{gpgme_1.24.0.bb => gpgme_1.24.1.bb} | 2 +- 10 files changed, 27 insertions(+), 39 deletions(-) rename meta/recipes-support/gpgme/{gpgme_1.24.0.bb => gpgme_1.24.1.bb} (97%) diff --git a/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch index 8ed39280ca..736737a9cc 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch @@ -1,4 +1,4 @@ -From ee1421f7a7a9f31400ba992a5be52b88d20170c9 Mon Sep 17 00:00:00 2001 +From 7fd44028b68137a93873d51373f6a86916272c28 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 10 May 2019 14:18:04 +0800 Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc." @@ -10,16 +10,15 @@ The oe-core does not support gpgrt-config, so revert it Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Hongxu Jia - --- src/gpgme.m4 | 54 ++++++++-------------------------------------------- 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/src/gpgme.m4 b/src/gpgme.m4 -index f2906c1..8cc2898 100644 +index 4cfe899..5f689e1 100644 --- a/src/gpgme.m4 +++ b/src/gpgme.m4 -@@ -125,24 +125,10 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl +@@ -122,24 +122,10 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl fi fi @@ -46,7 +45,7 @@ index f2906c1..8cc2898 100644 fi gpgme_version_major=`echo $gpgme_version | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` -@@ -155,16 +141,12 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl +@@ -152,16 +138,12 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK], [ @@ -65,7 +64,7 @@ index f2906c1..8cc2898 100644 *** built for $gpgme_config_host and thus may not match the *** used host $host. *** You may want to use the configure option --with-gpgme-prefix -@@ -225,11 +207,7 @@ AC_DEFUN([AM_PATH_GPGME], +@@ -223,11 +205,7 @@ AC_DEFUN([AM_PATH_GPGME], # If we have a recent GPGME, we should also check that the # API is compatible. if test "$req_gpgme_api" -gt 0 ; then @@ -78,7 +77,7 @@ index f2906c1..8cc2898 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -372,11 +350,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -370,11 +348,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], # If we have a recent GPGME, we should also check that the # API is compatible. if test "$req_gpgme_api" -gt 0 ; then @@ -91,7 +90,7 @@ index f2906c1..8cc2898 100644 if test "$tmp" -gt 0 ; then if test "$req_gpgme_api" -ne "$tmp" ; then ok=no -@@ -385,20 +359,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], +@@ -383,20 +357,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], fi fi if test $ok = yes; then 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 920df3d4c3..4ca8d61f5c 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 0d76b00111a112032eb8522791b70664100d4e0a Mon Sep 17 00:00:00 2001 +From 2cb662877c7e326ec4a360d85c814d5dc5ca7638 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 26 Nov 2024 23:23:42 -0800 Subject: [PATCH] autogen.sh: remove '-unknown' in version @@ -20,7 +20,7 @@ Signed-off-by: Hongxu Jia 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh -index 9f912972..9f7559b4 100755 +index 9f91297..9f7559b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -271,7 +271,7 @@ if [ "$myhost" = "find-version" ]; then @@ -32,6 +32,3 @@ index 9f912972..9f7559b4 100755 cid="0000000" rev="0000000" rvd="0" --- -2.25.1 - diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 2fddf4c553..c9b3f8ced4 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch @@ -1,4 +1,4 @@ -From e4e75bee348d297bd8288e6fd7e99ab033cbb90c Mon Sep 17 00:00:00 2001 +From 519297a3d782fb90d8fd9d28094817288815f1b2 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 26 Nov 2024 23:04:52 -0800 Subject: [PATCH] pkgconfig @@ -27,10 +27,10 @@ Signed-off-by: Hongxu Jia create mode 100644 src/gpgme-pthread.pc.in diff --git a/configure.ac b/configure.ac -index 933fb150..08589a6b 100644 +index fe02bdf..6f33020 100644 --- a/configure.ac +++ b/configure.ac -@@ -1160,6 +1160,7 @@ AC_CONFIG_FILES(Makefile src/Makefile +@@ -1179,6 +1179,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) @@ -39,7 +39,7 @@ index 933fb150..08589a6b 100644 AC_CONFIG_FILES(lang/cpp/tests/Makefile) AC_CONFIG_FILES(lang/cpp/src/gpgmepp.pc) diff --git a/src/Makefile.am b/src/Makefile.am -index 03708620..e716ce4d 100644 +index 0370862..e716ce4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,11 +20,11 @@ @@ -58,7 +58,7 @@ index 03708620..e716ce4d 100644 noinst_SCRIPTS = gpgme-config diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in new file mode 100644 -index 00000000..074bbf6e +index 0000000..074bbf6 --- /dev/null +++ b/src/gpgme-pthread.pc.in @@ -0,0 +1,15 @@ @@ -78,7 +78,7 @@ index 00000000..074bbf6e +Cflags: -I${includedir} +Requires: libassuan gpg-error diff --git a/src/gpgme.m4 b/src/gpgme.m4 -index 5f689e18..249e8c98 100644 +index 5f689e1..249e8c9 100644 --- a/src/gpgme.m4 +++ b/src/gpgme.m4 @@ -166,7 +166,6 @@ dnl is added to the gpg_config_script_warn variable. @@ -281,7 +281,7 @@ index 5f689e18..249e8c98 100644 - AC_SUBST(GPGME_GLIB_LIBS) ]) diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in -index 9ddef5cd..932645be 100644 +index 9ddef5c..932645b 100644 --- a/src/gpgme.pc.in +++ b/src/gpgme.pc.in @@ -9,6 +9,6 @@ Name: gpgme @@ -293,6 +293,3 @@ index 9ddef5cd..932645be 100644 +Cflags: -I${includedir} +Libs: -L${libdir} -lgpgme URL: https://www.gnupg.org/software/gpgme/index.html --- -2.25.1 - diff --git a/meta/recipes-support/gpgme/gpgme/0001-posix-io.c-Use-off_t-instead-of-off64_t.patch b/meta/recipes-support/gpgme/gpgme/0001-posix-io.c-Use-off_t-instead-of-off64_t.patch index be58c42128..8e73656951 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-posix-io.c-Use-off_t-instead-of-off64_t.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-posix-io.c-Use-off_t-instead-of-off64_t.patch @@ -1,4 +1,4 @@ -From be33cf1812b4c2a3ed85fb2532992bfb2b27b3be Mon Sep 17 00:00:00 2001 +From af3621e4b137d4e299e666788dcfed9261680241 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 15 Dec 2022 08:44:13 -0800 Subject: [PATCH] posix-io.c: Use off_t instead of off64_t 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 3d05808d63..65d2fbcbf0 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 e1fc4b06dcb62e1c2d85ae99f39ef1a8860570e1 Mon Sep 17 00:00:00 2001 +From c83ec0a89e75b3af17d693fa068f116726c91f17 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,7 +8,6 @@ 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/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch index 0d2692912f..808d9cfa53 100644 --- a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch +++ b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch @@ -1,4 +1,4 @@ -From 9fce0689bc04506e5758444efa24ea99fe1ff5ef Mon Sep 17 00:00:00 2001 +From 5baa05eb96bb9d98f4ed5d6fa2ce1fddef60d1e9 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 10 May 2019 14:30:36 +0800 Subject: [PATCH] gpgme/lang/python: gpg-error-config should not be used @@ -14,16 +14,15 @@ Signed-off-by: Mark Hatle Rebase to 1.13.0 Signed-off-by: Hongxu Jia - --- lang/python/setup.py.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in -index 6f36861..1d9058b 100755 +index d6f537e..695c02e 100755 --- a/lang/python/setup.py.in +++ b/lang/python/setup.py.in -@@ -169,9 +169,8 @@ class BuildExtFirstHack(build): +@@ -173,9 +173,8 @@ class BuildExtFirstHack(build): def _generate_errors_i(self): 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 204fe5934d..12cc28fb43 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,4 +1,4 @@ -From 8c850aa109c42d0c193bccc7af45dbc2689b23f6 Mon Sep 17 00:00:00 2001 +From 3e080f60013416dbc6ef9fd4f81b931d76a3d69e Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 30 Jan 2018 15:28:49 +0800 Subject: [PATCH] Correctly install python modules @@ -12,13 +12,12 @@ 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 68b98e8..bbb9111 100644 +index a6fd639..136e979 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am @@ -97,6 +97,7 @@ install-exec-local: 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 7fe0c9538a..1e057cc152 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,4 +1,4 @@ -From 57475742b0288b4ee53c01c59c3ab03c1ef7932e Mon Sep 17 00:00:00 2001 +From c9a14ef517bf5a1bb4b5ff5228b9fa3ff14f9a24 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 13 Apr 2017 16:40:27 +0300 Subject: [PATCH] gpgme-config: skip all /lib* or /usr/lib* directories in @@ -9,7 +9,6 @@ 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/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch b/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch index 8d48db2feb..b4f1c6c74d 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,4 +1,4 @@ -From 7938a5a760827aec737ea49d2f8719051abda188 Mon Sep 17 00:00:00 2001 +From 86408a5249c563c708be31593113423f54469631 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 31 Jan 2018 11:01:09 +0800 Subject: [PATCH] fix build path issue @@ -12,13 +12,12 @@ 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 bbb9111..cee499e 100644 +index 136e979..1495982 100644 --- a/lang/python/Makefile.am +++ b/lang/python/Makefile.am @@ -96,8 +96,9 @@ install-exec-local: diff --git a/meta/recipes-support/gpgme/gpgme_1.24.0.bb b/meta/recipes-support/gpgme/gpgme_1.24.1.bb similarity index 97% rename from meta/recipes-support/gpgme/gpgme_1.24.0.bb rename to meta/recipes-support/gpgme/gpgme_1.24.1.bb index d717c0cbb7..34f8a15e00 100644 --- a/meta/recipes-support/gpgme/gpgme_1.24.0.bb +++ b/meta/recipes-support/gpgme/gpgme_1.24.1.bb @@ -29,7 +29,7 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ file://0001-autogen.sh-remove-unknown-in-version.patch \ " -SRC_URI[sha256sum] = "61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da" +SRC_URI[sha256sum] = "ea05d0258e71061d61716584ec34cef59330a91340571edc46b78374973ba85f" PYTHON_DEPS = "${@bb.utils.contains('LANGUAGES', 'python', 'swig-native', '', d)}"