[arch-commits] Commit in geoclue/trunk (5 files)
Jan Steffens
heftig at archlinux.org
Fri Nov 1 14:18:58 UTC 2019
Date: Friday, November 1, 2019 @ 14:18:56
Author: heftig
Revision: 366393
2.5.5+6+gea52170-1
Modified:
geoclue/trunk/PKGBUILD
Deleted:
geoclue/trunk/0001-config-Make-the-Mozilla-API-key-configurable.patch
geoclue/trunk/0002-config-Improve-config-lookup-error-messages.patch
geoclue/trunk/0003-config-Clear-error-after-submission-URL-lookup-fails.patch
geoclue/trunk/0004-config-Fall-back-to-a-default-submission-nick-if-loo.patch
-----------------------------------------------------------------+
0001-config-Make-the-Mozilla-API-key-configurable.patch | 91 ----------
0002-config-Improve-config-lookup-error-messages.patch | 58 ------
0003-config-Clear-error-after-submission-URL-lookup-fails.patch | 27 --
0004-config-Fall-back-to-a-default-submission-nick-if-loo.patch | 33 ---
PKGBUILD | 19 --
5 files changed, 5 insertions(+), 223 deletions(-)
Deleted: 0001-config-Make-the-Mozilla-API-key-configurable.patch
===================================================================
--- 0001-config-Make-the-Mozilla-API-key-configurable.patch 2019-11-01 14:11:25 UTC (rev 366392)
+++ 0001-config-Make-the-Mozilla-API-key-configurable.patch 2019-11-01 14:18:56 UTC (rev 366393)
@@ -1,91 +0,0 @@
-From 95c9ad4dc176860c85a07d0db4cb4179929bdb54 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 1 Oct 2019 13:27:41 +0000
-Subject: [PATCH 1/4] config: Make the Mozilla API key configurable
-
-And do not expose it in the configuration file.
----
- data/geoclue.conf.in | 18 ++++++++++--------
- meson.build | 1 +
- meson_options.txt | 3 +++
- src/gclue-config.c | 4 ++--
- 4 files changed, 16 insertions(+), 10 deletions(-)
-
-diff --git a/data/geoclue.conf.in b/data/geoclue.conf.in
-index fb111de..bebe471 100644
---- a/data/geoclue.conf.in
-+++ b/data/geoclue.conf.in
-@@ -42,13 +42,13 @@ enable=true
- # Enable WiFi source
- enable=true
-
--# URL to the wifi geolocation service. The key can currenty be anything, just
--# needs to be present but that is likely going to change in future.
--url=https://location.services.mozilla.com/v1/geolocate?key=geoclue
-+# URL to the WiFi geolocation service. If not set, defaults to Mozilla's
-+# Location Service with a hardcoded key. To use a custom key, uncomment this URL
-+# while changing YOUR_KEY to your MLS API key.
-+#url=https://location.services.mozilla.com/v1/geolocate?key=YOUR_KEY
-
--# To use the Google geolocation service instead of mozilla's, simply uncomment
--# this url while changing API_KEY to your Google API key and comment out or
--# remove the url above.
-+# To use the Google geolocation service instead of Mozilla's, uncomment this URL
-+# while changing YOUR_KEY to your Google API key.
- #
- # WARNING: Please make sure that you are complying with the Google's ToS and
- # policies if you uncomment this:
-@@ -63,8 +63,10 @@ url=https://location.services.mozilla.com/v1/geolocate?key=geoclue
- #
- submit-data=false
-
--# URL to submission API of Mozilla Location Service
--submission-url=https://location.services.mozilla.com/v1/submit?key=geoclue
-+# URL to submission API of Mozilla Location Service. If not set, defaults to
-+# Mozilla's API with a hardcoded key. To use a custom key, uncomment this URL
-+# while changing YOUR_KEY to your MLS API key.
-+#submission-url=https://location.services.mozilla.com/v1/submit?key=YOUR_KEY
-
- # A nickname to submit network data with. A nickname must be 2-32 characters long.
- submission-nick=geoclue
-diff --git a/meson.build b/meson.build
-index fde6fa3..7547887 100644
---- a/meson.build
-+++ b/meson.build
-@@ -30,6 +30,7 @@ conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/geoclue/geo
- conf.set_quoted('TEST_SRCDIR', meson.source_root() + '/data/')
- conf.set_quoted('LOCALEDIR', localedir)
- conf.set_quoted('SYSCONFDIR', sysconfdir)
-+conf.set_quoted('MOZILLA_API_KEY', get_option('mozilla-api-key'))
- conf.set10('GCLUE_USE_3G_SOURCE', get_option('3g-source'))
- conf.set10('GCLUE_USE_CDMA_SOURCE', get_option('cdma-source'))
- conf.set10('GCLUE_USE_MODEM_GPS_SOURCE', get_option('modem-gps-source'))
-diff --git a/meson_options.txt b/meson_options.txt
-index 83bc60e..f5d42e3 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -34,3 +34,6 @@ option('systemd-system-unit-dir',
- option('dbus-srv-user',
- type: 'string', value: 'root',
- description: 'The user (existing) as which the service will run')
-+option('mozilla-api-key',
-+ type: 'string', value: 'geoclue',
-+ description: 'Your API key for Mozilla Location Service')
-diff --git a/src/gclue-config.c b/src/gclue-config.c
-index d259c71..df4adcc 100644
---- a/src/gclue-config.c
-+++ b/src/gclue-config.c
-@@ -216,8 +216,8 @@ load_enable_source_config (GClueConfig *config,
- return enable;
- }
-
--#define DEFAULT_WIFI_URL "https://location.services.mozilla.com/v1/geolocate?key=geoclue"
--#define DEFAULT_WIFI_SUBMIT_URL "https://location.services.mozilla.com/v1/submit?key=geoclue"
-+#define DEFAULT_WIFI_URL "https://location.services.mozilla.com/v1/geolocate?key=" MOZILLA_API_KEY
-+#define DEFAULT_WIFI_SUBMIT_URL "https://location.services.mozilla.com/v1/submit?key=" MOZILLA_API_KEY
-
- static void
- load_wifi_config (GClueConfig *config)
---
-2.23.0
-
Deleted: 0002-config-Improve-config-lookup-error-messages.patch
===================================================================
--- 0002-config-Improve-config-lookup-error-messages.patch 2019-11-01 14:11:25 UTC (rev 366392)
+++ 0002-config-Improve-config-lookup-error-messages.patch 2019-11-01 14:18:56 UTC (rev 366393)
@@ -1,58 +0,0 @@
-From d0c1759bb2e45c649b0c323054973443e13b6cc4 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 1 Oct 2019 14:06:10 +0000
-Subject: [PATCH 2/4] config: Improve config lookup error messages
-
-Match the message for wifi/submit-data and add some quotes.
-
-Downgrade the message for wifi/url from a warning to a debug message.
----
- src/gclue-config.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/src/gclue-config.c b/src/gclue-config.c
-index df4adcc..00dd52e 100644
---- a/src/gclue-config.c
-+++ b/src/gclue-config.c
-@@ -232,7 +232,8 @@ load_wifi_config (GClueConfig *config)
- "url",
- &error);
- if (error != NULL) {
-- g_warning ("%s", error->message);
-+ g_debug ("Failed to get config \"wifi/url\": %s",
-+ error->message);
- g_clear_error (&error);
- priv->wifi_url = g_strdup (DEFAULT_WIFI_URL);
- }
-@@ -242,7 +243,7 @@ load_wifi_config (GClueConfig *config)
- "submit-data",
- &error);
- if (error != NULL) {
-- g_debug ("Failed to get config wifi/submit-data: %s",
-+ g_debug ("Failed to get config \"wifi/submit-data\": %s",
- error->message);
- g_error_free (error);
-
-@@ -254,7 +255,8 @@ load_wifi_config (GClueConfig *config)
- "submission-url",
- &error);
- if (error != NULL) {
-- g_debug ("No wifi submission URL: %s", error->message);
-+ g_debug ("Failed to get config \"wifi/submission-url\": %s",
-+ error->message);
- g_error_free (error);
- priv->wifi_submit_url = g_strdup (DEFAULT_WIFI_SUBMIT_URL);
- }
-@@ -264,7 +266,8 @@ load_wifi_config (GClueConfig *config)
- "submission-nick",
- &error);
- if (error != NULL) {
-- g_debug ("No wifi submission nick: %s", error->message);
-+ g_debug ("Failed to get config \"wifi/submission-nick\": %s",
-+ error->message);
- g_error_free (error);
- }
- }
---
-2.23.0
-
Deleted: 0003-config-Clear-error-after-submission-URL-lookup-fails.patch
===================================================================
--- 0003-config-Clear-error-after-submission-URL-lookup-fails.patch 2019-11-01 14:11:25 UTC (rev 366392)
+++ 0003-config-Clear-error-after-submission-URL-lookup-fails.patch 2019-11-01 14:18:56 UTC (rev 366393)
@@ -1,27 +0,0 @@
-From 7301c9e13c9c684fd4fe706ac1558854a7819a54 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 1 Oct 2019 13:42:11 +0000
-Subject: [PATCH 3/4] config: Clear error after submission URL lookup fails
-
-Otherwise we have a dangling pointer causing a crash when the error
-value is reused.
----
- src/gclue-config.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gclue-config.c b/src/gclue-config.c
-index 00dd52e..76222ff 100644
---- a/src/gclue-config.c
-+++ b/src/gclue-config.c
-@@ -257,7 +257,7 @@ load_wifi_config (GClueConfig *config)
- if (error != NULL) {
- g_debug ("Failed to get config \"wifi/submission-url\": %s",
- error->message);
-- g_error_free (error);
-+ g_clear_error (&error);
- priv->wifi_submit_url = g_strdup (DEFAULT_WIFI_SUBMIT_URL);
- }
-
---
-2.23.0
-
Deleted: 0004-config-Fall-back-to-a-default-submission-nick-if-loo.patch
===================================================================
--- 0004-config-Fall-back-to-a-default-submission-nick-if-loo.patch 2019-11-01 14:11:25 UTC (rev 366392)
+++ 0004-config-Fall-back-to-a-default-submission-nick-if-loo.patch 2019-11-01 14:18:56 UTC (rev 366393)
@@ -1,33 +0,0 @@
-From 1a00809a0d89b0849a57647c878d192354247a33 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 1 Oct 2019 14:07:55 +0000
-Subject: [PATCH 4/4] config: Fall back to a default submission nick if lookup
- fails
-
----
- src/gclue-config.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/gclue-config.c b/src/gclue-config.c
-index 76222ff..95f78df 100644
---- a/src/gclue-config.c
-+++ b/src/gclue-config.c
-@@ -218,6 +218,7 @@ load_enable_source_config (GClueConfig *config,
-
- #define DEFAULT_WIFI_URL "https://location.services.mozilla.com/v1/geolocate?key=" MOZILLA_API_KEY
- #define DEFAULT_WIFI_SUBMIT_URL "https://location.services.mozilla.com/v1/submit?key=" MOZILLA_API_KEY
-+#define DEFAULT_WIFI_SUBMIT_NICK "geoclue"
-
- static void
- load_wifi_config (GClueConfig *config)
-@@ -269,6 +270,7 @@ load_wifi_config (GClueConfig *config)
- g_debug ("Failed to get config \"wifi/submission-nick\": %s",
- error->message);
- g_error_free (error);
-+ priv->wifi_submit_nick = g_strdup (DEFAULT_WIFI_SUBMIT_NICK);
- }
- }
-
---
-2.23.0
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-01 14:11:25 UTC (rev 366392)
+++ PKGBUILD 2019-11-01 14:18:56 UTC (rev 366393)
@@ -2,8 +2,8 @@
# Contributor: György Balló <ballogy at freestart.hu>
pkgname=geoclue
-pkgver=2.5.5
-pkgrel=2
+pkgver=2.5.5+6+gea52170
+pkgrel=1
pkgdesc="Modular geoinformation service built on the D-Bus messaging system"
arch=(x86_64)
url="https://www.freedesktop.org/wiki/Software/GeoClue/"
@@ -15,17 +15,9 @@
conflicts=(geoclue2)
replaces=(geoclue2)
backup=(etc/geoclue/geoclue.conf)
-_commit=9519d67c7a9a0e97a75115f9ff99d4fb0bb81b21 # tags/2.5.5^0
-source=("git+https://gitlab.freedesktop.org/geoclue/geoclue.git#commit=$_commit"
- 0001-config-Make-the-Mozilla-API-key-configurable.patch
- 0002-config-Improve-config-lookup-error-messages.patch
- 0003-config-Clear-error-after-submission-URL-lookup-fails.patch
- 0004-config-Fall-back-to-a-default-submission-nick-if-loo.patch)
-sha256sums=('SKIP'
- '4b5540f55fee97cb275b781d7f80a56685025fadfd3a79fe5244d79b2635dc6f'
- '31d69df4f6da470c06cd03f3d5f40345902c246322437d77d618b0fa7659620e'
- '9146ad2ff101602249c09dd3bc688bb0a2f151dcd646200d329359e8c687adc3'
- 'ca496af7d50e138e17cd9a69a16f729a7c5ae731f4dc93f32027be6852c7cdce')
+_commit=ea52170f62da6cbdb8b5ff093c75cb639df9f11d # master
+source=("git+https://gitlab.freedesktop.org/geoclue/geoclue.git#commit=$_commit")
+sha256sums=('SKIP')
# Mozilla API keys (see https://location.services.mozilla.com/api)
# Note: These are for Arch Linux use ONLY. For your own distribution, please
@@ -40,7 +32,6 @@
prepare() {
cd $pkgname
- git apply -3 ../*.patch
}
build() {
More information about the arch-commits
mailing list