summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnupg/gnupg/relocate.patch
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-02-01 13:07:28 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-02-03 21:52:15 +0000
commit35ad01e17e3ba01f87902ab121247bfa600db225 (patch)
tree7fed61baabc13d60c442fc4f7e6dba1a7fc0baad /meta/recipes-support/gnupg/gnupg/relocate.patch
parent21c77ffa2800bca26a8060ddaeb9b18ae3a136bf (diff)
downloadopenembedded-core-35ad01e17e3ba01f87902ab121247bfa600db225.tar.gz
gnupg: upgrade 2.4.3 -> 2.4.4
fix-ldap.patch removed since it's included in 2.4.4. 0001-configure.ac-use-a-custom-value-for-the-location-of-.patch 0004-autogen.sh-fix-find-version-for-beta-checking.patch relocate.patch refreshed for 2.4.4 Changelog: https://dev.gnupg.org/T6578 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 d540e9edbb..ea0252026a 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@
-From 0e4b325c199354ce54cc4687532cced1440fd496 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 286685f..212a945 100644
+index 6f99f3e..f22aa9e 100644
--- a/common/homedir.c
+++ b/common/homedir.c
-@@ -1213,7 +1213,7 @@ gnupg_socketdir (void)
+@@ -1284,7 +1284,7 @@ gnupg_socketdir (void)
if (!name)
{
unsigned int dummy;
@@ -26,7 +26,7 @@ index 286685f..212a945 100644
gpgrt_annotate_leaked_object (name);
}
-@@ -1245,7 +1245,7 @@ gnupg_sysconfdir (void)
+@@ -1316,7 +1316,7 @@ gnupg_sysconfdir (void)
if (dir)
return dir;
else
@@ -35,7 +35,7 @@ index 286685f..212a945 100644
#endif /*!HAVE_W32_SYSTEM*/
}
-@@ -1281,7 +1281,7 @@ gnupg_bindir (void)
+@@ -1352,7 +1352,7 @@ gnupg_bindir (void)
return name;
}
else
@@ -44,7 +44,7 @@ index 286685f..212a945 100644
#endif /*!HAVE_W32_SYSTEM*/
}
-@@ -1308,7 +1308,7 @@ gnupg_libexecdir (void)
+@@ -1379,7 +1379,7 @@ gnupg_libexecdir (void)
return name;
}
else
@@ -53,7 +53,7 @@ index 286685f..212a945 100644
#endif /*!HAVE_W32_SYSTEM*/
}
-@@ -1338,7 +1338,7 @@ gnupg_libdir (void)
+@@ -1409,7 +1409,7 @@ gnupg_libdir (void)
return name;
}
else
@@ -62,7 +62,7 @@ index 286685f..212a945 100644
#endif /*!HAVE_W32_SYSTEM*/
}
-@@ -1369,7 +1369,7 @@ gnupg_datadir (void)
+@@ -1440,7 +1440,7 @@ gnupg_datadir (void)
return name;
}
else
@@ -71,7 +71,7 @@ index 286685f..212a945 100644
#endif /*!HAVE_W32_SYSTEM*/
}
-@@ -1401,7 +1401,7 @@ gnupg_localedir (void)
+@@ -1472,7 +1472,7 @@ gnupg_localedir (void)
return name;
}
else