summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnupg/gnupg/relocate.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/gnupg/gnupg/relocate.patch')
-rw-r--r--meta/recipes-support/gnupg/gnupg/relocate.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch
index 071dd93ff5..ea0252026a 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@
-From b1117adeb476304ce2792814516a5b7cd44d0d38 Mon Sep 17 00:00:00 2001
+From c50d0a95fcf8f96c272fadd4ba85f3eeac39fcaf Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Wed, 19 Sep 2018 14:44:40 +0100
Subject: [PATCH] Allow the environment to override where gnupg looks for its
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/common/homedir.c b/common/homedir.c
-index 67bbde8..7f360ba 100644
+index 6f99f3e..f22aa9e 100644
--- a/common/homedir.c
+++ b/common/homedir.c
-@@ -1171,7 +1171,7 @@ gnupg_socketdir (void)
+@@ -1284,7 +1284,7 @@ gnupg_socketdir (void)
if (!name)
{
unsigned int dummy;
@@ -26,7 +26,7 @@ index 67bbde8..7f360ba 100644
gpgrt_annotate_leaked_object (name);
}
-@@ -1203,7 +1203,7 @@ gnupg_sysconfdir (void)
+@@ -1316,7 +1316,7 @@ gnupg_sysconfdir (void)
if (dir)
return dir;
else
@@ -35,7 +35,7 @@ index 67bbde8..7f360ba 100644
#endif /*!HAVE_W32_SYSTEM*/
}
-@@ -1239,7 +1239,7 @@ gnupg_bindir (void)
+@@ -1352,7 +1352,7 @@ gnupg_bindir (void)
return name;
}
else
@@ -44,7 +44,7 @@ index 67bbde8..7f360ba 100644
#endif /*!HAVE_W32_SYSTEM*/
}
-@@ -1266,7 +1266,7 @@ gnupg_libexecdir (void)
+@@ -1379,7 +1379,7 @@ gnupg_libexecdir (void)
return name;
}
else
@@ -53,7 +53,7 @@ index 67bbde8..7f360ba 100644
#endif /*!HAVE_W32_SYSTEM*/
}
-@@ -1296,7 +1296,7 @@ gnupg_libdir (void)
+@@ -1409,7 +1409,7 @@ gnupg_libdir (void)
return name;
}
else
@@ -62,7 +62,7 @@ index 67bbde8..7f360ba 100644
#endif /*!HAVE_W32_SYSTEM*/
}
-@@ -1327,7 +1327,7 @@ gnupg_datadir (void)
+@@ -1440,7 +1440,7 @@ gnupg_datadir (void)
return name;
}
else
@@ -71,7 +71,7 @@ index 67bbde8..7f360ba 100644
#endif /*!HAVE_W32_SYSTEM*/
}
-@@ -1359,7 +1359,7 @@ gnupg_localedir (void)
+@@ -1472,7 +1472,7 @@ gnupg_localedir (void)
return name;
}
else