[arch-commits] Commit in geoclue/trunk (2 files)

Tue Oct 1 13:37:08 UTC 2019

Date: Tuesday, October 1, 2019 @ 13:37:07
  Author: heftig
Revision: 363608

2.5.5-1

Added:
  geoclue/trunk/0001-config-Make-the-Mozilla-API-key-configurable.patch
Modified:
  geoclue/trunk/PKGBUILD

---------------------------------------------------------+
 0001-config-Make-the-Mozilla-API-key-configurable.patch |   91 ++++++++++++++
 PKGBUILD                                                |   24 ++-
 2 files changed, 108 insertions(+), 7 deletions(-)

Added: 0001-config-Make-the-Mozilla-API-key-configurable.patch
===================================================================

--- 0001-config-Make-the-Mozilla-API-key-configurable.patch	                        (rev 0)
+++ 0001-config-Make-the-Mozilla-API-key-configurable.patch	2019-10-01 13:37:07 UTC (rev 363608)
@@ -0,0 +1,91 @@
+From 0b4fa24bb9cc62557de7ec3d14c27316af658f61 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] 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..5b1819e 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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-01 12:12:14 UTC (rev 363607)
+++ PKGBUILD	2019-10-01 13:37:07 UTC (rev 363608)
@@ -2,8 +2,8 @@
 # Contributor: György Balló <ballogy at freestart.hu>
 
 pkgname=geoclue
-pkgver=2.5.3
-pkgrel=2
+pkgver=2.5.5
+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,10 +15,18 @@
 conflicts=(geoclue2)
 replaces=(geoclue2)
 backup=(etc/geoclue/geoclue.conf)
-_commit=abc2c2dc734e93448e1b5fdd68e8e9b1808cc65b  # tags/2.5.3
-source=("git+https://gitlab.freedesktop.org/geoclue/geoclue.git#commit=$_commit")
-sha256sums=('SKIP')
+_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)
+sha256sums=('SKIP'
+            '4734adf48294eb61d79bb797f62bfa4694c6a68a096ad19a4286d8eee163a823')
 
+# Mozilla API keys (see https://location.services.mozilla.com/api)
+# Note: These are for Arch Linux use ONLY. For your own distribution, please
+# get your own set of keys. Feel free to contact heftig at archlinux.org for
+# more information.
+_mozilla_api_key=e05d56db0a694edc8b5aaebda3f2db6a
+
 pkgver() {
   cd $pkgname
   git describe --tags | sed 's/-/+/g'
@@ -26,17 +34,19 @@
 
 prepare() {
   cd $pkgname
+  git apply -3 ../0001-config-Make-the-Mozilla-API-key-configurable.patch
 }
 
 build() {
   arch-meson $pkgname build \
     -D dbus-srv-user=geoclue \
-    -D dbus-sys-dir=/usr/share/dbus-1/system.d
+    -D dbus-sys-dir=/usr/share/dbus-1/system.d \
+    -D mozilla-api-key="$_mozilla_api_key"
   ninja -C build
 }
 
 check() {
-  meson test -C build
+  meson test -C build --print-errorlogs
 }
 
 package() {

