@@ -1,4 +1,4 @@
-From 6ad1ac8c03ae3acc0539fc1566070e2468c7df0a Mon Sep 17 00:00:00 2001
+From 183cbb40f406b73c69c3c8aa4d82943f145ad664 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Tue, 14 Oct 2025 14:12:55 +0800
Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc."
@@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 8 insertions(+), 46 deletions(-)
diff --git a/src/gpgme.m4 b/src/gpgme.m4
-index acbfc1c..5f689e1 100644
+index 5fbb5db..13b43a4 100644
--- a/src/gpgme.m4
+++ b/src/gpgme.m4
@@ -122,24 +122,10 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
@@ -77,7 +77,7 @@ index acbfc1c..5f689e1 100644
if test "$tmp" -gt 0 ; then
if test "$req_gpgme_api" -ne "$tmp" ; then
ok=no
-@@ -370,11 +348,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+@@ -371,11 +349,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
@@ -90,7 +90,7 @@ index acbfc1c..5f689e1 100644
if test "$tmp" -gt 0 ; then
if test "$req_gpgme_api" -ne "$tmp" ; then
ok=no
-@@ -383,20 +357,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+@@ -384,20 +358,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],[
fi
fi
if test $ok = yes; then
@@ -113,6 +113,3 @@ index acbfc1c..5f689e1 100644
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
_AM_PATH_GPGME_CONFIG_HOST_CHECK
-2.34.1
-
@@ -1,4 +1,4 @@
-From 0bb7fddb6a768bbc46695de4c6e0256a3580ccbb Mon Sep 17 00:00:00 2001
+From b4bdcc72a2afadc597ab045ea1cdaf253e28b95d Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Tue, 26 Nov 2024 23:23:42 -0800
Subject: [PATCH] autogen.sh: remove '-unknown' in version
@@ -20,10 +20,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/autogen.sh b/autogen.sh
-index 9f91297..9f7559b 100755
+index 71f89e2..6b407e2 100755
--- a/autogen.sh
+++ b/autogen.sh
-@@ -271,7 +271,7 @@ if [ "$myhost" = "find-version" ]; then
+@@ -286,7 +286,7 @@ if [ "$myhost" = "find-version" ]; then
else
ingit=no
beta=yes
@@ -1,4 +1,4 @@
-From 4b4e6fc898dd249387bbed4924fa22c1c494327a Mon Sep 17 00:00:00 2001
+From 1167f41361639063eb3a562ca255d00d8074b89c Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 21 Jul 2025 12:43:29 +0800
Subject: [PATCH] pkgconfig
@@ -29,10 +29,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
create mode 100644 src/gpgme-pthread.pc.in
diff --git a/configure.ac b/configure.ac
-index d4dcb1c..293fcc2 100644
+index ddc73c5..e01e5d3 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -844,6 +844,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
+@@ -845,6 +845,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
src/gpgme.pc
src/gpgme-glib.pc
src/gpgme.h)
@@ -41,7 +41,7 @@ index d4dcb1c..293fcc2 100644
AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
AC_CONFIG_FILES([lang/js/Makefile lang/js/src/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
-index edc239b..d427044 100644
+index 4f45dfe..3c49190 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,11 +20,11 @@
@@ -80,7 +80,7 @@ index 0000000..074bbf6
+Cflags: -I${includedir}
+Requires: libassuan gpg-error
diff --git a/src/gpgme.m4 b/src/gpgme.m4
-index 5f689e1..249e8c9 100644
+index 13b43a4..851e866 100644
--- a/src/gpgme.m4
+++ b/src/gpgme.m4
@@ -166,7 +166,6 @@ dnl is added to the gpg_config_script_warn variable.
@@ -225,7 +225,7 @@ index 5f689e1..249e8c9 100644
])
-@@ -319,36 +249,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+@@ -320,36 +250,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],[
min_gpgme_version="$tmp"
fi
@@ -264,7 +264,7 @@ index 5f689e1..249e8c9 100644
if test "$tmp" -gt 0 ; then
if test "$req_gpgme_api" -ne "$tmp" ; then
ok=no
-@@ -357,17 +263,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+@@ -358,17 +264,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],[
fi
fi
if test $ok = yes; then
@@ -295,6 +295,3 @@ index 9ddef5c..932645b 100644
+Cflags: -I${includedir}
+Libs: -L${libdir} -lgpgme
URL: https://www.gnupg.org/software/gpgme/index.html
-2.34.1
-
@@ -1,4 +1,4 @@
-From 417036051c84b02fe43f162ee378278a44636451 Mon Sep 17 00:00:00 2001
+From c44a35dcf7f28a469afb8213dabebc6208887bfd Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 15 Dec 2022 08:44:13 -0800
Subject: [PATCH] posix-io.c: Use off_t instead of off64_t
@@ -26,7 +26,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/posix-io.c b/src/posix-io.c
-index 0d0a98b..286a626 100644
+index 4dee776..3b99500 100644
--- a/src/posix-io.c
+++ b/src/posix-io.c
@@ -74,8 +74,8 @@
@@ -1,4 +1,4 @@
-From aaed03b76505b1feaeeb5a4a3c6bdcc7dd089f01 Mon Sep 17 00:00:00 2001
+From b12054eff9cb13dea3e9654b20f7aafc47ae991d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 15 Jul 2021 12:33:13 -0700
Subject: [PATCH] use closefrom() on linux and glibc 2.34+
@@ -13,10 +13,10 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/posix-io.c b/src/posix-io.c
-index a422d8f..0d0a98b 100644
+index f8196f9..4dee776 100644
--- a/src/posix-io.c
+++ b/src/posix-io.c
-@@ -577,7 +577,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
+@@ -599,7 +599,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++;
@@ -1,4 +1,4 @@
-From 9ea685f1b898ee703b85b705c35b9cbd77cca17f Mon Sep 17 00:00:00 2001
+From 6a6907224574cb7269de2bd45cd4c5d2e53ed1c1 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 13 Apr 2017 16:40:27 +0300
Subject: [PATCH] gpgme-config: skip all /lib* or /usr/lib* directories in
similarity index 74%
rename from meta/recipes-support/gpgme/gpgme_2.1.0.bb
rename to meta/recipes-support/gpgme/gpgme_2.1.1.bb
@@ -1,3 +1,24 @@
+# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
+# The following is the difference between the old and the new license text.
+# Please update the LICENSE value if needed, and summarize the changes in
+# the commit message via 'License-Update:' tag.
+# (example: 'License-Update: copyright years updated.')
+#
+# The changes:
+#
+# --- src/gpgme.h.in
+# +++ src/gpgme.h.in
+# @@ -1,6 +1,6 @@
+# /* gpgme.h - Public interface to GnuPG Made Easy. -*- c -*-
+# * Copyright (C) 2000 Werner Koch (dd9jn)
+# - * Copyright (C) 2001-2025 g10 Code GmbH
+# + * Copyright (C) 2001-2026 g10 Code GmbH
+# *
+# * This file is part of GPGME.
+# *
+#
+#
+
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"
@@ -9,7 +30,7 @@ LICENSE:${PN}-tool = "GPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \
- file://src/gpgme.h.in;endline=23;md5=c0d051fa63f5a5514f4ab190d7ca495e \
+ file://src/gpgme.h.in;endline=23;md5=3b8e9a6fe45f4aef6306036aa21d3b89 \
file://src/engine.h;endline=21;md5=f58f7a0b6488edae41b925ac9c890068 \
file://src/gpgme-tool.c;endline=21;md5=66c5381e0e05475792e24982d15e7ce8 \
"
@@ -24,7 +45,7 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
file://0001-autogen.sh-remove-unknown-in-version.patch \
"
-SRC_URI[sha256sum] = "841c5ea53fc26259f4fbf0e8bde982dea1b8a1ca0cb77e681c82b050566bf92b"
+SRC_URI[sha256sum] = "6d7ee12b209d7dce75468db53f72a90e1ad3d21f4c304ef2c002612a52f5333a"
DEPENDS = "libgpg-error-native libgpg-error libassuan"
Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *gpgme* to *2.1.1* has Succeeded. Next steps: - apply the patch: git am 0001-gpgme-upgrade-2.1.0-2.1.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 5f37921aa2837e5954c76954ca26d719673df170 Mon Sep 17 00:00:00 2001 From: Upgrade Helper <auh@yoctoproject.org> Date: Fri, 26 Jun 2026 06:11:32 +0000 Subject: [PATCH] gpgme: upgrade 2.1.0 -> 2.1.1 --- ...e-gpgme.m4-use-gpgrt-config-with-.pc.patch | 11 +++----- ...autogen.sh-remove-unknown-in-version.patch | 6 ++--- .../gpgme/gpgme/0001-pkgconfig.patch | 17 ++++++------- ...ix-io.c-Use-off_t-instead-of-off64_t.patch | 4 +-- ...se-closefrom-on-linux-and-glibc-2.34.patch | 6 ++--- ...p-all-lib-or-usr-lib-directories-in-.patch | 2 +- .../gpgme/{gpgme_2.1.0.bb => gpgme_2.1.1.bb} | 25 +++++++++++++++++-- 7 files changed, 43 insertions(+), 28 deletions(-) rename meta/recipes-support/gpgme/{gpgme_2.1.0.bb => gpgme_2.1.1.bb} (74%)