From patchwork Sun Jul 7 19:28:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 14498 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CA59E171C5; Sun, 7 Jul 2019 20:30:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 826121716C for ; Sun, 7 Jul 2019 20:30:13 +0100 (BST) Received: from localhost ([::1]:36692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrV-0004Ik-3O for patchwork@mira.cbaines.net; Sun, 07 Jul 2019 15:30:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48830) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrN-0004H3-Bt for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkCrL-0008Il-Qr for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48627) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkCrL-0008II-Ka for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkCrL-0005R7-Do for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36542] [PATCH 1/6] gnu: network-manager: Fix plugin loading problem. References: <875zodk5lw.fsf@jlicht.xyz> In-Reply-To: <875zodk5lw.fsf@jlicht.xyz> Resent-From: Jelle Licht Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jul 2019 19:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36542 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36542@debbugs.gnu.org Received: via spool by 36542-submit@debbugs.gnu.org id=B36542.156252774320713 (code B ref 36542); Sun, 07 Jul 2019 19:30:03 +0000 Received: (at 36542) by debbugs.gnu.org; 7 Jul 2019 19:29:03 +0000 Received: from localhost ([127.0.0.1]:57433 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqN-0005Ny-4u for submit@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:03 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:48220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqK-0005NP-Hv for 36542@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:01 -0400 From: Jelle Licht Date: Sun, 7 Jul 2019 21:28:43 +0200 Message-Id: <20190707192848.10049-1-jlicht@fsfe.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Tomáš Čech * gnu/packages/patches/nm-plugin-path.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnome.scm (network-manager)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 1 + gnu/packages/patches/nm-plugin-path.patch | 51 +++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 gnu/packages/patches/nm-plugin-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index 734676f45a..4fa04937ca 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1115,6 +1115,7 @@ dist_patch_DATA = \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ %D%/packages/patches/nfs-utils-missing-headers.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ + %D%/packages/patches/nm-plugin-path.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4b1dbbdb49..a4e6375542 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5298,6 +5298,7 @@ users.") (uri (string-append "mirror://gnome/sources/NetworkManager/" (version-major+minor version) "/" "NetworkManager-" version ".tar.xz")) + (patches (search-patches "nm-plugin-path.patch")) (sha256 (base32 "1jn3g0f2x1irc88awqp8m3gnpdx1whqqqbdgkbgr4x55s702jki4")) diff --git a/gnu/packages/patches/nm-plugin-path.patch b/gnu/packages/patches/nm-plugin-path.patch new file mode 100644 index 0000000000..505ae31534 --- /dev/null +++ b/gnu/packages/patches/nm-plugin-path.patch @@ -0,0 +1,51 @@ +From d3026a6d331298003ccc6cd9d2e20dcb7fa9ae1d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= +Date: Wed, 3 Jul 2019 13:31:54 +0200 +Subject: [PATCH] respect NM_VPN_PLUGIN_DIR + +--- + src/vpn/nm-vpn-manager.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/vpn/nm-vpn-manager.c b/src/vpn/nm-vpn-manager.c +index d063916..d779166 100644 +--- a/src/vpn/nm-vpn-manager.c ++++ b/src/vpn/nm-vpn-manager.c +@@ -223,6 +223,7 @@ nm_vpn_manager_init (NMVpnManager *self) + GSList *infos, *info; + const char *conf_dir_etc = _nm_vpn_plugin_info_get_default_dir_etc (); + const char *conf_dir_lib = _nm_vpn_plugin_info_get_default_dir_lib (); ++ const char *conf_dir_user = _nm_vpn_plugin_info_get_default_dir_user (); + + /* Watch the VPN directory for changes */ + file = g_file_new_for_path (conf_dir_lib); +@@ -241,6 +242,14 @@ nm_vpn_manager_init (NMVpnManager *self) + G_CALLBACK (vpn_dir_changed), self); + } + ++ file = g_file_new_for_path (conf_dir_user); ++ priv->monitor_etc = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL, NULL); ++ g_object_unref (file); ++ if (priv->monitor_etc) { ++ priv->monitor_id_etc = g_signal_connect (priv->monitor_etc, "changed", ++ G_CALLBACK (vpn_dir_changed), self); ++ } ++ + /* first read conf_dir_lib. The name files are not really user configuration, but + * plugin configuration. Hence we expect ~newer~ plugins to install their files + * in /usr/lib/NetworkManager. We want to prefer those files. +@@ -255,6 +264,11 @@ nm_vpn_manager_init (NMVpnManager *self) + try_add_plugin (self, info->data); + g_slist_free_full (infos, g_object_unref); + ++ infos = _nm_vpn_plugin_info_list_load_dir (conf_dir_user, TRUE, 0, NULL, NULL); ++ for (info = infos; info; info = info->next) ++ try_add_plugin (self, info->data); ++ g_slist_free_full (infos, g_object_unref); ++ + priv->active_services = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, NULL); + } + +-- +2.22.0 +