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 + From patchwork Sun Jul 7 19:28:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 14501 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 43C74171C5; Sun, 7 Jul 2019 20:30:25 +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 028B71716C for ; Sun, 7 Jul 2019 20:30:25 +0100 (BST) Received: from localhost ([::1]:36698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrg-0004TH-MX for patchwork@mira.cbaines.net; Sun, 07 Jul 2019 15:30:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48844) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrN-0004H4-UA for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkCrM-0008Jz-Gb for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48628) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkCrM-0008JM-7Q for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkCrM-0005RG-1n for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36542] [PATCH 2/6] services: network-manager: Properly load vpn plugins 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.156252774920739 (code B ref 36542); Sun, 07 Jul 2019 19:30:03 +0000 Received: (at 36542) by debbugs.gnu.org; 7 Jul 2019 19:29:09 +0000 Received: from localhost ([127.0.0.1]:57436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqS-0005OQ-JD for submit@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:08 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:48226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqR-0005OD-4D for 36542@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:07 -0400 From: Jelle Licht Date: Sun, 7 Jul 2019 21:28:44 +0200 Message-Id: <20190707192848.10049-2-jlicht@fsfe.org> In-Reply-To: <20190707192848.10049-1-jlicht@fsfe.org> References: <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 Extends the dbus service when vpn plugins are enabled. * gnu/services/networking.scm (network-manager-service-type): Load vpn plugins when extending dbus service. --- gnu/services/networking.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 13cffd9feb..7423bac1aa 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Chris Marusich ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2019 Florian Pelz +;;; Copyright © 2019 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -942,24 +943,27 @@ and @command{wicd-curses} user interfaces." (define network-manager-service-type (let - ((config->package + ((config->packages (match-lambda - (($ network-manager) - (list network-manager))))) + (($ network-manager _ vpn-plugins) + `(,network-manager ,@vpn-plugins))))) (service-type (name 'network-manager) (extensions (list (service-extension shepherd-root-service-type network-manager-shepherd-service) - (service-extension dbus-root-service-type config->package) - (service-extension polkit-service-type config->package) + (service-extension dbus-root-service-type config->packages) + (service-extension polkit-service-type + (compose + list + network-manager-configuration-network-manager)) (service-extension activation-service-type network-manager-activation) (service-extension session-environment-service-type network-manager-environment) ;; Add network-manager to the system profile. - (service-extension profile-service-type config->package))) + (service-extension profile-service-type config->packages))) (default-value (network-manager-configuration)) (description "Run @uref{https://wiki.gnome.org/Projects/NetworkManager, From patchwork Sun Jul 7 19:28:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 14497 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 48E97171C1; Sun, 7 Jul 2019 20:30:12 +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 autolearn=ham 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 D5A82171C5 for ; Sun, 7 Jul 2019 20:30:11 +0100 (BST) Received: from localhost ([::1]:36690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrT-0004HW-G1 for patchwork@mira.cbaines.net; Sun, 07 Jul 2019 15:30:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48846) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrN-0004H5-VK 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 1hkCrM-0008Km-TV for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48629) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkCrM-0008KU-OS for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkCrM-0005RN-J3 for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36542] [PATCH 3/6] services: network-manager: Clear default OpenVPN user. Resent-From: Jelle Licht Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jul 2019 19:30:04 +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.156252775320761 (code B ref 36542); Sun, 07 Jul 2019 19:30:04 +0000 Received: (at 36542) by debbugs.gnu.org; 7 Jul 2019 19:29:13 +0000 Received: from localhost ([127.0.0.1]:57439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqW-0005On-U0 for submit@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:13 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:48232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqV-0005Oc-38 for 36542@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:11 -0400 From: Jelle Licht Date: Sun, 7 Jul 2019 21:28:45 +0200 Message-Id: <20190707192848.10049-3-jlicht@fsfe.org> In-Reply-To: <20190707192848.10049-1-jlicht@fsfe.org> References: <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 * gnu/services/networking.scm (network-manager-shepherd-service): Clear 'NM_OPENVPN_USER' and 'NM_OPENVPN_GROUP' in #:environment-variables. --- gnu/services/networking.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 7423bac1aa..376b4ccc4e 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -938,7 +938,10 @@ and @command{wicd-curses} user interfaces." "--no-daemon") #:environment-variables (list (string-append "NM_VPN_PLUGIN_DIR=" #$vpn - "/lib/NetworkManager/VPN")))) + "/lib/NetworkManager/VPN") + ;; Override non-existent default users + "NM_OPENVPN_USER=" + "NM_OPENVPN_GROUP="))) (stop #~(make-kill-destructor)))))))) (define network-manager-service-type From patchwork Sun Jul 7 19:28:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 14500 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 24314171C5; Sun, 7 Jul 2019 20:30:17 +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 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 E4FAC1716C for ; Sun, 7 Jul 2019 20:30:16 +0100 (BST) Received: from localhost ([::1]:36696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrY-0004N8-Ir for patchwork@mira.cbaines.net; Sun, 07 Jul 2019 15:30:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48869) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrO-0004H9-JD for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkCrN-0008Lb-J6 for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48630) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkCrN-0008LO-Dh for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkCrN-0005RV-8k for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36542] [PATCH 4/6] gnu: network-manager-openvpn: Pass '--localstatedir=/var'. Resent-From: Jelle Licht Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jul 2019 19:30:05 +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.156252775520778 (code B ref 36542); Sun, 07 Jul 2019 19:30:05 +0000 Received: (at 36542) by debbugs.gnu.org; 7 Jul 2019 19:29:15 +0000 Received: from localhost ([127.0.0.1]:57442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqZ-0005P4-5y for submit@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:15 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:48238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqX-0005Om-32 for 36542@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:13 -0400 From: Jelle Licht Date: Sun, 7 Jul 2019 21:28:46 +0200 Message-Id: <20190707192848.10049-4-jlicht@fsfe.org> In-Reply-To: <20190707192848.10049-1-jlicht@fsfe.org> References: <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 * gnu/packages/gnome.scm (network-manager-openvpn)[arguments]: Pass '--localstatedir=/var' to #:configure-flags. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a4e6375542..df273d4dad 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5448,7 +5448,7 @@ services.") "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--enable-absolute-paths"))) + '(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var"))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) From patchwork Sun Jul 7 19:28:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 14499 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 34914171C5; Sun, 7 Jul 2019 20:30:16 +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 D39C21716C for ; Sun, 7 Jul 2019 20:30:15 +0100 (BST) Received: from localhost ([::1]:36694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrX-0004L8-BZ for patchwork@mira.cbaines.net; Sun, 07 Jul 2019 15:30:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48885) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrP-0004HQ-AR for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkCrO-0008Mk-6t for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48631) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkCrO-0008MQ-0i for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkCrN-0005Rd-Rv for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36542] [PATCH 5/6] gnu: network-manager-openvpn: Patch hardcoded paths. Resent-From: Jelle Licht Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jul 2019 19:30:05 +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.156252775720800 (code B ref 36542); Sun, 07 Jul 2019 19:30:05 +0000 Received: (at 36542) by debbugs.gnu.org; 7 Jul 2019 19:29:17 +0000 Received: from localhost ([127.0.0.1]:57446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqb-0005PL-Eo for submit@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:17 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:48244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqZ-0005P3-7g for 36542@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:15 -0400 From: Jelle Licht Date: Sun, 7 Jul 2019 21:28:47 +0200 Message-Id: <20190707192848.10049-5-jlicht@fsfe.org> In-Reply-To: <20190707192848.10049-1-jlicht@fsfe.org> References: <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 * gnu/packages/gnome.scm (network-manager-openvpn)[arguments]: Add custom 'patch-path' phase to replace references to openvpn and modprobe. [inputs]: Add kmod. --- gnu/packages/gnome.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index df273d4dad..b68aed804f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2019 Florian Pelz ;;; Copyright © 2019 Giacomo Leidi +;;; Copyright © 2019 Jelle Licht ;;; ;;; This file is part of GNU Guix. ;;; @@ -5448,12 +5449,31 @@ services.") "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var"))) + `(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var") + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-path + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + (let* ((ovpn (string-append (assoc-ref inputs "openvpn") + "/sbin/openvpn")) + (modprobe (string-append (assoc-ref inputs "kmod") + "/bin/modprobe")) + (pretty-ovpn (string-append "\"" ovpn "\""))) + (for-each + (lambda (file) + (substitute* file + (("\"/usr/local/sbin/openvpn\"") pretty-ovpn) + (("\"/usr/sbin/openvpn\"") pretty-ovpn) + (("\"/sbin/openvpn\"") pretty-ovpn) + (("/sbin/modprobe") modprobe))) + '("src/nm-openvpn-service.c" "properties/nm-openvpn-editor.c"))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs `(("gtk+" ,gtk+) + ("kmod" ,kmod) ("openvpn" ,openvpn) ("network-manager" ,network-manager) ("network-manager-applet" ,network-manager-applet) ;for libnma From patchwork Sun Jul 7 19:28:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 14502 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 E4E6B171C5; Sun, 7 Jul 2019 20:30:37 +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 A82611716C for ; Sun, 7 Jul 2019 20:30:37 +0100 (BST) Received: from localhost ([::1]:36704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrt-0004hp-B6 for patchwork@mira.cbaines.net; Sun, 07 Jul 2019 15:30:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48902) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrQ-0004IZ-BR for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkCrP-0008Ny-35 for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48632) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkCrO-0008Nl-VZ for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkCrO-0005Rl-Nr for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36542] [PATCH 6/6] gnu: Add network-manager-vpnc. Resent-From: Jelle Licht Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jul 2019 19:30:06 +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.156252775920810 (code B ref 36542); Sun, 07 Jul 2019 19:30:06 +0000 Received: (at 36542) by debbugs.gnu.org; 7 Jul 2019 19:29:19 +0000 Received: from localhost ([127.0.0.1]:57448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqc-0005PY-TT for submit@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:19 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:48250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqb-0005PJ-3h for 36542@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:17 -0400 From: Jelle Licht Date: Sun, 7 Jul 2019 21:28:48 +0200 Message-Id: <20190707192848.10049-6-jlicht@fsfe.org> In-Reply-To: <20190707192848.10049-1-jlicht@fsfe.org> References: <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 * gnu/packages/gnome.scm (network-manager-vpnc): New variable. --- gnu/packages/gnome.scm | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b68aed804f..0a17848c2b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5486,6 +5486,55 @@ to virtual private networks (VPNs) via OpenVPN.") (license license:gpl2+) (properties `((upstream-name . "NetworkManager-openvpn"))))) +(define-public network-manager-vpnc + (package + (name "network-manager-vpnc") + (version "1.2.6") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://gnome/sources/NetworkManager-vpnc/" + (version-major+minor version) + "/NetworkManager-vpnc-" version ".tar.xz")) + (sha256 + (base32 + "1js5lwcsqws4klgypfxl4ikmakv7v7xgddij1fj6b0y0qicx0kyy")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var") + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-path + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + (let* ((vpnc (string-append (assoc-ref inputs "vpnc") + "/sbin/vpnc")) + (modprobe (string-append (assoc-ref inputs "kmod") + "/bin/modprobe")) + (pretty-ovpn (string-append "\"" vpnc "\""))) + (substitute* "src/nm-vpnc-service.c" + (("\"/usr/local/sbin/vpnc\"") pretty-ovpn) + (("\"/usr/sbin/vpnc\"") pretty-ovpn) + (("\"/sbin/vpnc\"") pretty-ovpn) + (("/sbin/modprobe") modprobe))) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool))) + (inputs + `(("gtk+" ,gtk+) + ("kmod" ,kmod) + ("vpnc" ,vpnc) + ("network-manager" ,network-manager) + ("network-manager-applet" ,network-manager-applet) ;for libnma + ("libsecret" ,libsecret))) + (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") + (synopsis "VPNC plug-in for NetworkManager") + (description + "Support for configuring virtual private networks based on VPNC. +Compatible with Cisco VPN concentrators configured to use IPsec.") + (license license:gpl2+) + (properties `((upstream-name . "NetworkManager-vpnc"))))) + (define-public mobile-broadband-provider-info (package (name "mobile-broadband-provider-info")