relocate.patch 2.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081
  1. Allow the environment to override where gnupg looks for its own files. Useful in native builds.
  2. Upstream-Status: Inappropriate [OE-specific]
  3. Signed-off-by: Ross Burton <ross.burton@intel.com>
  4. diff --git a/common/homedir.c b/common/homedir.c
  5. index e9e75d01e..19140aa0d 100644
  6. --- a/common/homedir.c
  7. +++ b/common/homedir.c
  8. @@ -760,7 +760,7 @@ gnupg_socketdir (void)
  9. if (!name)
  10. {
  11. unsigned int dummy;
  12. - name = _gnupg_socketdir_internal (0, &dummy);
  13. + name = getenv("GNUPG_SOCKETDIR") ?: _gnupg_socketdir_internal (0, &dummy);
  14. }
  15. return name;
  16. @@ -786,7 +786,7 @@ gnupg_sysconfdir (void)
  17. }
  18. return name;
  19. #else /*!HAVE_W32_SYSTEM*/
  20. - return GNUPG_SYSCONFDIR;
  21. + return getenv("GNUPG_SYSCONFDIR") ?: GNUPG_SYSCONFDIR;
  22. #endif /*!HAVE_W32_SYSTEM*/
  23. }
  24. @@ -815,7 +815,7 @@ gnupg_bindir (void)
  25. else
  26. return rdir;
  27. #else /*!HAVE_W32_SYSTEM*/
  28. - return GNUPG_BINDIR;
  29. + return getenv("GNUPG_BINDIR") ?: GNUPG_BINDIR;
  30. #endif /*!HAVE_W32_SYSTEM*/
  31. }
  32. @@ -828,7 +828,7 @@ gnupg_libexecdir (void)
  33. #ifdef HAVE_W32_SYSTEM
  34. return gnupg_bindir ();
  35. #else /*!HAVE_W32_SYSTEM*/
  36. - return GNUPG_LIBEXECDIR;
  37. + return getenv("GNUPG_LIBEXECDIR") ?: GNUPG_LIBEXECDIR;
  38. #endif /*!HAVE_W32_SYSTEM*/
  39. }
  40. @@ -842,7 +842,7 @@ gnupg_libdir (void)
  41. name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL);
  42. return name;
  43. #else /*!HAVE_W32_SYSTEM*/
  44. - return GNUPG_LIBDIR;
  45. + return getenv("GNUPG_LIBDIR") ?: GNUPG_LIBDIR;
  46. #endif /*!HAVE_W32_SYSTEM*/
  47. }
  48. @@ -856,7 +856,7 @@ gnupg_datadir (void)
  49. name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL);
  50. return name;
  51. #else /*!HAVE_W32_SYSTEM*/
  52. - return GNUPG_DATADIR;
  53. + return getenv("GNUPG_DATADIR") ?: GNUPG_DATADIR;
  54. #endif /*!HAVE_W32_SYSTEM*/
  55. }
  56. @@ -872,7 +872,7 @@ gnupg_localedir (void)
  57. NULL);
  58. return name;
  59. #else /*!HAVE_W32_SYSTEM*/
  60. - return LOCALEDIR;
  61. + return getenv("LOCALEDIR") ?: LOCALEDIR;
  62. #endif /*!HAVE_W32_SYSTEM*/
  63. }
  64. @@ -940,7 +940,7 @@ gnupg_cachedir (void)
  65. }
  66. return dir;
  67. #else /*!HAVE_W32_SYSTEM*/
  68. - return GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME;
  69. + return getenv("GNUPG_LOCALSTATEDIR") ?: GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME;
  70. #endif /*!HAVE_W32_SYSTEM*/
  71. }