While librepo does not have a 1.21.0 tag, commit be788e8bb0c1dc53167e9e0fbe465ec14dac3eb1 bumps 1.20.0 to 1.21.0 in both the VERSION.cmake and librepo.spec files. An issue is raised here to officially tag the release: https://github.com/rpm-software-management/librepo/issues/368
Other changes: - Rename patches to be in the order they are applied - Add backported 0002-Fix-creating-run-gnupg-user.patch Signed-off-by: Adam Duskett <[email protected]> --- ...ain-PYTHON_INSTALL_DIR-by-running-p.patch} | 0 .../0002-Fix-creating-run-gnupg-user.patch | 44 +++++++++++++++++++ .../{librepo_1.20.0.bb => librepo_1.21.0.bb} | 7 +-- 3 files changed, 48 insertions(+), 3 deletions(-) rename meta/recipes-devtools/librepo/librepo/{0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch => 0001-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch} (100%) create mode 100644 meta/recipes-devtools/librepo/librepo/0002-Fix-creating-run-gnupg-user.patch rename meta/recipes-devtools/librepo/{librepo_1.20.0.bb => librepo_1.21.0.bb} (78%) diff --git a/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch b/meta/recipes-devtools/librepo/librepo/0001-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch similarity index 100% rename from meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch rename to meta/recipes-devtools/librepo/librepo/0001-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch diff --git a/meta/recipes-devtools/librepo/librepo/0002-Fix-creating-run-gnupg-user.patch b/meta/recipes-devtools/librepo/librepo/0002-Fix-creating-run-gnupg-user.patch new file mode 100644 index 0000000000..03d3032678 --- /dev/null +++ b/meta/recipes-devtools/librepo/librepo/0002-Fix-creating-run-gnupg-user.patch @@ -0,0 +1,44 @@ +From 9eff2fc7097bb2de44c258e8ce82f81cbab7f23c Mon Sep 17 00:00:00 2001 +From: Petr Pisar <[email protected]> +Date: Thu, 27 Nov 2025 17:31:25 +0100 +Subject: [PATCH] PGP: Fix creating /run/gnupg/user + +e206603a18a6ca8eaa82caedf02004ea3cca2969 commit ("PGP: Enable creating +a UID directory for GnuGP agent socket in /run/gnupg/user") added +a non-default -DUSE_RUN_GNUPG_USER_SOCKET=ON CMake option to create +GnuPG agent socket in /run/gnupg/user directory. + +However, because of a typo in preprocessor condition, the the option +had no effect and librepo always created /run/user/$UID. + +This patch fixes it. + +Upstream-Status: Backport [https://github.com/rpm-software-management/librepo/commit/9eff2fc7097bb2de44c258e8ce82f81cbab7f23c] +Signed-off-by: Petr Pisar <[email protected]> +Signed-off-by: Adam Duskett <[email protected]> +--- + librepo/gpg_gpgme.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/librepo/gpg_gpgme.c b/librepo/gpg_gpgme.c +index 136f25e5..89b1b98a 100644 +--- a/librepo/gpg_gpgme.c ++++ b/librepo/gpg_gpgme.c +@@ -57,7 +57,7 @@ + * + * We remedy it by choosing the label according to a default file context + * policy (ENABLE_SELINUX macro) or by using a different path supported by +- * some GnuPG configurations (DUSE_RUN_GNUPG_USER_SOCKET macro). ++ * some GnuPG configurations (USE_RUN_GNUPG_USER_SOCKET macro). + * + * Since the agent doesn't clean up its sockets properly, by creating this + * directory we make sure they are in a place that is not causing trouble with +@@ -71,7 +71,7 @@ + static void + lr_gpg_ensure_socket_dir_exists() + { +-#ifdef DUSE_RUN_GNUPG_USER_SOCKET ++#ifdef USE_RUN_GNUPG_USER_SOCKET + const char *templates[] = { "/run/gnupg", "/run/gnupg/user", "/run/gnupg/user/%ju", NULL }; + const mode_t modes[] = { 0755, 0755, 0700, 0 }; + #else diff --git a/meta/recipes-devtools/librepo/librepo_1.20.0.bb b/meta/recipes-devtools/librepo/librepo_1.21.0.bb similarity index 78% rename from meta/recipes-devtools/librepo/librepo_1.20.0.bb rename to meta/recipes-devtools/librepo/librepo_1.21.0.bb index 6557dda43a..d65567c14b 100644 --- a/meta/recipes-devtools/librepo/librepo_1.20.0.bb +++ b/meta/recipes-devtools/librepo/librepo_1.21.0.bb @@ -5,11 +5,12 @@ DESCRIPTION = "${SUMMARY}" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;protocol=https;tag=${PV} \ - file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \ +SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;protocol=https \ + file://0001-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \ + file://0002-Fix-creating-run-gnupg-user.patch \ " -SRCREV = "363cb70c6548be900832bc9b18ced3e7569da15a" +SRCREV = "be788e8bb0c1dc53167e9e0fbe465ec14dac3eb1" DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2" -- 2.53.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#231677): https://lists.openembedded.org/g/openembedded-core/message/231677 Mute This Topic: https://lists.openembedded.org/mt/117958796/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
