Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 1 | From 4005b3342db06749453835720b5a5c2392a90810 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 | |
Brad Bishop | a5c52ff | 2018-11-23 10:55:50 +1300 | [diff] [blame] | 10 | --- |
| 11 | common/homedir.c | 16 ++++++++-------- |
| 12 | 1 file changed, 8 insertions(+), 8 deletions(-) |
| 13 | |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 14 | diff --git a/common/homedir.c b/common/homedir.c |
Andrew Geissler | b7d2861 | 2020-07-24 16:15:54 -0500 | [diff] [blame] | 15 | index 4b6e46e..58989b4 100644 |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 16 | --- a/common/homedir.c |
| 17 | +++ b/common/homedir.c |
Andrew Geissler | b7d2861 | 2020-07-24 16:15:54 -0500 | [diff] [blame] | 18 | @@ -763,7 +763,7 @@ gnupg_socketdir (void) |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 19 | if (!name) |
| 20 | { |
| 21 | unsigned int dummy; |
| 22 | - name = _gnupg_socketdir_internal (0, &dummy); |
| 23 | + name = getenv("GNUPG_SOCKETDIR") ?: _gnupg_socketdir_internal (0, &dummy); |
| 24 | } |
| 25 | |
| 26 | return name; |
Andrew Geissler | b7d2861 | 2020-07-24 16:15:54 -0500 | [diff] [blame] | 27 | @@ -789,7 +789,7 @@ gnupg_sysconfdir (void) |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 28 | } |
| 29 | return name; |
| 30 | #else /*!HAVE_W32_SYSTEM*/ |
| 31 | - return GNUPG_SYSCONFDIR; |
| 32 | + return getenv("GNUPG_SYSCONFDIR") ?: GNUPG_SYSCONFDIR; |
| 33 | #endif /*!HAVE_W32_SYSTEM*/ |
| 34 | } |
| 35 | |
Andrew Geissler | b7d2861 | 2020-07-24 16:15:54 -0500 | [diff] [blame] | 36 | @@ -818,7 +818,7 @@ gnupg_bindir (void) |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 37 | else |
| 38 | return rdir; |
| 39 | #else /*!HAVE_W32_SYSTEM*/ |
| 40 | - return GNUPG_BINDIR; |
| 41 | + return getenv("GNUPG_BINDIR") ?: GNUPG_BINDIR; |
| 42 | #endif /*!HAVE_W32_SYSTEM*/ |
| 43 | } |
| 44 | |
Andrew Geissler | b7d2861 | 2020-07-24 16:15:54 -0500 | [diff] [blame] | 45 | @@ -831,7 +831,7 @@ gnupg_libexecdir (void) |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 46 | #ifdef HAVE_W32_SYSTEM |
| 47 | return gnupg_bindir (); |
| 48 | #else /*!HAVE_W32_SYSTEM*/ |
| 49 | - return GNUPG_LIBEXECDIR; |
| 50 | + return getenv("GNUPG_LIBEXECDIR") ?: GNUPG_LIBEXECDIR; |
| 51 | #endif /*!HAVE_W32_SYSTEM*/ |
| 52 | } |
| 53 | |
Andrew Geissler | b7d2861 | 2020-07-24 16:15:54 -0500 | [diff] [blame] | 54 | @@ -845,7 +845,7 @@ gnupg_libdir (void) |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 55 | name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL); |
| 56 | return name; |
| 57 | #else /*!HAVE_W32_SYSTEM*/ |
| 58 | - return GNUPG_LIBDIR; |
| 59 | + return getenv("GNUPG_LIBDIR") ?: GNUPG_LIBDIR; |
| 60 | #endif /*!HAVE_W32_SYSTEM*/ |
| 61 | } |
| 62 | |
Andrew Geissler | b7d2861 | 2020-07-24 16:15:54 -0500 | [diff] [blame] | 63 | @@ -859,7 +859,7 @@ gnupg_datadir (void) |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 64 | name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL); |
| 65 | return name; |
| 66 | #else /*!HAVE_W32_SYSTEM*/ |
| 67 | - return GNUPG_DATADIR; |
| 68 | + return getenv("GNUPG_DATADIR") ?: GNUPG_DATADIR; |
| 69 | #endif /*!HAVE_W32_SYSTEM*/ |
| 70 | } |
| 71 | |
Andrew Geissler | b7d2861 | 2020-07-24 16:15:54 -0500 | [diff] [blame] | 72 | @@ -875,7 +875,7 @@ gnupg_localedir (void) |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 73 | NULL); |
| 74 | return name; |
| 75 | #else /*!HAVE_W32_SYSTEM*/ |
| 76 | - return LOCALEDIR; |
| 77 | + return getenv("LOCALEDIR") ?: LOCALEDIR; |
| 78 | #endif /*!HAVE_W32_SYSTEM*/ |
| 79 | } |
| 80 | |
Andrew Geissler | b7d2861 | 2020-07-24 16:15:54 -0500 | [diff] [blame] | 81 | @@ -943,7 +943,7 @@ gnupg_cachedir (void) |
Brad Bishop | c4ea075 | 2018-11-15 14:30:15 -0800 | [diff] [blame] | 82 | } |
| 83 | return dir; |
| 84 | #else /*!HAVE_W32_SYSTEM*/ |
| 85 | - return GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME; |
| 86 | + return getenv("GNUPG_LOCALSTATEDIR") ?: GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME; |
| 87 | #endif /*!HAVE_W32_SYSTEM*/ |
| 88 | } |
| 89 | |