Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 1 | From 89ae4f03307104689e1857d9857d452af6b35ac4 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> |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 11 | |
Brad Bishop | a5c52ff | 2018-11-23 10:55:50 +1300 | [diff] [blame] | 12 | --- |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 13 | common/homedir.c | 14 +++++++------- |
| 14 | 1 file changed, 7 insertions(+), 7 deletions(-) |
Brad Bishop | a5c52ff | 2018-11-23 10:55:50 +1300 | [diff] [blame] | 15 | |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 16 | diff --git a/common/homedir.c b/common/homedir.c |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 17 | index 260aeb2..1aeb08d 100644 |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 18 | --- a/common/homedir.c |
| 19 | +++ b/common/homedir.c |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 20 | @@ -1143,7 +1143,7 @@ gnupg_socketdir (void) |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 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); |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 26 | gpgrt_annotate_leaked_object (name); |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 27 | } |
| 28 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 29 | @@ -1175,7 +1175,7 @@ gnupg_sysconfdir (void) |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 30 | if (dir) |
| 31 | return dir; |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 32 | else |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 33 | - return GNUPG_SYSCONFDIR; |
| 34 | + return getenv("GNUPG_SYSCONFDIR") ?: GNUPG_SYSCONFDIR; |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 35 | #endif /*!HAVE_W32_SYSTEM*/ |
| 36 | } |
| 37 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 38 | @@ -1211,7 +1211,7 @@ gnupg_bindir (void) |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 39 | return name; |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 40 | } |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 41 | else |
| 42 | - return GNUPG_BINDIR; |
| 43 | + return getenv("GNUPG_BINDIR") ?: GNUPG_BINDIR; |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 44 | #endif /*!HAVE_W32_SYSTEM*/ |
| 45 | } |
| 46 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 47 | @@ -1238,7 +1238,7 @@ gnupg_libexecdir (void) |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 48 | return name; |
| 49 | } |
| 50 | else |
| 51 | - return GNUPG_LIBEXECDIR; |
| 52 | + return getenv("GNUPG_LIBEXECDIR") ?: GNUPG_LIBEXECDIR; |
| 53 | #endif /*!HAVE_W32_SYSTEM*/ |
| 54 | } |
| 55 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 56 | @@ -1268,7 +1268,7 @@ gnupg_libdir (void) |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 57 | return name; |
| 58 | } |
| 59 | else |
| 60 | - return GNUPG_LIBDIR; |
| 61 | + return getenv("GNUPG_LIBDIR") ?: GNUPG_LIBDIR; |
| 62 | #endif /*!HAVE_W32_SYSTEM*/ |
| 63 | } |
| 64 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 65 | @@ -1299,7 +1299,7 @@ gnupg_datadir (void) |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 66 | return name; |
| 67 | } |
| 68 | else |
| 69 | - return GNUPG_DATADIR; |
| 70 | + return getenv("GNUPG_DATADIR") ?: GNUPG_DATADIR; |
| 71 | #endif /*!HAVE_W32_SYSTEM*/ |
| 72 | } |
| 73 | |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 74 | @@ -1331,7 +1331,7 @@ gnupg_localedir (void) |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 75 | return name; |
| 76 | } |
| 77 | else |
| 78 | - return LOCALEDIR; |
| 79 | + return getenv("LOCALEDIR") ?: LOCALEDIR; |
| 80 | #endif /*!HAVE_W32_SYSTEM*/ |
| 81 | } |
| 82 | |