[arch-commits] Commit in geoclue/repos/extra-x86_64 (6 files)
Jan Steffens
heftig at archlinux.org
Tue Oct 1 13:45:00 UTC 2019
Date: Tuesday, October 1, 2019 @ 13:44:59
Author: heftig
Revision: 363611
archrelease: copy trunk to extra-x86_64
Added:
geoclue/repos/extra-x86_64/0001-config-Make-the-Mozilla-API-key-configurable.patch
(from rev 363610, geoclue/trunk/0001-config-Make-the-Mozilla-API-key-configurable.patch)
geoclue/repos/extra-x86_64/0002-config-Don-t-warn-when-wifi-URL-unset.patch
(from rev 363610, geoclue/trunk/0002-config-Don-t-warn-when-wifi-URL-unset.patch)
geoclue/repos/extra-x86_64/0003-config-Don-t-crash-when-submission-url-unset.patch
(from rev 363610, geoclue/trunk/0003-config-Don-t-crash-when-submission-url-unset.patch)
geoclue/repos/extra-x86_64/PKGBUILD
(from rev 363610, geoclue/trunk/PKGBUILD)
Deleted:
geoclue/repos/extra-x86_64/0001-config-Make-the-Mozilla-API-key-configurable.patch
geoclue/repos/extra-x86_64/PKGBUILD
---------------------------------------------------------+
0001-config-Make-the-Mozilla-API-key-configurable.patch | 182 +++++++-------
0002-config-Don-t-warn-when-wifi-URL-unset.patch | 25 +
0003-config-Don-t-crash-when-submission-url-unset.patch | 25 +
PKGBUILD | 130 +++++-----
4 files changed, 209 insertions(+), 153 deletions(-)
Deleted: 0001-config-Make-the-Mozilla-API-key-configurable.patch
===================================================================
--- 0001-config-Make-the-Mozilla-API-key-configurable.patch 2019-10-01 13:44:49 UTC (rev 363610)
+++ 0001-config-Make-the-Mozilla-API-key-configurable.patch 2019-10-01 13:44:59 UTC (rev 363611)
@@ -1,91 +0,0 @@
-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
-
Copied: geoclue/repos/extra-x86_64/0001-config-Make-the-Mozilla-API-key-configurable.patch (from rev 363610, geoclue/trunk/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:44:59 UTC (rev 363611)
@@ -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 1/3] 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
+
Copied: geoclue/repos/extra-x86_64/0002-config-Don-t-warn-when-wifi-URL-unset.patch (from rev 363610, geoclue/trunk/0002-config-Don-t-warn-when-wifi-URL-unset.patch)
===================================================================
--- 0002-config-Don-t-warn-when-wifi-URL-unset.patch (rev 0)
+++ 0002-config-Don-t-warn-when-wifi-URL-unset.patch 2019-10-01 13:44:59 UTC (rev 363611)
@@ -0,0 +1,25 @@
+From b93c2581e5f98b4826e7c645d873efa746e269d4 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 1 Oct 2019 13:41:52 +0000
+Subject: [PATCH 2/3] config: Don't warn when wifi URL unset
+
+---
+ 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 df4adcc..f09e897 100644
+--- a/src/gclue-config.c
++++ b/src/gclue-config.c
+@@ -232,7 +232,7 @@ load_wifi_config (GClueConfig *config)
+ "url",
+ &error);
+ if (error != NULL) {
+- g_warning ("%s", error->message);
++ g_debug ("No wifi URL: %s", error->message);
+ g_clear_error (&error);
+ priv->wifi_url = g_strdup (DEFAULT_WIFI_URL);
+ }
+--
+2.23.0
+
Copied: geoclue/repos/extra-x86_64/0003-config-Don-t-crash-when-submission-url-unset.patch (from rev 363610, geoclue/trunk/0003-config-Don-t-crash-when-submission-url-unset.patch)
===================================================================
--- 0003-config-Don-t-crash-when-submission-url-unset.patch (rev 0)
+++ 0003-config-Don-t-crash-when-submission-url-unset.patch 2019-10-01 13:44:59 UTC (rev 363611)
@@ -0,0 +1,25 @@
+From ef10d555fa4b1c27a0cfd17e00331db3643828b0 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/3] config: Don't crash when submission-url unset
+
+---
+ 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 f09e897..eab0b6f 100644
+--- a/src/gclue-config.c
++++ b/src/gclue-config.c
+@@ -255,7 +255,7 @@ load_wifi_config (GClueConfig *config)
+ &error);
+ if (error != NULL) {
+ g_debug ("No 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: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-01 13:44:49 UTC (rev 363610)
+++ PKGBUILD 2019-10-01 13:44:59 UTC (rev 363611)
@@ -1,62 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: György Balló <ballogy at freestart.hu>
-
-pkgname=geoclue
-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/"
-license=(LGPL)
-depends=(libsoup json-glib libmm-glib avahi geocode-glib)
-makedepends=(systemd gobject-introspection git vala meson gtk-doc libnotify)
-optdepends=('libnotify: Demo Agent')
-provides=("geoclue2=$pkgver-$pkgrel")
-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)
-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'
-}
-
-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 mozilla-api-key="$_mozilla_api_key"
- ninja -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-package() {
- DESTDIR="$pkgdir" meson install -C build
-
- echo 'u geoclue - "Geoinformation service" /var/lib/geoclue' |
- install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-
- echo 'd /var/lib/geoclue 0755 geoclue geoclue' |
- install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-}
-
-# vim:set sw=2 et:
Copied: geoclue/repos/extra-x86_64/PKGBUILD (from rev 363610, geoclue/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-10-01 13:44:59 UTC (rev 363611)
@@ -0,0 +1,68 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: György Balló <ballogy at freestart.hu>
+
+pkgname=geoclue
+pkgver=2.5.5
+pkgrel=2
+pkgdesc="Modular geoinformation service built on the D-Bus messaging system"
+arch=(x86_64)
+url="https://www.freedesktop.org/wiki/Software/GeoClue/"
+license=(LGPL)
+depends=(libsoup json-glib libmm-glib avahi geocode-glib)
+makedepends=(systemd gobject-introspection git vala meson gtk-doc libnotify)
+optdepends=('libnotify: Demo Agent')
+provides=("geoclue2=$pkgver-$pkgrel")
+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-Don-t-warn-when-wifi-URL-unset.patch
+ 0003-config-Don-t-crash-when-submission-url-unset.patch)
+sha256sums=('SKIP'
+ '9ab573d38a555f4e95c44031ba14b50e0ae929dd297335db38402d7cf6bf14c0'
+ '057104bbe3e08d6c258af2a3c61b5c81e1e9cf72c14646eaac2029d94d675ad1'
+ '38b3d34093afbb048bfab2c10df0873ebb4b8209eee9ff7c5fb43d3406351e15')
+
+# 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'
+}
+
+prepare() {
+ cd $pkgname
+ git apply -3 ../0001-config-Make-the-Mozilla-API-key-configurable.patch
+ git apply -3 ../0002-config-Don-t-warn-when-wifi-URL-unset.patch
+ git apply -3 ../0003-config-Don-t-crash-when-submission-url-unset.patch
+}
+
+build() {
+ arch-meson $pkgname build \
+ -D dbus-srv-user=geoclue \
+ -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 --print-errorlogs
+}
+
+package() {
+ DESTDIR="$pkgdir" meson install -C build
+
+ echo 'u geoclue - "Geoinformation service" /var/lib/geoclue' |
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+
+ echo 'd /var/lib/geoclue 0755 geoclue geoclue' |
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+}
+
+# vim:set sw=2 et:
More information about the arch-commits
mailing list