aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/geoclue-config.patch
blob: dd35b90be53e914929806204bba8389054da556a (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
Allow the configuration file to be specified via an environment variable.

--- geoclue-2.1.10/src/gclue-config.c	2015-04-07 09:50:07.721074380 +0200
+++ geoclue-2.1.10/src/gclue-config.c	2015-04-07 10:27:26.613171960 +0200
@@ -235,6 +235,11 @@
 gclue_config_init (GClueConfig *config)
 {
         GError *error = NULL;
+	const char *config_file_path;
+
+	config_file_path = g_getenv ("GEOCLUE_CONFIG_FILE");
+	if (config_file_path == NULL)
+	  config_file_path = CONFIG_FILE_PATH;
 
         config->priv =
                 G_TYPE_INSTANCE_GET_PRIVATE (config,
@@ -242,7 +247,7 @@
                                             GClueConfigPrivate);
         config->priv->key_file = g_key_file_new ();
         g_key_file_load_from_file (config->priv->key_file,
-                                   CONFIG_FILE_PATH,
+                                   config_file_path,
                                    0,
                                    &error);
         if (error != NULL) {
gnu/packages/ruby.scm gnu/packages/samba.scm gnu/packages/sqlite.scm gnu/packages/statistics.scm gnu/packages/syndication.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/copy.scm guix/scripts/home.scm Efraim Flashner 2022-12-30gnu: libksba: Update to 1.6.3....* gnu/packages/gnupg.scm (libksba): Update to 1.6.3. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr> Simon Josefsson 2022-12-27gnu: libksba: Update replacement to 1.6.3 [fixes CVE-2022-47629]....* gnu/packages/gnupg.scm (libksba/fixed): Update to 1.6.3. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Simon Josefsson 2022-12-02gnu: guile-gcrypt: Update to 0.4.0....* gnu/packages/gnupg.scm (guile-gcrypt): Update to 0.4.0. Ludovic Courtès 2022-11-22gnu: gpgme: Add 1.18.0....* gnu/packages/gnupg.scm (gpgme-1.18, qgpgme-1.18): New variables. Marius Bakke 2022-10-30gnu: jetring: Update to 0.31....* gnu/packages/gnupg.scm (jetring): Update to 0.31. [arguments]: Don't explicitly return #t from phases. Tobias Geerinckx-Rice 2022-10-23gnu: pinentry-tty: Update to 1.2.1....* gnu/packages/gnupg.scm (pinentry-tty): Update to 1.2.1. Tobias Geerinckx-Rice 2022-10-16gnu: libksba: Graft to 1.6.2 [fixes CVE-2022-3515]....* gnu/packages/gnupg.scm (libksba/fixed): New variable. (libksba): Use it as grafted replacement. Tobias Geerinckx-Rice 2022-09-16gnu: GnuPG: Update to 2.2.39....* gnu/packages/gnupg.scm (gnupg): Update to 2.2.39. Marius Bakke 2022-09-16gnu: libksba: Update to 1.6.1....* gnu/packages/gnupg.scm (libksba): Update to 1.6.1. Marius Bakke 2022-09-16gnu: libgcrypt: Provide absolute gpgrt-config also for native builds....This fixes a regression since 497080c10ef154818795dd544fe4d606b1e8535d that would cause things like LIBGCRYPT-STATIC from (gnu packages cryptsetup) to refer to the wrong libgpg-error. * gnu/packages/gnupg.scm (libgcrypt)[arguments]: Add "ac_cv_path_GPGRT_CONFIG" to #:configure-flags, and remove the cross-compile stanza. Marius Bakke 2022-08-30gnu: gpgme: Update to 1.18.0....* gnu/packages/gnupg.scm (gpgme): Update to 1.18.0. Marius Bakke 2022-08-30gnu: gnupg: Update to 2.2.37....* gnu/packages/gnupg.scm (gnupg): Update to 2.2.37. Marius Bakke 2022-08-30Merge branch 'staging' into core-updatesMarius Bakke 2022-08-29gnu: gnupg: Use mirror URL....In commit 38747a27f36dbaadadb1399ec085d88e48c97555, the package switched from a mirror:// URL to a ftp:// URL, but there doesn't appear to have been any particular reason for that. * gnu/packages/gnupg.scm (gnupg)[source]{uri}: Use a mirror:// again. Signed-off-by: Marius Bakke <marius@gnu.org> Maxime Devos