diff options
Diffstat (limited to 'meta/recipes-support/gnupg/gnupg/relocate.patch')
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/relocate.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch index e5a82aa76d..7f7812cd46 100644 --- a/meta/recipes-support/gnupg/gnupg/relocate.patch +++ b/meta/recipes-support/gnupg/gnupg/relocate.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 59c077f32e81190955910cae02599c7a3edfa7fb Mon Sep 17 00:00:00 2001 | 1 | From bd66af2ac7bb6d9294ac8055a55462ba7c4f9c9b 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 |
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
12 | 1 file changed, 8 insertions(+), 8 deletions(-) | 12 | 1 file changed, 8 insertions(+), 8 deletions(-) |
13 | 13 | ||
14 | diff --git a/common/homedir.c b/common/homedir.c | 14 | diff --git a/common/homedir.c b/common/homedir.c |
15 | index e9e75d0..19140aa 100644 | 15 | index 4b6e46e..58989b4 100644 |
16 | --- a/common/homedir.c | 16 | --- a/common/homedir.c |
17 | +++ b/common/homedir.c | 17 | +++ b/common/homedir.c |
18 | @@ -760,7 +760,7 @@ gnupg_socketdir (void) | 18 | @@ -763,7 +763,7 @@ gnupg_socketdir (void) |
19 | if (!name) | 19 | if (!name) |
20 | { | 20 | { |
21 | unsigned int dummy; | 21 | unsigned int dummy; |
@@ -24,7 +24,7 @@ index e9e75d0..19140aa 100644 | |||
24 | } | 24 | } |
25 | 25 | ||
26 | return name; | 26 | return name; |
27 | @@ -786,7 +786,7 @@ gnupg_sysconfdir (void) | 27 | @@ -789,7 +789,7 @@ gnupg_sysconfdir (void) |
28 | } | 28 | } |
29 | return name; | 29 | return name; |
30 | #else /*!HAVE_W32_SYSTEM*/ | 30 | #else /*!HAVE_W32_SYSTEM*/ |
@@ -33,7 +33,7 @@ index e9e75d0..19140aa 100644 | |||
33 | #endif /*!HAVE_W32_SYSTEM*/ | 33 | #endif /*!HAVE_W32_SYSTEM*/ |
34 | } | 34 | } |
35 | 35 | ||
36 | @@ -815,7 +815,7 @@ gnupg_bindir (void) | 36 | @@ -818,7 +818,7 @@ gnupg_bindir (void) |
37 | else | 37 | else |
38 | return rdir; | 38 | return rdir; |
39 | #else /*!HAVE_W32_SYSTEM*/ | 39 | #else /*!HAVE_W32_SYSTEM*/ |
@@ -42,7 +42,7 @@ index e9e75d0..19140aa 100644 | |||
42 | #endif /*!HAVE_W32_SYSTEM*/ | 42 | #endif /*!HAVE_W32_SYSTEM*/ |
43 | } | 43 | } |
44 | 44 | ||
45 | @@ -828,7 +828,7 @@ gnupg_libexecdir (void) | 45 | @@ -831,7 +831,7 @@ gnupg_libexecdir (void) |
46 | #ifdef HAVE_W32_SYSTEM | 46 | #ifdef HAVE_W32_SYSTEM |
47 | return gnupg_bindir (); | 47 | return gnupg_bindir (); |
48 | #else /*!HAVE_W32_SYSTEM*/ | 48 | #else /*!HAVE_W32_SYSTEM*/ |
@@ -51,7 +51,7 @@ index e9e75d0..19140aa 100644 | |||
51 | #endif /*!HAVE_W32_SYSTEM*/ | 51 | #endif /*!HAVE_W32_SYSTEM*/ |
52 | } | 52 | } |
53 | 53 | ||
54 | @@ -842,7 +842,7 @@ gnupg_libdir (void) | 54 | @@ -845,7 +845,7 @@ gnupg_libdir (void) |
55 | name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL); | 55 | name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL); |
56 | return name; | 56 | return name; |
57 | #else /*!HAVE_W32_SYSTEM*/ | 57 | #else /*!HAVE_W32_SYSTEM*/ |
@@ -60,7 +60,7 @@ index e9e75d0..19140aa 100644 | |||
60 | #endif /*!HAVE_W32_SYSTEM*/ | 60 | #endif /*!HAVE_W32_SYSTEM*/ |
61 | } | 61 | } |
62 | 62 | ||
63 | @@ -856,7 +856,7 @@ gnupg_datadir (void) | 63 | @@ -859,7 +859,7 @@ gnupg_datadir (void) |
64 | name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL); | 64 | name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL); |
65 | return name; | 65 | return name; |
66 | #else /*!HAVE_W32_SYSTEM*/ | 66 | #else /*!HAVE_W32_SYSTEM*/ |
@@ -69,7 +69,7 @@ index e9e75d0..19140aa 100644 | |||
69 | #endif /*!HAVE_W32_SYSTEM*/ | 69 | #endif /*!HAVE_W32_SYSTEM*/ |
70 | } | 70 | } |
71 | 71 | ||
72 | @@ -872,7 +872,7 @@ gnupg_localedir (void) | 72 | @@ -875,7 +875,7 @@ gnupg_localedir (void) |
73 | NULL); | 73 | NULL); |
74 | return name; | 74 | return name; |
75 | #else /*!HAVE_W32_SYSTEM*/ | 75 | #else /*!HAVE_W32_SYSTEM*/ |
@@ -78,7 +78,7 @@ index e9e75d0..19140aa 100644 | |||
78 | #endif /*!HAVE_W32_SYSTEM*/ | 78 | #endif /*!HAVE_W32_SYSTEM*/ |
79 | } | 79 | } |
80 | 80 | ||
81 | @@ -940,7 +940,7 @@ gnupg_cachedir (void) | 81 | @@ -943,7 +943,7 @@ gnupg_cachedir (void) |
82 | } | 82 | } |
83 | return dir; | 83 | return dir; |
84 | #else /*!HAVE_W32_SYSTEM*/ | 84 | #else /*!HAVE_W32_SYSTEM*/ |