diff options
Diffstat (limited to 'meta/recipes-support/gnupg/gnupg/relocate.patch')
| -rw-r--r-- | meta/recipes-support/gnupg/gnupg/relocate.patch | 72 |
1 files changed, 37 insertions, 35 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index f9f38c2876..ea0252026a 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 c50d0a95fcf8f96c272fadd4ba85f3eeac39fcaf Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Wed, 19 Sep 2018 14:44:40 +0100 Subject: [PATCH] Allow the environment to override where gnupg looks for its @@ -7,15 +7,17 @@ Subject: [PATCH] Allow the environment to override where gnupg looks for its Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Ross Burton <ross.burton@intel.com> +Signed-off-by: Alexander Kanavin <alex@linutronix.de> + --- 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 6f99f3e..f22aa9e 100644 --- a/common/homedir.c +++ b/common/homedir.c -@@ -918,7 +918,7 @@ gnupg_socketdir (void) +@@ -1284,7 +1284,7 @@ gnupg_socketdir (void) if (!name) { unsigned int dummy; @@ -24,57 +26,57 @@ 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; +@@ -1316,7 +1316,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) +@@ -1352,7 +1352,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; +@@ -1379,7 +1379,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) +@@ -1409,7 +1409,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) +@@ -1440,7 +1440,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) +@@ -1472,7 +1472,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*/ } |