From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gL11JEniQWdE9AAA62LTzQ:P1 (envelope-from ) for ; Sat, 23 Nov 2024 14:10:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id gL11JEniQWdE9AAA62LTzQ (envelope-from ) for ; Sat, 23 Nov 2024 15:10:17 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=LjFkk7V7; dkim=fail ("headers rsa verify failed") header.d=sarg.org.ru header.s=google header.b=Fd2NGKtu; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=sarg.org.ru (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732371017; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=Xx57ids+fduivsNfpZB4DyliXCKqbzaNm+jB8Wfg1aU=; b=m3tOJuA5ouvvKdHJgxPXOZvPoxO/IZii2w6GZ/QHJtXmLBeaz6bcBbj3tKOYRp2v2iAePe /0r/oaY5rf4ktrT8FZdirdIUJDnkiHpq8eaZ6CMiP3SZ2B1qER7WgaTnI9UcjBM7ptlHQ1 j+2GWruYojpBwYjmJWZmJ1HYv2wQOn9lqL/kkMx7iE2h4+poPR7Q3eD2SLF4uR4rFZ1tvK lljGQBqPEY4WcvGv/GVGnSsDEnV0cLyH5FbFWZNN0VPGQhNf8e7pQbUMe4wlcLlEpQqrGc SJ05dzrzpJXj29MC58Eovd4RGGMWUpARbrnfFeHfJO3aTPHVVLzOR/knuuveWQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=LjFkk7V7; dkim=fail ("headers rsa verify failed") header.d=sarg.org.ru header.s=google header.b=Fd2NGKtu; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=sarg.org.ru (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732371017; a=rsa-sha256; cv=none; b=r7z0E4dbr7oKA5/AvWH+55a+OsUpHmp1rNOJimPn20Wzua/lfmAKQHnBv11ZOHV/jFKN1O zSSTL0/D6xUaeXu1CvCtRZUWSPySBuUFqyil3ogOF83tvlz9gVam+uctLjjiWMT9h3Y39e yZoAEXoACRSsKpv8Ck7C9USnqGq/tVaaAHnmauTrZxapZ0SnOFqxucgxvytQsKMsenpmMe LnZlJn/EfVP+xCK1jcXEfrih4zlEfKNMlgkAtdJOE73ZblW4YQ+oTK1qVNqiUsgcawOf5w i1I1axLLE3Ltq4mCDKBSNfLO5yrmQmBGQKQawVTkdpe9a/jyb/KtPbdNHGWOiw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 968387EC99 for ; Sat, 23 Nov 2024 15:10:16 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tEqpq-0002yA-3y; Sat, 23 Nov 2024 09:10:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tEqpn-0002xm-Up for guix-patches@gnu.org; Sat, 23 Nov 2024 09:10:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tEqpn-0004xg-LP for guix-patches@gnu.org; Sat, 23 Nov 2024 09:10:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=Xx57ids+fduivsNfpZB4DyliXCKqbzaNm+jB8Wfg1aU=; b=LjFkk7V7dO3rssRbkxn1FA4e7Ov7k84jcQwcgHITH22Nm0s5MNdA5+OT5Mp8FPoCXRMPmS/dOCZR6X7txNLdfb4i7Jw3ZyJ2gl3Kz795k18mNxmvWPiYJBUrD+DGdHKn9kTh9eFQMMD1wiyiDsggxiN+qh+w09pu4dM0xLYw+Q82zHeT/O7mR7x29DWhW8pkAE8+B1ucCWInTFWSFr5gSKA6Gz+YaiO6Os8MoZEpqAFbPut675MMbPn39l1YhmbUbGYeR62SLP3dzUmgTc4YxKglKh1OPnD3sq4VckC8xCUtduA5PLRnTsFpDy39hZubCtEKpFacIdbpqBFiVEZd1A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tEqpl-0000VA-Ra; Sat, 23 Nov 2024 09:10:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74493] [PATCH] gnu: geoclue: Update to 2.7.2. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Sat, 23 Nov 2024 14:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74493 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74493@debbugs.gnu.org Cc: Sergey Trofimov , Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus Received: via spool by submit@debbugs.gnu.org id=B.17323709681875 (code B ref -1); Sat, 23 Nov 2024 14:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Nov 2024 14:09:28 +0000 Received: from localhost ([127.0.0.1]:57229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tEqpD-0000UA-VR for submit@debbugs.gnu.org; Sat, 23 Nov 2024 09:09:28 -0500 Received: from lists.gnu.org ([209.51.188.17]:55662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tEqpB-0000U1-WE for submit@debbugs.gnu.org; Sat, 23 Nov 2024 09:09:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tEqp6-0002lZ-Pa for guix-patches@gnu.org; Sat, 23 Nov 2024 09:09:24 -0500 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tEqp2-0004qF-W1 for guix-patches@gnu.org; Sat, 23 Nov 2024 09:09:20 -0500 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-aa53a971480so38577066b.1 for ; Sat, 23 Nov 2024 06:09:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1732370950; x=1732975750; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Xx57ids+fduivsNfpZB4DyliXCKqbzaNm+jB8Wfg1aU=; b=Fd2NGKtuQvaQM155qsbqdUg9zEuTqoPQmulHNIfNgwaSbFBLotW1fK9CzsUGvCYmq1 1uIPbSz1FJ6tJ26geHA4ECmx1ow/f0qDqRUqiycHUiSbHmTGj2PMmucjgscHEP43cQzH uHIe80urybrWxWtxlLWyNBrvG62JUFmZeHFx5Ex8rgjD/l1W29OKKsffTt/aqFOdlrHO LUrgceqKmCR+lXq/abMyMEL1xkFfF0gOCnRfuQL3mJuXl9ay0UOVG1cNxbaJ5XPcaNHB 0lqHAYBC9BIKJW5YYcu7pW8a1Wq+kBMJ+eymhHeHBdyyCUX9elR6wt44JeZ2u9ua2pJA gAzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732370950; x=1732975750; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Xx57ids+fduivsNfpZB4DyliXCKqbzaNm+jB8Wfg1aU=; b=Fii8sWsa3o2J5A/9sLKw691KsSHF+josmg5hZbXZfFAWYUJJjdWgzmWcn9gC3ndH7M oo1YebHqcv1gIgFZBzgiymSMzWUpspcWWGaALcUI33MSTa/yjBId9KENpfWSAYezIAPL mUW6EPgwEodjud/7gkaMHwvvsA2o/c6p5miHWiXWPy02STlXiBmvyRDcxXHXz3k/tSGd UTvijV5IB+xIWe92CRRS2TVSShx373l1ipOjYYd2kxI+0O3PnrOtrXm4Hnc1VoyffneI ifD72Hx9gO/RakS2iA2EgzPSQAn24rmu7R0Y8OWM5IFopy0yrV61NO3ScP22H3bMmgCv sU3w== X-Gm-Message-State: AOJu0YwBGQkfupYgNHAZQXCnhF6wDZH342dIEnR2A63PrLGITpmqTYbk afy+btcD5aOPEUPvx4IH8hkL3hQHGrKvxbulrJDiHQ0O2kHc5fk59WEUqzhjE//ry+nLpIEeAxX p X-Gm-Gg: ASbGncsO0jHaU3/SI2fqoUXlC/5ZyH4RdTpV+793/GEmVyxYK7jSeXI9Mk7HsUWq9QE wJQAjy+TNRzf1TFhpeCL6l02fBHg+l/aWH4TcEo60X9bnNcRCJC2ZyNQWnRpiKb0e5zOQG50Ah3 cQofYi7zI08JVAprjRsBqrKIQ4uG7cY2GKT9bnjlqo7tMRImdQts+V0nse/k05BvZQ8T3eTbJpM cTxLuylQ83i8OxUzDUGGaOxXs+ZCc36gohLhWkIAmV/SE4= X-Google-Smtp-Source: AGHT+IGdJt1Y/CNysIuASc24Y54fAtfmPdgPv4eE/bar1zkaWoK+RtBL4t7tdzI8+ZtuIg7ijyMqWQ== X-Received: by 2002:a17:906:30c7:b0:a9a:b9d:bd93 with SMTP id a640c23a62f3a-aa509906483mr602978066b.4.1732370949859; Sat, 23 Nov 2024 06:09:09 -0800 (PST) Received: from localhost ([2a02:2454:a0a9:e300:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa50b52fa36sm231773066b.122.2024.11.23.06.09.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Nov 2024 06:09:09 -0800 (PST) From: Sergey Trofimov Date: Sat, 23 Nov 2024 15:08:53 +0100 Message-ID: <4a5f38bd6fd9c4c4a9610067e84675b11120be21.1732370909.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=sarg@sarg.org.ru; helo=mail-ej1-x62c.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: 2.36 X-Spam-Score: 2.36 X-Migadu-Queue-Id: 968387EC99 X-TUID: NrVqSU1DKWDb * gnu/packages/gnome.scm (geoclue): Update to 2.7.2. * gnu/packages/patches/geoclue-config.patch: Adjust. --- gnu/packages/gnome.scm | 6 +- gnu/packages/patches/geoclue-config.patch | 76 ++++++++++++++++------- 2 files changed, 57 insertions(+), 25 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b8accb737d..5fb98ff568 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5760,7 +5760,7 @@ (define-public colord (define-public geoclue (package (name "geoclue") - (version "2.6.0") + (version "2.7.2") (source (origin (method url-fetch) @@ -5768,7 +5768,7 @@ (define-public geoclue (string-append "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/" version "/geoclue-" version ".tar.bz2")) (sha256 - (base32 "1854i8lih1jkks5w38xv8k5gs7s8629qjg3cg96ji0ffk35yzjfd")) + (base32 "1ljn4k1zlfx0ymmdz8ycfb976vx8r61sx68q854r0xinl124mlh1")) (patches (search-patches "geoclue-config.patch")))) (build-system meson-build-system) (arguments @@ -5786,7 +5786,7 @@ (define-public geoclue `(,glib "bin") glib-networking json-glib - libsoup-minimal-2)) + libsoup-minimal)) (home-page "https://gitlab.freedesktop.org/geoclue/geoclue/-/wikis/home") (synopsis "Geolocation service") (description "Geoclue is a D-Bus service that provides location diff --git a/gnu/packages/patches/geoclue-config.patch b/gnu/packages/patches/geoclue-config.patch index e4ef6f2d33..fed7782171 100644 --- a/gnu/packages/patches/geoclue-config.patch +++ b/gnu/packages/patches/geoclue-config.patch @@ -1,27 +1,59 @@ -Allow the configuration file to be specified via an environment variable. +From 45e310482350cfab628f359f2b0efebf06fb7c77 Mon Sep 17 00:00:00 2001 +From: Sergey Trofimov +Date: Sat, 23 Nov 2024 14:12:21 +0100 +Subject: [PATCH] Allow the configuration file to be specified via an + environment variable. + +--- + src/gclue-config.c | 13 ++++++++++--- + src/gclue-static-source.c | 2 +- + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/gclue-config.c b/src/gclue-config.c -index 7ab2a67..e41f3df 100644 +index acd6009..3045571 100644 --- a/src/gclue-config.c +++ b/src/gclue-config.c -@@ -332,6 +332,11 @@ static void - gclue_config_init (GClueConfig *config) - { - GError *error = NULL; -+ const char *config_file_path; +@@ -26,8 +26,8 @@ + + #include "gclue-config.h" + +-#define CONFIG_FILE_PATH SYSCONFDIR "/geoclue/geoclue.conf" +-#define CONFIG_D_DIRECTORY SYSCONFDIR "/geoclue/conf.d/" ++#define CONFIG_FILE_PATH "/etc/geoclue/geoclue.conf" ++#define CONFIG_D_DIRECTORY "/etc/geoclue/conf.d/" + + /* This class will be responsible for fetching configuration. */ + +@@ -546,8 +546,15 @@ gclue_config_init (GClueConfig *config) + priv->wifi_submit_url = g_strdup (DEFAULT_WIFI_SUBMIT_URL); + priv->wifi_submit_nick = g_strdup (DEFAULT_WIFI_SUBMIT_NICK); + +- /* Load config file from default path, log all missing parameters */ + priv->key_file = g_key_file_new (); + -+ config_file_path = g_getenv ("GEOCLUE_CONFIG_FILE"); -+ if (!config_file_path) -+ config_file_path = CONFIG_FILE_PATH; - - config->priv = gclue_config_get_instance_private(config); - config->priv->key_file = g_key_file_new (); -@@ -341,7 +346,7 @@ gclue_config_init (GClueConfig *config) - &error); - if (error != NULL) { - g_critical ("Failed to load configuration file '%s': %s", -- CONFIG_FILE_PATH, error->message); -+ config_file_path, error->message); - g_error_free (error); - - return; ++ char *env_config_file = g_getenv ("GEOCLUE_CONFIG_FILE"); ++ if (env_config_file) { ++ load_config_file (config, env_config_file); ++ goto out; // don't load conf.d ++ } ++ ++ /* Load config file from default path, log all missing parameters */ + load_config_file (config, CONFIG_FILE_PATH); + + /* +diff --git a/src/gclue-static-source.c b/src/gclue-static-source.c +index 1c35cea..7957797 100644 +--- a/src/gclue-static-source.c ++++ b/src/gclue-static-source.c +@@ -26,7 +26,7 @@ + #include "gclue-enum-types.h" + + #define GEO_FILE_NAME "geolocation" +-#define GEO_FILE_PATH SYSCONFDIR "/" GEO_FILE_NAME ++#define GEO_FILE_PATH "/etc/" GEO_FILE_NAME + + /* Rate limit of geolocation file monitoring. + * In milliseconds. +-- +2.46.0 + base-commit: 1eead56e2f763e3a1a371f9ea00e89337867d397 -- 2.46.0