diff options
Diffstat (limited to 'meta/recipes-support/gnupg/gnupg/relocate.patch')
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/relocate.patch | 91 |
1 files changed, 42 insertions, 49 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index 7f7812cd46..ea0252026a 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bd66af2ac7bb6d9294ac8055a55462ba7c4f9c9b Mon Sep 17 00:00:00 2001 | 1 | From c50d0a95fcf8f96c272fadd4ba85f3eeac39fcaf Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Wed, 19 Sep 2018 14:44:40 +0100 | 3 | Date: Wed, 19 Sep 2018 14:44:40 +0100 |
4 | Subject: [PATCH] Allow the environment to override where gnupg looks for its | 4 | Subject: [PATCH] Allow the environment to override where gnupg looks for its |
@@ -7,83 +7,76 @@ Subject: [PATCH] Allow the environment to override where gnupg looks for its | |||
7 | Upstream-Status: Inappropriate [OE-specific] | 7 | Upstream-Status: Inappropriate [OE-specific] |
8 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 8 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
9 | 9 | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | |||
10 | --- | 12 | --- |
11 | common/homedir.c | 16 ++++++++-------- | 13 | common/homedir.c | 14 +++++++------- |
12 | 1 file changed, 8 insertions(+), 8 deletions(-) | 14 | 1 file changed, 7 insertions(+), 7 deletions(-) |
13 | 15 | ||
14 | diff --git a/common/homedir.c b/common/homedir.c | 16 | diff --git a/common/homedir.c b/common/homedir.c |
15 | index 4b6e46e..58989b4 100644 | 17 | index 6f99f3e..f22aa9e 100644 |
16 | --- a/common/homedir.c | 18 | --- a/common/homedir.c |
17 | +++ b/common/homedir.c | 19 | +++ b/common/homedir.c |
18 | @@ -763,7 +763,7 @@ gnupg_socketdir (void) | 20 | @@ -1284,7 +1284,7 @@ gnupg_socketdir (void) |
19 | if (!name) | 21 | if (!name) |
20 | { | 22 | { |
21 | unsigned int dummy; | 23 | unsigned int dummy; |
22 | - name = _gnupg_socketdir_internal (0, &dummy); | 24 | - name = _gnupg_socketdir_internal (0, &dummy); |
23 | + name = getenv("GNUPG_SOCKETDIR") ?: _gnupg_socketdir_internal (0, &dummy); | 25 | + name = getenv("GNUPG_SOCKETDIR") ?: _gnupg_socketdir_internal (0, &dummy); |
26 | gpgrt_annotate_leaked_object (name); | ||
24 | } | 27 | } |
25 | 28 | ||
26 | return name; | 29 | @@ -1316,7 +1316,7 @@ gnupg_sysconfdir (void) |
27 | @@ -789,7 +789,7 @@ gnupg_sysconfdir (void) | 30 | if (dir) |
28 | } | 31 | return dir; |
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 | |||
36 | @@ -818,7 +818,7 @@ gnupg_bindir (void) | ||
37 | else | 32 | else |
38 | return rdir; | 33 | - return GNUPG_SYSCONFDIR; |
39 | #else /*!HAVE_W32_SYSTEM*/ | 34 | + return getenv("GNUPG_SYSCONFDIR") ?: GNUPG_SYSCONFDIR; |
40 | - return GNUPG_BINDIR; | ||
41 | + return getenv("GNUPG_BINDIR") ?: GNUPG_BINDIR; | ||
42 | #endif /*!HAVE_W32_SYSTEM*/ | 35 | #endif /*!HAVE_W32_SYSTEM*/ |
43 | } | 36 | } |
44 | 37 | ||
45 | @@ -831,7 +831,7 @@ gnupg_libexecdir (void) | 38 | @@ -1352,7 +1352,7 @@ gnupg_bindir (void) |
46 | #ifdef HAVE_W32_SYSTEM | 39 | return name; |
47 | return gnupg_bindir (); | 40 | } |
48 | #else /*!HAVE_W32_SYSTEM*/ | 41 | else |
49 | - return GNUPG_LIBEXECDIR; | 42 | - return GNUPG_BINDIR; |
50 | + return getenv("GNUPG_LIBEXECDIR") ?: GNUPG_LIBEXECDIR; | 43 | + return getenv("GNUPG_BINDIR") ?: GNUPG_BINDIR; |
51 | #endif /*!HAVE_W32_SYSTEM*/ | 44 | #endif /*!HAVE_W32_SYSTEM*/ |
52 | } | 45 | } |
53 | 46 | ||
54 | @@ -845,7 +845,7 @@ gnupg_libdir (void) | 47 | @@ -1379,7 +1379,7 @@ gnupg_libexecdir (void) |
55 | name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL); | 48 | return name; |
56 | return name; | 49 | } |
57 | #else /*!HAVE_W32_SYSTEM*/ | 50 | else |
58 | - return GNUPG_LIBDIR; | 51 | - return GNUPG_LIBEXECDIR; |
59 | + return getenv("GNUPG_LIBDIR") ?: GNUPG_LIBDIR; | 52 | + return getenv("GNUPG_LIBEXECDIR") ?: GNUPG_LIBEXECDIR; |
60 | #endif /*!HAVE_W32_SYSTEM*/ | 53 | #endif /*!HAVE_W32_SYSTEM*/ |
61 | } | 54 | } |
62 | 55 | ||
63 | @@ -859,7 +859,7 @@ gnupg_datadir (void) | 56 | @@ -1409,7 +1409,7 @@ gnupg_libdir (void) |
64 | name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL); | 57 | return name; |
65 | return name; | 58 | } |
66 | #else /*!HAVE_W32_SYSTEM*/ | 59 | else |
67 | - return GNUPG_DATADIR; | 60 | - return GNUPG_LIBDIR; |
68 | + return getenv("GNUPG_DATADIR") ?: GNUPG_DATADIR; | 61 | + return getenv("GNUPG_LIBDIR") ?: GNUPG_LIBDIR; |
69 | #endif /*!HAVE_W32_SYSTEM*/ | 62 | #endif /*!HAVE_W32_SYSTEM*/ |
70 | } | 63 | } |
71 | 64 | ||
72 | @@ -875,7 +875,7 @@ gnupg_localedir (void) | 65 | @@ -1440,7 +1440,7 @@ gnupg_datadir (void) |
73 | NULL); | 66 | return name; |
74 | return name; | 67 | } |
75 | #else /*!HAVE_W32_SYSTEM*/ | 68 | else |
76 | - return LOCALEDIR; | 69 | - return GNUPG_DATADIR; |
77 | + return getenv("LOCALEDIR") ?: LOCALEDIR; | 70 | + return getenv("GNUPG_DATADIR") ?: GNUPG_DATADIR; |
78 | #endif /*!HAVE_W32_SYSTEM*/ | 71 | #endif /*!HAVE_W32_SYSTEM*/ |
79 | } | 72 | } |
80 | 73 | ||
81 | @@ -943,7 +943,7 @@ gnupg_cachedir (void) | 74 | @@ -1472,7 +1472,7 @@ gnupg_localedir (void) |
75 | return name; | ||
82 | } | 76 | } |
83 | return dir; | 77 | else |
84 | #else /*!HAVE_W32_SYSTEM*/ | 78 | - return LOCALEDIR; |
85 | - return GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME; | 79 | + return getenv("LOCALEDIR") ?: LOCALEDIR; |
86 | + return getenv("GNUPG_LOCALSTATEDIR") ?: GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME; | ||
87 | #endif /*!HAVE_W32_SYSTEM*/ | 80 | #endif /*!HAVE_W32_SYSTEM*/ |
88 | } | 81 | } |
89 | 82 | ||