1From 89ae4f03307104689e1857d9857d452af6b35ac4 Mon Sep 17 00:00:00 2001 2From: Ross Burton <ross.burton@intel.com> 3Date: Wed, 19 Sep 2018 14:44:40 +0100 4Subject: [PATCH] Allow the environment to override where gnupg looks for its 5 own files. Useful in native builds. 6 7Upstream-Status: Inappropriate [OE-specific] 8Signed-off-by: Ross Burton <ross.burton@intel.com> 9 10Signed-off-by: Alexander Kanavin <alex@linutronix.de> 11 12--- 13 common/homedir.c | 14 +++++++------- 14 1 file changed, 7 insertions(+), 7 deletions(-) 15 16diff --git a/common/homedir.c b/common/homedir.c 17index 260aeb2..1aeb08d 100644 18--- a/common/homedir.c 19+++ b/common/homedir.c 20@@ -1143,7 +1143,7 @@ gnupg_socketdir (void) 21 if (!name) 22 { 23 unsigned int dummy; 24- name = _gnupg_socketdir_internal (0, &dummy); 25+ name = getenv("GNUPG_SOCKETDIR") ?: _gnupg_socketdir_internal (0, &dummy); 26 gpgrt_annotate_leaked_object (name); 27 } 28 29@@ -1175,7 +1175,7 @@ gnupg_sysconfdir (void) 30 if (dir) 31 return dir; 32 else 33- return GNUPG_SYSCONFDIR; 34+ return getenv("GNUPG_SYSCONFDIR") ?: GNUPG_SYSCONFDIR; 35 #endif /*!HAVE_W32_SYSTEM*/ 36 } 37 38@@ -1211,7 +1211,7 @@ gnupg_bindir (void) 39 return name; 40 } 41 else 42- return GNUPG_BINDIR; 43+ return getenv("GNUPG_BINDIR") ?: GNUPG_BINDIR; 44 #endif /*!HAVE_W32_SYSTEM*/ 45 } 46 47@@ -1238,7 +1238,7 @@ gnupg_libexecdir (void) 48 return name; 49 } 50 else 51- return GNUPG_LIBEXECDIR; 52+ return getenv("GNUPG_LIBEXECDIR") ?: GNUPG_LIBEXECDIR; 53 #endif /*!HAVE_W32_SYSTEM*/ 54 } 55 56@@ -1268,7 +1268,7 @@ gnupg_libdir (void) 57 return name; 58 } 59 else 60- return GNUPG_LIBDIR; 61+ return getenv("GNUPG_LIBDIR") ?: GNUPG_LIBDIR; 62 #endif /*!HAVE_W32_SYSTEM*/ 63 } 64 65@@ -1299,7 +1299,7 @@ gnupg_datadir (void) 66 return name; 67 } 68 else 69- return GNUPG_DATADIR; 70+ return getenv("GNUPG_DATADIR") ?: GNUPG_DATADIR; 71 #endif /*!HAVE_W32_SYSTEM*/ 72 } 73 74@@ -1331,7 +1331,7 @@ gnupg_localedir (void) 75 return name; 76 } 77 else 78- return LOCALEDIR; 79+ return getenv("LOCALEDIR") ?: LOCALEDIR; 80 #endif /*!HAVE_W32_SYSTEM*/ 81 } 82 83