From unknown Thu Jun 19 14:31:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40683] [PATCH] gnu: Add wireguard-module. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Apr 2020 16:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40683 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40683@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15871391556352 (code B ref -1); Fri, 17 Apr 2020 16:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Apr 2020 15:59:15 +0000 Received: from localhost ([127.0.0.1]:41536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPTOd-0001eO-48 for submit@debbugs.gnu.org; Fri, 17 Apr 2020 11:59:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:45151) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPTOb-0001eH-Ia for submit@debbugs.gnu.org; Fri, 17 Apr 2020 11:59:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56717) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPTOa-00061L-Br for guix-patches@gnu.org; Fri, 17 Apr 2020 11:59:13 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jPTOY-0006BG-Q2 for guix-patches@gnu.org; Fri, 17 Apr 2020 11:59:11 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:44055) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jPTOY-00067x-K5 for guix-patches@gnu.org; Fri, 17 Apr 2020 11:59:10 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 675161C0007 for ; Fri, 17 Apr 2020 15:59:04 +0000 (UTC) From: Brice Waegeneire Date: Fri, 17 Apr 2020 17:58:55 +0200 Message-Id: <20200417155855.6210-1-brice@waegenei.re> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.70.183.197 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/vpn.scm (wireguard-module): New variable. --- This patch add wireguard as a loadable Linux kernel module which allow using it Linux version < 5.6 without having to rebuild the entire kernel. Following is a usage example: --8<---------------cut here---------------start------------->8--- (use-modules (gnu) (gnu services)) (use-package-modules vpn) (use-service-modules linux) (operating-system ... (services (cons* (service kernel-module-loader-service-type '("wireguard")) %base-services)) (kernel-loadable-modules (list wireguard-module))) --8<---------------cut here---------------end--------------->8--- gnu/packages/vpn.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 739522959c..654c9d8db1 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019, 2020 Leo Famulari ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system linux-module) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -496,6 +498,26 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers kernel versions 3.10 through 5.5. WireGuard was added to Linux 5.6.") (license license:gpl2))) +(define-public wireguard-module + (package + (inherit wireguard-linux-compat) + (name "wireguard-module") + (build-system linux-module-build-system) + (arguments + `(#:tests? #f ; No test suite + #:phases + (modify-phases %standard-phases + (add-before 'build 'change-directory + (lambda _ + (chdir "./src") + #t))))) + (synopsis "WireGuard loadable kernel module for Linux 3.10 through 5.5") + (description "This is a loadable Linux kernel module for WireGuard +supporting kernel versions 3.10 through 5.5. WireGuard was added to Linux +5.6. It ought to be used by adding it to the @code{kernel-loadable-modules} +field and loaded in memeory by @command{modprobe} or +@code{kernel-module-loader-service-type}."))) + (define-public wireguard-tools (package (name "wireguard-tools") -- 2.26.0 From unknown Thu Jun 19 14:31:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40683] [PATCH] gnu: Add wireguard-module. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Apr 2020 16:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40683 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40683@debbugs.gnu.org Received: via spool by 40683-submit@debbugs.gnu.org id=B40683.158714207027016 (code B ref 40683); Fri, 17 Apr 2020 16:48:01 +0000 Received: (at 40683) by debbugs.gnu.org; 17 Apr 2020 16:47:50 +0000 Received: from localhost ([127.0.0.1]:41593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPU9e-00071g-BU for submit@debbugs.gnu.org; Fri, 17 Apr 2020 12:47:50 -0400 Received: from tobias.gr ([80.241.217.52]:44876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPU9c-00071X-9w for 40683@debbugs.gnu.org; Fri, 17 Apr 2020 12:47:49 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 75e3c6ed for <40683@debbugs.gnu.org>; Fri, 17 Apr 2020 16:47:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to :subject:references:in-reply-to:date:message-id:mime-version :content-type; s=2018; i=me@tobias.gr; bh=KQASLLfn/JKLQAvKEqn/re qmiIRh88PnvHaR7rte1+I=; b=oHrbjDShLaOFw2sqI/ir/29mmPi/mJiAEX0giz KLOxuqb15CRdfQUjRJPyBeKRF8i2UN6UqSxfcam0fd9yb3pWF5M++roBqC8QNKeQ YsMGeS6VgT4JO1irYDJxPF6RKSJtcvbdTqC1ScISVY5zEP+MtHjE/luz1+z5tdy5 +63umCLjcXv4LEfuCYZf56LQdrMiuwTamhVbYKojfmclyQ4pKVFYTGdVDkCBApxB 8sk6SfYCi6OnvHZ9UuZP1onNd2zfg3SboltJ0ie4kpk4lZZuA9MJx5I+CkngbkNn FAbXjjCNRHyPG0wc46ua5l1bPMt6AB8O2nIyu98kcj7je/9g== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id cdb557e3 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <40683@debbugs.gnu.org>; Fri, 17 Apr 2020 16:47:46 +0000 (UTC) From: Tobias Geerinckx-Rice References: <20200417155855.6210-1-brice@waegenei.re> In-reply-to: <20200417155855.6210-1-brice@waegenei.re> Date: Fri, 17 Apr 2020 18:47:49 +0200 Message-ID: <871romys7e.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Brice! Brice Waegeneire =E5=86=99=E9=81=93=EF=BC=9A > This patch add wireguard as a loadable Linux kernel module which=20 > allow using > it Linux version < 5.6 without having to rebuild the entire=20 > kernel. Thanks! > +(define-public wireguard-module > + (package > + (inherit wireguard-linux-compat) > + (name "wireguard-module") 2x s/module/linux-module/ > + (build-system linux-module-build-system) > + (arguments > + `(#:tests? #f ; No test suite > + #:phases > + (modify-phases %standard-phases > + (add-before 'build 'change-directory > + (lambda _ > + (chdir "./src") > + #t))))) > + (synopsis "WireGuard loadable kernel module for Linux 3.10=20 > through 5.5") > + (description "This is a loadable Linux kernel module for=20 > WireGuard > +supporting kernel versions 3.10 through 5.5. WireGuard was=20 > added to Linux > +5.6. I think we should say =E2=80=98Linux-Libre=E2=80=99 here (yes, even though = it=20 loads on any *Linux) but I'm never entirely sure. > It ought to be used by adding it to the=20 > @code{kernel-loadable-modules} > +field and loaded in memeory by @command{modprobe} or > +@code{kernel-module-loader-service-type}."))) This can go; it belongs in the manual and is already explained=20 there. LGTM with these changes, but curious what others think about=20 =E2=80=98Linux=E2=80=99, T G-R --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCXpndtQAKCRANsP+IT1Vt ebxOAP9BF2lbKju6ChQrRVM1GDecgzKCRQh5K38wJecpDoSWDAEAzxhQ8GBPKCmH XSm5wuAFwDXJktG+fV250H1JVjqirAI= =qBc2 -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Jun 19 14:31:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40683] [PATCH v2] gnu: Add wireguard-linux-module. References: <20200417155855.6210-1-brice@waegenei.re> In-Reply-To: <20200417155855.6210-1-brice@waegenei.re> Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Apr 2020 12:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40683 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40683@debbugs.gnu.org Cc: me@tobias.gr Received: via spool by 40683-submit@debbugs.gnu.org id=B40683.15876453178989 (code B ref 40683); Thu, 23 Apr 2020 12:36:01 +0000 Received: (at 40683) by debbugs.gnu.org; 23 Apr 2020 12:35:17 +0000 Received: from localhost ([127.0.0.1]:54208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRb4W-0002Kv-Qv for submit@debbugs.gnu.org; Thu, 23 Apr 2020 08:35:17 -0400 Received: from relay11.mail.gandi.net ([217.70.178.231]:35323) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRb4U-0002Kg-MD for 40683@debbugs.gnu.org; Thu, 23 Apr 2020 08:35:15 -0400 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay11.mail.gandi.net (Postfix) with ESMTPSA id AF7A1100013; Thu, 23 Apr 2020 12:35:07 +0000 (UTC) From: Brice Waegeneire Date: Thu, 23 Apr 2020 14:34:57 +0200 Message-Id: <20200423123457.23843-1-brice@waegenei.re> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/vpn.scm (wireguard-linux-module): New variable. --- Rename wireguard-module to wireguard-linux-module and remove documentation from the description. gnu/packages/vpn.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 739522959c..be600524f5 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019, 2020 Leo Famulari ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system linux-module) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -496,6 +498,24 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers kernel versions 3.10 through 5.5. WireGuard was added to Linux 5.6.") (license license:gpl2))) +(define-public wireguard-linux-module + (package + (inherit wireguard-linux-compat) + (name "wireguard-linux-module") + (build-system linux-module-build-system) + (arguments + `(#:tests? #f ; No test suite + #:phases + (modify-phases %standard-phases + (add-before 'build 'change-directory + (lambda _ + (chdir "./src") + #t))))) + (synopsis "WireGuard loadable kernel module for Linux 3.10 through 5.5") + (description "This is a loadable Linux kernel module for WireGuard +supporting kernel versions 3.10 through 5.5. WireGuard was added to Linux +5.6."))) + (define-public wireguard-tools (package (name "wireguard-tools") -- 2.26.0 From unknown Thu Jun 19 14:31:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40683] Re: [bug#40683] [PATCH] gnu: Add wireguard-module. References: <20200417155855.6210-1-brice@waegenei.re> In-Reply-To: <20200417155855.6210-1-brice@waegenei.re> Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Apr 2020 12:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40683 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40683@debbugs.gnu.org, me@tobias.gr Received: via spool by 40683-submit@debbugs.gnu.org id=B40683.15876458569802 (code B ref 40683); Thu, 23 Apr 2020 12:45:01 +0000 Received: (at 40683) by debbugs.gnu.org; 23 Apr 2020 12:44:16 +0000 Received: from localhost ([127.0.0.1]:54214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRbDD-0002Y2-Pd for submit@debbugs.gnu.org; Thu, 23 Apr 2020 08:44:15 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:53841) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRbDB-0002Xl-9V for 40683@debbugs.gnu.org; Thu, 23 Apr 2020 08:44:13 -0400 Received: from webmail.gandi.net (webmail18.sd4.0x35.net [10.200.201.18]) (Authenticated sender: brice@waegenei.re) by relay5-d.mail.gandi.net (Postfix) with ESMTPA id 611B51C0005; Thu, 23 Apr 2020 12:44:05 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Thu, 23 Apr 2020 12:44:05 +0000 From: Brice Waegeneire Message-ID: <1cbec19178bb4184e32ebd497c22962a@waegenei.re> X-Sender: brice@waegenei.re User-Agent: Roundcube Webmail/1.3.8 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Tobias, >> + (synopsis "WireGuard loadable kernel module for Linux 3.10 >> through 5.5") >> + (description "This is a loadable Linux kernel module for >> WireGuard >> +supporting kernel versions 3.10 through 5.5. WireGuard was >> added to Linux >> +5.6. > > I think we should say ‘Linux-Libre’ here (yes, even though it > loads on any *Linux) but I'm never entirely sure. > > [...] > > LGTM with these changes, but curious what others think about > ‘Linux’, None of the similar packages like 'acpi-call-linux-module', 'rtl8812au-aircrack-ng-linux-module', 'ddcci-driver-linux' or 'zfs' use “Linux-Libre” in their synopsis or description. So using “Linux” should be good or an other patch should modify all of them. Cheers, - Brice From unknown Thu Jun 19 14:31:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40683] [PATCH v2] gnu: Add wireguard-linux-module. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Apr 2020 17:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40683 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brice Waegeneire Cc: me@tobias.gr, 40683@debbugs.gnu.org Received: via spool by 40683-submit@debbugs.gnu.org id=B40683.158766144111948 (code B ref 40683); Thu, 23 Apr 2020 17:04:02 +0000 Received: (at 40683) by debbugs.gnu.org; 23 Apr 2020 17:04:01 +0000 Received: from localhost ([127.0.0.1]:55795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRfGa-00036e-S1 for submit@debbugs.gnu.org; Thu, 23 Apr 2020 13:04:01 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:50939) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRfGZ-00036S-AJ for 40683@debbugs.gnu.org; Thu, 23 Apr 2020 13:03:59 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id D46055C0376; Thu, 23 Apr 2020 13:03:53 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 23 Apr 2020 13:03:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=9uS2JC2DcJd6iVIhBpSaRNoy MmF5hW5o31UTygW+8Mc=; b=u7L66AtZCijJtsRnLHH9zX9DKF8upNP68rnC5Xgf zJYC3/Ijd1hINMVDDd1ljUC++c+8fhgCL4pygld7tH+H0LGZ3TMM+Vg91H25MClF qpGfXi9d0Xok7u9Jn1STl62gBizwdvPhAxnsR/fcqnt+TB7XHsCCrOkcFzIbqx6L 6ZQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=9uS2JC 2DcJd6iVIhBpSaRNoyMmF5hW5o31UTygW+8Mc=; b=SXgAif94x5SwnqQ+u9SW9a 9D+AyTzp6ZsHl+1SKbO+2g6I2rrUdE+Mnv7rZ8IYfmIu8AGUFJYmkhppiXnXVdS4 GIiKiS2ROlbXQ6VhTwyCcKiwq3hynU3JgK3LKRVbw6mTKMtSr2wSDohBBAEDlSpk wnAyJvzS0A+kcT0LqYINfu1tZTptW4mG3Gl33Tc1ARqz/yDXlQN2oBXA9HoCd5DD AJPMDllK+5GBJjswmMhGNju25gAUCDT1LWos7vIeFVacD/bvhNyUVIp4r0BRlB9y 9usI5pK4N6ENUj8aPG148KGDDq5ufDwCpsZCogXyKBDcqWHDBcgufPOIFQ89OB8w == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrgeelgdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcuhfgr mhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecukfhppeejiedrud dvgedrudefkedrieefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id EE4263065D53; Thu, 23 Apr 2020 13:03:52 -0400 (EDT) Date: Thu, 23 Apr 2020 13:03:50 -0400 From: Leo Famulari Message-ID: <20200423170350.GA32197@jasmine.lan> References: <20200417155855.6210-1-brice@waegenei.re> <20200423123457.23843-1-brice@waegenei.re> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200423123457.23843-1-brice@waegenei.re> X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Thu, Apr 23, 2020 at 02:34:57PM +0200, Brice Waegeneire wrote: > * gnu/packages/vpn.scm (wireguard-linux-module): New variable. Can this be part of the wireguard-linux-compat package? I think it's confusing to have two packages providing WireGuard for old kernels. From unknown Thu Jun 19 14:31:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40683] [PATCH v3] gnu: Add loadable module to wireguard-linux-compat. References: <20200417155855.6210-1-brice@waegenei.re> In-Reply-To: <20200417155855.6210-1-brice@waegenei.re> Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Apr 2020 19:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40683 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40683@debbugs.gnu.org Cc: me@tobias.gr, leo@famulari.name Received: via spool by 40683-submit@debbugs.gnu.org id=B40683.158775793622571 (code B ref 40683); Fri, 24 Apr 2020 19:53:01 +0000 Received: (at 40683) by debbugs.gnu.org; 24 Apr 2020 19:52:16 +0000 Received: from localhost ([127.0.0.1]:58003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jS4Mt-0005rt-3i for submit@debbugs.gnu.org; Fri, 24 Apr 2020 15:52:16 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:50233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jS4Mq-0005re-6S for 40683@debbugs.gnu.org; Fri, 24 Apr 2020 15:52:10 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 5F9331BF204; Fri, 24 Apr 2020 19:51:59 +0000 (UTC) From: Brice Waegeneire Date: Fri, 24 Apr 2020 21:51:55 +0200 Message-Id: <20200424195155.23535-1-brice@waegenei.re> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/vpn.scm (wireguard-linux-compat)[build-system]: Replace 'gnu-build-system' by 'linux-module-build-system'. [arguments]: Adjust the build system. Add phase 'change-directory'. Rename phases 'build' to 'build-patch' and 'install' to 'install-patch'. [description]: Mention the loadable module. --- This version of the patch merge the now defunct 'wireguard-linux-module' into 'wireguard-linux-compat' -- hoping that it's less confusing for users. gnu/packages/vpn.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 739522959c..6bcce8fe52 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019, 2020 Leo Famulari ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system linux-module) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -465,19 +467,22 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers (sha256 (base32 "0ymprz3h4b92wlcqm5k5vmcgap8pjv202bgkdx0axmp12n1lmyvx")))) - (build-system gnu-build-system) + (build-system linux-module-build-system) (arguments `(#:tests? #f ; No test suite - #:modules ((guix build gnu-build-system) + #:modules ((guix build linux-module-build-system) (guix build utils) (ice-9 popen) (ice-9 textual-ports)) #:phases (modify-phases %standard-phases - (delete 'configure) ; No ./configure script - (replace 'build + (add-before 'build 'change-directory + (lambda _ + (chdir "./src") + #t)) + (add-after 'build 'build-patch (lambda* (#:key outputs #:allow-other-keys) - (let* ((patch-builder "./kernel-tree-scripts/create-patch.sh") + (let* ((patch-builder "../kernel-tree-scripts/create-patch.sh") (port (open-input-pipe patch-builder)) (str (get-string-all port))) (close-pipe port) @@ -485,15 +490,16 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers (lambda (port) (format port "~a" str)))) #t)) - (replace 'install + (add-after 'install 'install-patch (lambda* (#:key outputs #:allow-other-keys) (install-file "wireguard.patch" (assoc-ref %outputs "out")) #t))))) (home-page "https://git.zx2c4.com/wireguard-linux-compat/") (synopsis "WireGuard kernel module for Linux 3.10 through 5.5") - (description "This is an out-of-tree Linux kernel patch adding WireGuard to -kernel versions 3.10 through 5.5. WireGuard was added to Linux 5.6.") + (description "This package contains an out-of-tree kernel patch and +a loadable module adding WireGuard to Linux kernel versions 3.10 through 5.5. +WireGuard was added to Linux 5.6.") (license license:gpl2))) (define-public wireguard-tools -- 2.26.0 From unknown Thu Jun 19 14:31:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40683] [PATCH v4] gnu: Add loadable module to wireguard-linux-compat. References: <20200417155855.6210-1-brice@waegenei.re> In-Reply-To: <20200417155855.6210-1-brice@waegenei.re> Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Apr 2020 20:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40683 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40683@debbugs.gnu.org Cc: leo@famulari.name Received: via spool by 40683-submit@debbugs.gnu.org id=B40683.158793428231462 (code B ref 40683); Sun, 26 Apr 2020 20:52:02 +0000 Received: (at 40683) by debbugs.gnu.org; 26 Apr 2020 20:51:22 +0000 Received: from localhost ([127.0.0.1]:35076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jSoFA-0008BJ-Os for submit@debbugs.gnu.org; Sun, 26 Apr 2020 16:51:21 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:32867) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jSoF7-0008B2-Cq for 40683@debbugs.gnu.org; Sun, 26 Apr 2020 16:51:15 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 30D2C60007; Sun, 26 Apr 2020 20:51:05 +0000 (UTC) From: Brice Waegeneire Date: Sun, 26 Apr 2020 22:51:02 +0200 Message-Id: <20200426205102.5782-1-brice@waegenei.re> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/vpn.scm (wireguard-linux-compat)[build-system]: Replace 'gnu-build-system' by 'linux-module-build-system'. [outputs]: Add 'kernel-patch'. [arguments]: Adjust the build system. Add phase 'change-directory'. Rename phases 'build' to 'build-patch' and 'install' to 'install-patch'. [description]: Mention the loadable module. --- Put patch in 'kernel-patch' output. gnu/packages/vpn.scm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 739522959c..8c69b4be51 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019, 2020 Leo Famulari ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system linux-module) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -465,19 +467,24 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers (sha256 (base32 "0ymprz3h4b92wlcqm5k5vmcgap8pjv202bgkdx0axmp12n1lmyvx")))) - (build-system gnu-build-system) + (build-system linux-module-build-system) + (outputs '("out" + "kernel-patch")) (arguments `(#:tests? #f ; No test suite - #:modules ((guix build gnu-build-system) + #:modules ((guix build linux-module-build-system) (guix build utils) (ice-9 popen) (ice-9 textual-ports)) #:phases (modify-phases %standard-phases - (delete 'configure) ; No ./configure script - (replace 'build + (add-before 'build 'change-directory + (lambda _ + (chdir "./src") + #t)) + (add-after 'build 'build-patch (lambda* (#:key outputs #:allow-other-keys) - (let* ((patch-builder "./kernel-tree-scripts/create-patch.sh") + (let* ((patch-builder "../kernel-tree-scripts/create-patch.sh") (port (open-input-pipe patch-builder)) (str (get-string-all port))) (close-pipe port) @@ -485,15 +492,16 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers (lambda (port) (format port "~a" str)))) #t)) - (replace 'install + (add-after 'install 'install-patch (lambda* (#:key outputs #:allow-other-keys) (install-file "wireguard.patch" - (assoc-ref %outputs "out")) + (assoc-ref %outputs "kernel-patch")) #t))))) (home-page "https://git.zx2c4.com/wireguard-linux-compat/") (synopsis "WireGuard kernel module for Linux 3.10 through 5.5") - (description "This is an out-of-tree Linux kernel patch adding WireGuard to -kernel versions 3.10 through 5.5. WireGuard was added to Linux 5.6.") + (description "This package contains an out-of-tree kernel patch and +a loadable module adding WireGuard to Linux kernel versions 3.10 through 5.5. +WireGuard was added to Linux 5.6.") (license license:gpl2))) (define-public wireguard-tools -- 2.26.0 From unknown Thu Jun 19 14:31:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40683] [PATCH v4] gnu: Add loadable module to wireguard-linux-compat. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Apr 2020 21:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40683 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brice Waegeneire Cc: 40683@debbugs.gnu.org Received: via spool by 40683-submit@debbugs.gnu.org id=B40683.15879358171456 (code B ref 40683); Sun, 26 Apr 2020 21:17:02 +0000 Received: (at 40683) by debbugs.gnu.org; 26 Apr 2020 21:16:57 +0000 Received: from localhost ([127.0.0.1]:35102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jSodv-0000NJ-QO for submit@debbugs.gnu.org; Sun, 26 Apr 2020 17:16:57 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:43801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jSodp-0000Mz-7X for 40683@debbugs.gnu.org; Sun, 26 Apr 2020 17:16:50 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 3EAA050E; Sun, 26 Apr 2020 17:16:39 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sun, 26 Apr 2020 17:16:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=3cZ4u/eB1B+x31+KUk7u3Gt0 XJGyf4FANMOyA4PRuHI=; b=W26PJ/Qasb6QvUUdFrV8tg6eu6WSiqDNk4ri3oqu TRq7Qal8gfw7G4Ln0qeolK/9jNAja/AzibPo4tHyAbYZSjvbIikdWqBUPSSghR3a ffJtmZtB2PKX2gF/Kirvf/BoV6P5W7cNxh52QBvsTXiNgFo8565CXnz1ewVjhrOI Ruw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=3cZ4u/ eB1B+x31+KUk7u3Gt0XJGyf4FANMOyA4PRuHI=; b=1wl4uUGxuZbIZspAUbRxXR ZZl6ttMg4lVowVEftwBqeFjnl7cUc3wLHlomeu5rXt1Eq8Jb6sT/Uhp827R8t1WT w0HnY+3P9k+Ga0pkV9kK3NXuhmYHHurjHTnUpkgQA/Url7BMHJXYluYHdN1jDGqr nSlS6FxAiw41GUwsXHI5W8/ph5uNIG+H4YFLwnEFmAXQNHy8IBS89dDmu4Mva8zm PmzIvW8kYZlWGBUKgWnJgzoEw4z9UcKfTMP5UKhKf/egeWsELB7bsNt5W8sJ46fo 7/J87V1817euodqRgzeI8+GOeU0Xvz/aoecyaacpcxVaL48XrqKIkHWnQAoKX8hg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrheejgdduiedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucfkphepjeeird duvdegrddufeekrdeifeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgr ihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id 505793280063; Sun, 26 Apr 2020 17:16:38 -0400 (EDT) Date: Sun, 26 Apr 2020 17:16:36 -0400 From: Leo Famulari Message-ID: <20200426211636.GA23689@jasmine.lan> References: <20200426205102.5782-1-brice@waegenei.re> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="uQr8t48UFsdbeI+V" Content-Disposition: inline In-Reply-To: <20200426205102.5782-1-brice@waegenei.re> X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --uQr8t48UFsdbeI+V Content-Type: multipart/mixed; boundary="ZPt4rx8FFjLCG7dd" Content-Disposition: inline --ZPt4rx8FFjLCG7dd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sun, Apr 26, 2020 at 10:51:02PM +0200, Brice Waegeneire wrote: > * gnu/packages/vpn.scm (wireguard-linux-compat)[build-system]: Replace > 'gnu-build-system' by 'linux-module-build-system'. > [outputs]: Add 'kernel-patch'. > [arguments]: Adjust the build system. Add phase 'change-directory'. > Rename phases 'build' to 'build-patch' and 'install' to 'install-patch'. > [description]: Mention the loadable module. Thanks! I've attached a v5 that ensures the license files still get installed. Does it work for you? --ZPt4rx8FFjLCG7dd Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-Add-loadable-module-to-wireguard-linux-compat.patch" Content-Transfer-Encoding: quoted-printable =46rom 2e28a69dc384880cf858e4c402588ccd0bfd84fa Mon Sep 17 00:00:00 2001 =46rom: Brice Waegeneire Date: Sun, 26 Apr 2020 22:51:02 +0200 Subject: [PATCH] gnu: Add loadable module to wireguard-linux-compat. * gnu/packages/vpn.scm (wireguard-linux-compat)[build-system]: Replace 'gnu-build-system' by 'linux-module-build-system'. [outputs]: Add 'kernel-patch'. [arguments]: Adjust the build system. Add phase 'change-directory'. Rename phases 'build' to 'build-patch' and 'install' to 'install-patch'. [description]: Mention the loadable module. Signed-off-by: Leo Famulari --- gnu/packages/vpn.scm | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 739522959c..a9e20049c6 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -11,6 +11,7 @@ ;;; Copyright =A9 2019, 2020 Leo Famulari ;;; Copyright =A9 2019 Rutger Helling ;;; Copyright =A9 2019 Ricardo Wurmus +;;; Copyright =A9 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system linux-module) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -465,19 +467,24 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) = network between the peers (sha256 (base32 "0ymprz3h4b92wlcqm5k5vmcgap8pjv202bgkdx0axmp12n1lmyvx")))) - (build-system gnu-build-system) + (build-system linux-module-build-system) + (outputs '("out" + "kernel-patch")) (arguments `(#:tests? #f ; No test suite - #:modules ((guix build gnu-build-system) + #:modules ((guix build linux-module-build-system) (guix build utils) (ice-9 popen) (ice-9 textual-ports)) #:phases (modify-phases %standard-phases - (delete 'configure) ; No ./configure script - (replace 'build + (add-before 'build 'change-directory + (lambda _ + (chdir "./src") + #t)) + (add-after 'build 'build-patch (lambda* (#:key outputs #:allow-other-keys) - (let* ((patch-builder "./kernel-tree-scripts/create-patch.sh") + (let* ((patch-builder "../kernel-tree-scripts/create-patch.sh= ") (port (open-input-pipe patch-builder)) (str (get-string-all port))) (close-pipe port) @@ -485,15 +492,21 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) = network between the peers (lambda (port) (format port "~a" str)))) #t)) - (replace 'install + (add-after 'install 'install-patch (lambda* (#:key outputs #:allow-other-keys) (install-file "wireguard.patch" - (assoc-ref %outputs "out")) + (assoc-ref %outputs "kernel-patch")) + #t)) + ;; So that 'install-license-files' works... + (add-before 'install-license-files 'reset-cwd + (lambda _ + (chdir "..") #t))))) (home-page "https://git.zx2c4.com/wireguard-linux-compat/") (synopsis "WireGuard kernel module for Linux 3.10 through 5.5") - (description "This is an out-of-tree Linux kernel patch adding WireGua= rd to -kernel versions 3.10 through 5.5. WireGuard was added to Linux 5.6.") + (description "This package contains an out-of-tree kernel patch and +a loadable module adding WireGuard to Linux kernel versions 3.10 through 5= =2E5. +WireGuard was added to Linux 5.6.") (license license:gpl2))) =20 (define-public wireguard-tools --=20 2.26.2 --ZPt4rx8FFjLCG7dd-- --uQr8t48UFsdbeI+V Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAl6l+jEACgkQJkb6MLrK fwg4lA/8CnN2S3RXNipGkgvF8UbKR5oHQM1jEdjac+CBra9Q19b6Pr2L6DcEw26g z728KWT0lKJvmmQVEYFIVRjdXCs9R/ClFOAJrEvTzYmaJpZIkndZPZAtrLhDKUUX q8soxOFCxFFecezaKV11zPZJtCWsPSkAKvjYjG/yldiXHDMVBGd3UGwLUkO21VT9 kP8RX/g0nFsS1Dt8YA/X7dTfwmfEamby8WmGvk1M237oqW27AH8U6ce/nYZZ3TeL tKufsO0O02DyC6dFEGmhKQUhVE7pe7xh7KUOg6rbWgryRoGlfXV5tGwT3Exxs5dB ohwhsenNqTypvsHaFzfuNc7RGl2Uo6tLAsXZ9GdZdMGJEQ2CoqrQ3jEkJ9v/AwWR 3vNWTlp5DL9FZUJq/pucAwAJ4hV/PYaL71KsZFhnhUobLSmk3+ylVctjtWJJuGd3 VeUMCVZ4ByrTAOHwQFPVL44yuvfdl2AUZgRYQyIFVS53P+0ojSaMbV69c7fHqc5V aWRs4LR/5lekSyRmHgif3b6WT1cugmHz72IXfmYMscNKQL76+eBiCPrvFaO0gYQQ g/P7qnHSZSpVEMbyfAaoc6vB8fyXp7oJ6iTGKCyA1UAgY1L2SHHhwPOGsnzksJQZ vQp7LQW+wz1Slr/Owa0qVwTynEej9MTVJ+HcsL+AJNfTeFC/bQI= =rp5I -----END PGP SIGNATURE----- --uQr8t48UFsdbeI+V-- From unknown Thu Jun 19 14:31:51 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Brice Waegeneire Subject: bug#40683: closed (Re: [PATCH v4] gnu: Add loadable module to wireguard-linux-compat.) Message-ID: References: <20200426222548.GA21450@jasmine.lan> <20200417155855.6210-1-brice@waegenei.re> X-Gnu-PR-Message: they-closed 40683 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 40683@debbugs.gnu.org Date: Sun, 26 Apr 2020 22:26:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1587939961-7804-1" This is a multi-part message in MIME format... ------------=_1587939961-7804-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #40683: [PATCH] gnu: Add wireguard-module. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 40683@debbugs.gnu.org. --=20 40683: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D40683 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1587939961-7804-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 40683-done) by debbugs.gnu.org; 26 Apr 2020 22:25:59 +0000 Received: from localhost ([127.0.0.1]:35169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jSpio-00021e-LC for submit@debbugs.gnu.org; Sun, 26 Apr 2020 18:25:58 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:35763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jSpim-00021S-Ui for 40683-done@debbugs.gnu.org; Sun, 26 Apr 2020 18:25:57 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id E406E4E1; Sun, 26 Apr 2020 18:25:50 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 26 Apr 2020 18:25:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=iJdavmB/ERKn9LiK42K+Kpt3 N2X0jAY9dG2bYSjGZnY=; b=m+j9N7NIagheQTDmyifyEgC4/9Cf3jVdfKuDYDRL 5o3vh0x445GllPPsI7sDyG47trLmv1lmkiFL4K8aIUs5/m9p/qVsZ13HsifYfSmB nSzfYnSLG8ISuqfWfbkrOeWwkV5G6YIk7u5HfPWYKVKk/Djkc+OQYFSrjSesfOIA ZBg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=iJdavm B/ERKn9LiK42K+Kpt3N2X0jAY9dG2bYSjGZnY=; b=PoJ6U34RYPcaNtUNmvTNRF K0vvK7rsMBp4uF6RDwi/N7hmgDuQCJ635Dv2p3BQrpxR8W1YNvA6qV6fPvSEZsyR 4ARyUQChVdJeaSJIo2RFg04kIW2xs6Spdp7r1tx0mWvXG22uEKiAcKlz4PA9cfwQ cWXImt+g5b6dRhr4a08cMyUQBEZjA2UBSi/+/VR7NIxGrWKXpKTZ7qVDmRpG3ZuN xmNZzxRiUXNsVvUIiZl915m6zXv4o501Gs4hsUONwxsOGdY0Ohxz5/ViqlzdWRxf icSl+0jalEJwCEwQB8NaWBh/phucyHcMvGOUNQNXUyam8yM+i5QX/Nb7P57yItIQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrheekgddutdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomhepnfgvohcuhfgr mhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecukfhppeejiedrud dvgedrudefkedrieefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id 08D363065E4D; Sun, 26 Apr 2020 18:25:50 -0400 (EDT) Date: Sun, 26 Apr 2020 18:25:48 -0400 From: Leo Famulari To: Brice Waegeneire Subject: Re: [PATCH v4] gnu: Add loadable module to wireguard-linux-compat. Message-ID: <20200426222548.GA21450@jasmine.lan> References: <20200426205102.5782-1-brice@waegenei.re> <20200426211636.GA23689@jasmine.lan> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="9jxsPFA5p3P2qPhR" Content-Disposition: inline In-Reply-To: <20200426211636.GA23689@jasmine.lan> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40683-done Cc: 40683-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --9jxsPFA5p3P2qPhR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sun, Apr 26, 2020 at 05:16:36PM -0400, Leo Famulari wrote: > Thanks! I've attached a v5 that ensures the license files still get > installed. Does it work for you? I pushed this as 3b177a6c33baa0d78ebd5407119511807d59a590 based on feedback on #guix --9jxsPFA5p3P2qPhR Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAl6mCmsACgkQJkb6MLrK fwgDthAAmxRxE60BHIRtDxTJ0idonKo2x4EbLwbnN7KnsJZrYcIU0FVJ3ntY4mSj uvwzgAt9Gn3gBir6TDYeASRS2fc20/cy18hjSS//seiqyla7cewyDF8tP6dKIRci ghvH+xmlOTDkK1ABiwGWF4IMwCfVs5Pgg3lITjYfkpVr8IFCaqu3Cz5fWUrk/169 WcoPhf9w60X+yL+H4MpWy8P6pEofcOkh72xF6vM+bfx396rj/TnI/CHM9VSKYUqj zkcbHdxL7uxOjx9u2Eg0pObuWcgeSCtbYJGzBT0uFaIVn0tAD2z2tXWJByDNNqp1 RSDMEJAuxbDnOw2mJSj17SkbSN9aPOriFvIQqar5JsUp8uQ2l3cTaB/8ByZRHtor 840NFkfsl7/BQtAS8fOrQQM10ILun9sUlGT5XEWma3c0Pw09YOvRccaaG+zqGtTt zAgHRf84u/YzwTXHKE0QIWMmb1kC7w7ECkiGyhJTMKa8gJrwF+tHjazQbCfd2qSh gn///ZxLC9d/Xk7CM1WblaUfUjk5Q/qac8tOmB5sADn7+KNlVshkpUu7rZRH2Jcq 4BIWIXa5kKxYwl1cdcJy9NCLXYXZG3CcYsveXwHiY5WMlgeCAyGWv/t2syPBnZ4h a3vhWlOcItKZVWDh28o5z6qO946NjPYinaFkOy+TkEodQ8zrdAo= =ZK4M -----END PGP SIGNATURE----- --9jxsPFA5p3P2qPhR-- ------------=_1587939961-7804-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 17 Apr 2020 15:59:15 +0000 Received: from localhost ([127.0.0.1]:41536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPTOd-0001eO-48 for submit@debbugs.gnu.org; Fri, 17 Apr 2020 11:59:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:45151) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jPTOb-0001eH-Ia for submit@debbugs.gnu.org; Fri, 17 Apr 2020 11:59:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56717) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPTOa-00061L-Br for guix-patches@gnu.org; Fri, 17 Apr 2020 11:59:13 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jPTOY-0006BG-Q2 for guix-patches@gnu.org; Fri, 17 Apr 2020 11:59:11 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:44055) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jPTOY-00067x-K5 for guix-patches@gnu.org; Fri, 17 Apr 2020 11:59:10 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 675161C0007 for ; Fri, 17 Apr 2020 15:59:04 +0000 (UTC) From: Brice Waegeneire To: guix-patches@gnu.org Subject: [PATCH] gnu: Add wireguard-module. Date: Fri, 17 Apr 2020 17:58:55 +0200 Message-Id: <20200417155855.6210-1-brice@waegenei.re> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.70.183.197 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/vpn.scm (wireguard-module): New variable. --- This patch add wireguard as a loadable Linux kernel module which allow using it Linux version < 5.6 without having to rebuild the entire kernel. Following is a usage example: --8<---------------cut here---------------start------------->8--- (use-modules (gnu) (gnu services)) (use-package-modules vpn) (use-service-modules linux) (operating-system ... (services (cons* (service kernel-module-loader-service-type '("wireguard")) %base-services)) (kernel-loadable-modules (list wireguard-module))) --8<---------------cut here---------------end--------------->8--- gnu/packages/vpn.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 739522959c..654c9d8db1 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019, 2020 Leo Famulari ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,7 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system linux-module) #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -496,6 +498,26 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers kernel versions 3.10 through 5.5. WireGuard was added to Linux 5.6.") (license license:gpl2))) +(define-public wireguard-module + (package + (inherit wireguard-linux-compat) + (name "wireguard-module") + (build-system linux-module-build-system) + (arguments + `(#:tests? #f ; No test suite + #:phases + (modify-phases %standard-phases + (add-before 'build 'change-directory + (lambda _ + (chdir "./src") + #t))))) + (synopsis "WireGuard loadable kernel module for Linux 3.10 through 5.5") + (description "This is a loadable Linux kernel module for WireGuard +supporting kernel versions 3.10 through 5.5. WireGuard was added to Linux +5.6. It ought to be used by adding it to the @code{kernel-loadable-modules} +field and loaded in memeory by @command{modprobe} or +@code{kernel-module-loader-service-type}."))) + (define-public wireguard-tools (package (name "wireguard-tools") -- 2.26.0 ------------=_1587939961-7804-1--