blob: 43999b8a6d80f479629539e54780eef6f6d9fe9d [file] [log] [blame]
Andrew Geisslerd5838332022-05-27 11:33:10 -05001From 89ae4f03307104689e1857d9857d452af6b35ac4 Mon Sep 17 00:00:00 2001
Brad Bishopa5c52ff2018-11-23 10:55:50 +13002From: 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.
Brad Bishopc4ea0752018-11-15 14:30:15 -08006
7Upstream-Status: Inappropriate [OE-specific]
8Signed-off-by: Ross Burton <ross.burton@intel.com>
9
Andrew Geisslereff27472021-10-29 15:35:00 -050010Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Andrew Geissler595f6302022-01-24 19:11:47 +000011
Brad Bishopa5c52ff2018-11-23 10:55:50 +130012---
Andrew Geisslereff27472021-10-29 15:35:00 -050013 common/homedir.c | 14 +++++++-------
14 1 file changed, 7 insertions(+), 7 deletions(-)
Brad Bishopa5c52ff2018-11-23 10:55:50 +130015
Brad Bishopc4ea0752018-11-15 14:30:15 -080016diff --git a/common/homedir.c b/common/homedir.c
Andrew Geisslerd5838332022-05-27 11:33:10 -050017index 260aeb2..1aeb08d 100644
Brad Bishopc4ea0752018-11-15 14:30:15 -080018--- a/common/homedir.c
19+++ b/common/homedir.c
Andrew Geisslerd5838332022-05-27 11:33:10 -050020@@ -1143,7 +1143,7 @@ gnupg_socketdir (void)
Brad Bishopc4ea0752018-11-15 14:30:15 -080021 if (!name)
22 {
23 unsigned int dummy;
24- name = _gnupg_socketdir_internal (0, &dummy);
25+ name = getenv("GNUPG_SOCKETDIR") ?: _gnupg_socketdir_internal (0, &dummy);
Andrew Geisslereff27472021-10-29 15:35:00 -050026 gpgrt_annotate_leaked_object (name);
Brad Bishopc4ea0752018-11-15 14:30:15 -080027 }
28
Andrew Geisslerd5838332022-05-27 11:33:10 -050029@@ -1175,7 +1175,7 @@ gnupg_sysconfdir (void)
Andrew Geisslereff27472021-10-29 15:35:00 -050030 if (dir)
31 return dir;
Brad Bishopc4ea0752018-11-15 14:30:15 -080032 else
Andrew Geisslereff27472021-10-29 15:35:00 -050033- return GNUPG_SYSCONFDIR;
34+ return getenv("GNUPG_SYSCONFDIR") ?: GNUPG_SYSCONFDIR;
Brad Bishopc4ea0752018-11-15 14:30:15 -080035 #endif /*!HAVE_W32_SYSTEM*/
36 }
37
Andrew Geisslerd5838332022-05-27 11:33:10 -050038@@ -1211,7 +1211,7 @@ gnupg_bindir (void)
Andrew Geisslereff27472021-10-29 15:35:00 -050039 return name;
Brad Bishopc4ea0752018-11-15 14:30:15 -080040 }
Andrew Geisslereff27472021-10-29 15:35:00 -050041 else
42- return GNUPG_BINDIR;
43+ return getenv("GNUPG_BINDIR") ?: GNUPG_BINDIR;
Brad Bishopc4ea0752018-11-15 14:30:15 -080044 #endif /*!HAVE_W32_SYSTEM*/
45 }
46
Andrew Geisslerd5838332022-05-27 11:33:10 -050047@@ -1238,7 +1238,7 @@ gnupg_libexecdir (void)
Andrew Geisslereff27472021-10-29 15:35:00 -050048 return name;
49 }
50 else
51- return GNUPG_LIBEXECDIR;
52+ return getenv("GNUPG_LIBEXECDIR") ?: GNUPG_LIBEXECDIR;
53 #endif /*!HAVE_W32_SYSTEM*/
54 }
55
Andrew Geisslerd5838332022-05-27 11:33:10 -050056@@ -1268,7 +1268,7 @@ gnupg_libdir (void)
Andrew Geisslereff27472021-10-29 15:35:00 -050057 return name;
58 }
59 else
60- return GNUPG_LIBDIR;
61+ return getenv("GNUPG_LIBDIR") ?: GNUPG_LIBDIR;
62 #endif /*!HAVE_W32_SYSTEM*/
63 }
64
Andrew Geisslerd5838332022-05-27 11:33:10 -050065@@ -1299,7 +1299,7 @@ gnupg_datadir (void)
Andrew Geisslereff27472021-10-29 15:35:00 -050066 return name;
67 }
68 else
69- return GNUPG_DATADIR;
70+ return getenv("GNUPG_DATADIR") ?: GNUPG_DATADIR;
71 #endif /*!HAVE_W32_SYSTEM*/
72 }
73
Andrew Geisslerd5838332022-05-27 11:33:10 -050074@@ -1331,7 +1331,7 @@ gnupg_localedir (void)
Andrew Geisslereff27472021-10-29 15:35:00 -050075 return name;
76 }
77 else
78- return LOCALEDIR;
79+ return getenv("LOCALEDIR") ?: LOCALEDIR;
80 #endif /*!HAVE_W32_SYSTEM*/
81 }
82