From patchwork Sun Nov 27 21:57:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arjan Adriaanse X-Patchwork-Id: 7922 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 2E6E927BBEC; Sun, 27 Nov 2022 21:59:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B4CAE27BBE9 for ; Sun, 27 Nov 2022 21:59:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozPg4-0008TW-Ca; Sun, 27 Nov 2022 16:59:08 -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 1ozPg3-0008Sx-0I for guix-patches@gnu.org; Sun, 27 Nov 2022 16:59:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ozPg2-0006uA-OP for guix-patches@gnu.org; Sun, 27 Nov 2022 16:59:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ozPfy-0001Jj-Jj for guix-patches@gnu.org; Sun, 27 Nov 2022 16:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59644] [PATCH] gnu: Add network-manager-fortisslvpn. Resent-From: Arjan Adriaanse Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Nov 2022 21:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59644 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59644@debbugs.gnu.org Cc: Arjan Adriaanse X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16695863215054 (code B ref -1); Sun, 27 Nov 2022 21:59:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Nov 2022 21:58:41 +0000 Received: from localhost ([127.0.0.1]:44437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozPfd-0001JS-0E for submit@debbugs.gnu.org; Sun, 27 Nov 2022 16:58:41 -0500 Received: from lists.gnu.org ([209.51.188.17]:60872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozPfa-0001JM-4m for submit@debbugs.gnu.org; Sun, 27 Nov 2022 16:58:39 -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 1ozPfZ-0008QT-Vn for guix-patches@gnu.org; Sun, 27 Nov 2022 16:58:37 -0500 Received: from dane.soverin.net ([2a10:de80:1:4091:b9e9:2218:0:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ozPfX-0006qS-WC for guix-patches@gnu.org; Sun, 27 Nov 2022 16:58:37 -0500 Received: from smtp.freedom.nl (c04smtp-lb01.int.sover.in [10.10.4.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dane.soverin.net (Postfix) with ESMTPS id 4NL2Xw3Xckzyfb; Sun, 27 Nov 2022 21:58:24 +0000 (UTC) Received: from smtp.freedom.nl (smtp.freedom.nl [10.10.4.108]) by freedom.nl (Postfix) with ESMTPSA id 4NL2Xv63XQzJg; Sun, 27 Nov 2022 21:58:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=adriaan.se; s=soverin; t=1669586304; bh=Py8PzFOhYjoLM3PDL3SYX4h/ngOvvC9mG/qG66q5NgI=; h=From:To:Cc:Subject:Date:From; b=cOxm2hwP50shKjSkrGw7fhnyBs8+Gwl9urjrJ0NmYeJwz4yyay4tzoQ1NM5HGBq3H 93WEZwEKKD36Yc5hQxqt/8OdJ8G5x09jrkxCtsAdoSI/8PRIaajS3yzUCMHmdcjuLQ ZKT7+8dVNeMUBWI/jr3UPEQRg7naSRFlB/hQE3Wl1akgeqERVlJbNrT/v+XrgmjlP1 XM6beHoPpgfFDRXTSRl3mIlXmZB4RqpJC+NVMf0V0CZx0QSjF30favnRHvcyrCMYAJ uthySI3VO3oxZxF8RaSLOl/oPYCH3LS6WB90LOF86YICiehMp9XqvOBLqXUKFDf83g K2cwyyKpHGYHA== X-Soverin-Authenticated: true From: Arjan Adriaanse Date: Sun, 27 Nov 2022 22:57:42 +0100 Message-Id: <41fe8c382112931e6b3337ab74009bbf151d89c6.1669585942.git.arjan@adriaan.se> MIME-Version: 1.0 Received-SPF: none client-ip=2a10:de80:1:4091:b9e9:2218:0:1; envelope-from=arjan@adriaan.se; helo=dane.soverin.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_NONE=0.001 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (network-manager-fortisslvpn): New variable. --- This package can be used as VPN plugin in the NetworkManager service and its definition is based on the other VPN plugin packages. gnu/packages/gnome.scm | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) base-commit: e75e699ec30fd7d9eab50dd2c98a3a25fe50ffc0 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f81b44cca2..ec16ae042a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -72,6 +72,7 @@ ;;; Copyright © 2022 Leo Nikkilä ;;; Copyright © 2022 Rene Saavedra ;;; Copyright © 2022 Alexandros Theodotou +;;; Copyright © 2022 Arjan Adriaanse ;;; ;;; This file is part of GNU Guix. ;;; @@ -8710,6 +8711,67 @@ (define-public network-manager-openconnect ;; so that 'network-manager-service-type' creates it. (user-accounts . ("nm-openconnect")))))) +(define-public network-manager-fortisslvpn + (package + (name "network-manager-fortisslvpn") + (version "1.4.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://gnome/sources/NetworkManager-fortisslvpn/" + (version-major+minor version) + "/NetworkManager-fortisslvpn-" version ".tar.xz")) + (sha256 + (base32 + "1ynsqmv8xz1cffnai4hfh0ab0dmlazpv72krhlsv45mm95iy4mdh")) + (modules '((guix build utils))) + (snippet + '(substitute* "Makefile.in" + ;; do not try to make state directory + (("\\$\\(DESTDIR\\)\\$\\(fortisslvpn_statedir\\)") "") + ;; use state directory of the NetworkManager service + (("\\$\\(fortisslvpn_statedir\\)") + "/var/lib/NetworkManager"))))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--enable-absolute-paths" + "--localstatedir=/var" + "--with-gtk4=yes") + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-path + (lambda* (#:key inputs #:allow-other-keys) + (let* ((ovpn (search-input-file inputs "/bin/openfortivpn")) + (pretty-ovpn (string-append "\"" ovpn "\""))) + (for-each + (lambda (file) + (substitute* file + (("\"/usr/local/bin/openfortivpn\"") pretty-ovpn) + (("\"/usr/bin/openfortivpn\"") pretty-ovpn))) + '("src/nm-fortisslvpn-service.c" + "properties/nm-fortisslvpn-editor.c")))))))) + (native-inputs + (list intltool + `(,glib "bin") + pkg-config)) + (inputs + (list gtk+ + gtk + kmod + libnma + libsecret + network-manager + openfortivpn + pango-next ;TODO: remove after it's the default + ppp)) + (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") + (synopsis "Fortinet SSLVPN plug-in for NetworkManager") + (description + "This extension of NetworkManager allows it to take care of connections +to virtual private networks (VPNs) via Fortinet SSLVPN.") + (license license:gpl2+) + (properties `((upstream-name . "NetworkManager-fortisslvpn"))))) + (define-public mobile-broadband-provider-info (package (name "mobile-broadband-provider-info")