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