From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 03 01:36:14 2020 Received: (at submit) by debbugs.gnu.org; 3 Apr 2020 05:36:14 +0000 Received: from localhost ([127.0.0.1]:41068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKEzw-0001kl-VW for submit@debbugs.gnu.org; Fri, 03 Apr 2020 01:36:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:57042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKEzs-0001kO-Al for submit@debbugs.gnu.org; Fri, 03 Apr 2020 01:36:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56699) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKEzp-00056g-Nq for guix-patches@gnu.org; Fri, 03 Apr 2020 01:36:04 -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.7 required=5.0 tests=BAYES_40,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 1jKEzo-0008Uz-9a for guix-patches@gnu.org; Fri, 03 Apr 2020 01:36:01 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:46767) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jKEzn-0008QU-7r for guix-patches@gnu.org; Fri, 03 Apr 2020 01:36:00 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id ACAAC756; Fri, 3 Apr 2020 01:35:57 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Fri, 03 Apr 2020 01:35:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=sZjqibu2hrqFcg+KHE9Gzqk ZTYl6qnRs0QGjRApsi6g=; b=V2hSsHahnYyWblzlqfNqT79mo6lMjrU/SWPMg7E 3oprbnAH3tbUROafeFaJM8maRv6BPjv+C7Gbby8/8bxzwI7/7734c+xI2mj1FWE8 hOyC3bsGpTWUi+wv3Hwmgf2HPlbQxPyiY7uuyvuM1FtmSNn+lMcjMWdUIHmDe7ar IqYo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=sZjqibu2hrqFcg+KH E9GzqkZTYl6qnRs0QGjRApsi6g=; b=3po+hSwfUNoHrP53Am4rOumbdBDgkA1ud nF66fGOigczIEL0qOsej/24PABQczKOR5tTlUIGYjxhhwSEOqGcm16vcd7ye4iVC Um1yl7hrYDI6PVC9r3g49/j0pjWgQPIbX6h2bMKfMmPltT1KhxoDonHP1wwm0+2B /BQvfQjgc5ZYgJfjsN+roUGNb7XOxr9b/zQWG6Y2yZjgvXrWdC/rDfX2AJOlt1Zl NmddP2DZWThHj5I1imYkM6CUdtBpCxEBZP6HG3uZ5lepKIEAbVdaxLiJS+gpg0zM xP2doXoI3yM1hahDOH5KgTLYCbdq3Zl5kouxL7VVPDVYLx161fyWQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrtdehgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdr nhgrmhgvqeenucffohhmrghinhepiiigvdgtgedrtghomhdpfihirhgvghhurghrugdrtg homhenucfkphepjeeirdduvdegrddufeekrdeifeenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from jasmine.lan (c-76-124-138-63.hsd1.pa.comcast.net [76.124.138.63]) by mail.messagingengine.com (Postfix) with ESMTPA id B9299306CF11 for ; Fri, 3 Apr 2020 01:35:56 -0400 (EDT) From: Leo Famulari To: guix-patches@gnu.org Subject: [PATCH] gnu: Add wireguard-linux-compat. Date: Fri, 3 Apr 2020 01:35:39 -0400 Message-Id: X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 64.147.123.25 X-Spam-Score: 0.2 (/) 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: -0.8 (/) Since WireGuard was added to Linux 5.6, the WireGuard upstream split their old 'wireguard' codebase into 'wireguard-tools' (the userspace tools) and 'wireguard-linux-compat' (the kernel patch for older kernels). This commit adds the new upstream for the kernel patch and deprecates the obselete 'wireguard' package. * gnu/packages/vpn.scm (wireguard-linux-compat): New variable. (wireguard): Deprecate in favor of wireguard-tools. --- gnu/packages/vpn.scm | 61 ++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index becc505b34..e9d9ab8be4 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -453,61 +453,47 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers ;; 3-clause BSD license. (license license:bsd-3))) -(define-public wireguard +(define-public wireguard-linux-compat (package - (name "wireguard") - (version "0.0.20191219") + (name "wireguard-linux-compat") + (version "1.0.20200401") (source (origin (method url-fetch) - (uri (string-append "https://git.zx2c4.com/WireGuard/snapshot/" - "WireGuard-" version ".tar.xz")) + (uri (string-append "https://git.zx2c4.com/wireguard-linux-compat/" + "snapshot/wireguard-linux-compat-" version + ".tar.xz")) (sha256 (base32 - "1rxhhf18vnlbxpaxib6y55gbvr5h9dcvl8sn2l5slzz97066zfjs")))) + "0ymprz3h4b92wlcqm5k5vmcgap8pjv202bgkdx0axmp12n1lmyvx")))) (build-system gnu-build-system) - (outputs '("out" ; The WireGuard userspace tools - "kernel-patch")) ; A patch to build Linux with WireGuard support (arguments - `(#:tests? #f ; No tests available. - #:make-flags - (list "CC=gcc" - "--directory=src/tools" - "WITH_BASHCOMPLETION=yes" - ;; Build and install the helper script wg-quick(8). - "WITH_WGQUICK=yes" - (string-append "PREFIX=" (assoc-ref %outputs "out")) - (string-append "SYSCONFDIR=" (assoc-ref %outputs "out") "/etc")) + `(#:tests? #f ; No test suite #:modules ((guix build gnu-build-system) (guix build utils) (ice-9 popen) (ice-9 textual-ports)) #:phases (modify-phases %standard-phases - ;; There is no ./configure script. - (delete 'configure) - ;; Until WireGuard is added to the upstream Linux kernel, it is - ;; distributed as a kernel patch generated by this script. - (add-after 'patch-source-shebangs 'make-patch + (delete 'configure) ; No ./configure script + (replace 'build (lambda* (#:key outputs #:allow-other-keys) - (let* ((output (string-append (assoc-ref outputs "kernel-patch") - "/wireguard.patch")) - (patch-builder "./contrib/kernel-tree/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) - (mkdir-p (dirname output)) - (call-with-output-file output + (call-with-output-file "wireguard.patch" (lambda (port) (format port "~a" str)))) - #t))))) - (inputs - `(("libmnl" ,libmnl))) - (home-page "https://www.wireguard.com/") - (synopsis "Tools for configuring WireGuard") - (description "This package provides the userspace tools for setting and -retrieving configuration of WireGuard network tunnel interfaces, and a patch -that can be applied to a Linux kernel source tree in order to build it with -WireGuard support.") + #t)) + (replace 'install + (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 for kernel versions +3.10 through 5.5. WireGuard was added to Linux 5.6.") (license license:gpl2))) (define-public wireguard-tools @@ -556,6 +542,9 @@ public keys and can roam across IP addresses.") (list license:lgpl2.1+ ; src/netlink.h & contrib/embeddable-wg-library license:gpl2)))) ; everything else +(define-public wireguard + (deprecated-package "wireguard" wireguard-tools)) + (define-public xl2tpd (package (name "xl2tpd") -- 2.26.0