Signed-off-by: Alexander Kanavin <[email protected]> --- ...-a-custom-value-for-the-location-of-.patch | 6 +- .../gnupg/gnupg/relocate.patch | 74 ++++++++++--------- .../gnupg/{gnupg_2.3.2.bb => gnupg_2.3.3.bb} | 2 +- 3 files changed, 43 insertions(+), 39 deletions(-) rename meta/recipes-support/gnupg/{gnupg_2.3.2.bb => gnupg_2.3.3.bb} (97%)
diff --git a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch index a66a8e62b0..b58fbfe6f5 100644 --- a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch +++ b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch @@ -1,4 +1,4 @@ -From c873c85b1ee1c35ebbba0bc80c2352c64787a5fd Mon Sep 17 00:00:00 2001 +From bdde1faa774753e29d582d79186e08a38597de9e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 22 Jan 2018 18:00:21 +0200 Subject: [PATCH] configure.ac: use a custom value for the location of @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index d03ea3b..a6dfa19 100644 +index 5cdd316..e5f2d6a 100644 --- a/configure.ac +++ b/configure.ac -@@ -1958,7 +1958,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", +@@ -1962,7 +1962,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf", AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool]) diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index f9f38c2876..53679bf1d9 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch @@ -1,4 +1,4 @@ -From 5a68a37ae2649e0988965cfe3a63a0142f0182a1 Mon Sep 17 00:00:00 2001 +From 766d37fe9acd9fdaaff9c094635e06b50c5902d7 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its @@ -7,15 +7,16 @@ Subject: [PATCH] Allow the environment to override where gnupg looks for its Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Ross Burton <[email protected]> +Signed-off-by: Alexander Kanavin <[email protected]> --- common/homedir.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/homedir.c b/common/homedir.c -index 7969a2c..06b8016 100644 +index 455c188..55049db 100644 --- a/common/homedir.c +++ b/common/homedir.c -@@ -918,7 +918,7 @@ gnupg_socketdir (void) +@@ -1155,7 +1155,7 @@ gnupg_socketdir (void) if (!name) { unsigned int dummy; @@ -24,57 +25,60 @@ index 7969a2c..06b8016 100644 gpgrt_annotate_leaked_object (name); } -@@ -946,7 +946,7 @@ gnupg_sysconfdir (void) - } - return name; - #else /*!HAVE_W32_SYSTEM*/ -- return GNUPG_SYSCONFDIR; -+ return getenv("GNUPG_SYSCONFDIR") ?: GNUPG_SYSCONFDIR; +@@ -1187,7 +1187,7 @@ gnupg_sysconfdir (void) + if (dir) + return dir; + else +- return GNUPG_SYSCONFDIR; ++ return getenv("GNUPG_SYSCONFDIR") ?: GNUPG_SYSCONFDIR; #endif /*!HAVE_W32_SYSTEM*/ } -@@ -978,7 +978,7 @@ gnupg_bindir (void) +@@ -1223,7 +1223,7 @@ gnupg_bindir (void) + return name; + } else - return rdir; - #else /*!HAVE_W32_SYSTEM*/ -- return GNUPG_BINDIR; -+ return getenv("GNUPG_BINDIR") ?: GNUPG_BINDIR; +- return GNUPG_BINDIR; ++ return getenv("GNUPG_BINDIR") ?: GNUPG_BINDIR; #endif /*!HAVE_W32_SYSTEM*/ } -@@ -991,7 +991,7 @@ gnupg_libexecdir (void) - #ifdef HAVE_W32_SYSTEM - return gnupg_bindir (); - #else /*!HAVE_W32_SYSTEM*/ -- return GNUPG_LIBEXECDIR; -+ return getenv("GNUPG_LIBEXECDIR") ?: GNUPG_LIBEXECDIR; +@@ -1250,7 +1250,7 @@ gnupg_libexecdir (void) + return name; + } + else +- return GNUPG_LIBEXECDIR; ++ return getenv("GNUPG_LIBEXECDIR") ?: GNUPG_LIBEXECDIR; #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1008,7 +1008,7 @@ gnupg_libdir (void) +@@ -1280,7 +1280,7 @@ gnupg_libdir (void) + return name; } - return name; - #else /*!HAVE_W32_SYSTEM*/ -- return GNUPG_LIBDIR; -+ return getenv("GNUPG_LIBDIR") ?: GNUPG_LIBDIR; + else +- return GNUPG_LIBDIR; ++ return getenv("GNUPG_LIBDIR") ?: GNUPG_LIBDIR; #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1026,7 +1026,7 @@ gnupg_datadir (void) +@@ -1311,7 +1311,7 @@ gnupg_datadir (void) + return name; } - return name; - #else /*!HAVE_W32_SYSTEM*/ -- return GNUPG_DATADIR; -+ return getenv("GNUPG_DATADIR") ?: GNUPG_DATADIR; + else +- return GNUPG_DATADIR; ++ return getenv("GNUPG_DATADIR") ?: GNUPG_DATADIR; #endif /*!HAVE_W32_SYSTEM*/ } -@@ -1045,7 +1045,7 @@ gnupg_localedir (void) +@@ -1343,7 +1343,7 @@ gnupg_localedir (void) + return name; } - return name; - #else /*!HAVE_W32_SYSTEM*/ -- return LOCALEDIR; -+ return getenv("LOCALEDIR") ?: LOCALEDIR; + else +- return LOCALEDIR; ++ return getenv("LOCALEDIR") ?: LOCALEDIR; #endif /*!HAVE_W32_SYSTEM*/ } +-- +2.20.1 + diff --git a/meta/recipes-support/gnupg/gnupg_2.3.2.bb b/meta/recipes-support/gnupg/gnupg_2.3.3.bb similarity index 97% rename from meta/recipes-support/gnupg/gnupg_2.3.2.bb rename to meta/recipes-support/gnupg/gnupg_2.3.3.bb index f3b277b0a8..5614ac6473 100644 --- a/meta/recipes-support/gnupg/gnupg_2.3.2.bb +++ b/meta/recipes-support/gnupg/gnupg_2.3.3.bb @@ -24,7 +24,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for- file://relocate.patch" SRC_URI:append:class-nativesdk = " file://relocate.patch" -SRC_URI[sha256sum] = "e1d953e0e296072fca284215103ef168885eaac596c4660c5039a36a83e3041b" +SRC_URI[sha256sum] = "5789b86da6a1a6752efb38598f16a77af51170a8494039c3842b085032e8e937" EXTRA_OECONF = "--disable-ldap \ --disable-ccid-driver \ -- 2.20.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157182): https://lists.openembedded.org/g/openembedded-core/message/157182 Mute This Topic: https://lists.openembedded.org/mt/86442717/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
