From patchwork Tue Jul 13 23:01:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 31387 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 7593B27BC82; Wed, 14 Jul 2021 00:03:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F019327BC6B for ; Wed, 14 Jul 2021 00:03:17 +0100 (BST) Received: from localhost ([::1]:40244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3RQq-0003JO-QX for patchwork@mira.cbaines.net; Tue, 13 Jul 2021 19:03:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3RQc-0003E9-LS for guix-patches@gnu.org; Tue, 13 Jul 2021 19:03:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3RQc-0001UD-0Y for guix-patches@gnu.org; Tue, 13 Jul 2021 19:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3RQb-000894-Us for guix-patches@gnu.org; Tue, 13 Jul 2021 19:03:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49556] [PATCH 2/2] gnu: VDE 2: Update to 2.3.2-0.8599321. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Jul 2021 23:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49556 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 49556@debbugs.gnu.org Received: via spool by 49556-submit@debbugs.gnu.org id=B49556.162621733331243 (code B ref 49556); Tue, 13 Jul 2021 23:03:01 +0000 Received: (at 49556) by debbugs.gnu.org; 13 Jul 2021 23:02:13 +0000 Received: from localhost ([127.0.0.1]:42388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3RPk-00087j-Rr for submit@debbugs.gnu.org; Tue, 13 Jul 2021 19:02:13 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:45729) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3RPj-00087A-MI for 49556@debbugs.gnu.org; Tue, 13 Jul 2021 19:02:08 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id 27BA632008C3; Tue, 13 Jul 2021 19:02:02 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Tue, 13 Jul 2021 19:02:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=mesmtp; bh=BYqkR06JDnN2vVlG5viLFhDpTRmFBLMYDaOvY2d4ymU=; b=sa4ODZ+rWQlx rTAg7PyDI7RoSC80HUmjxP3auocOFbgVgSXxopFWgaiD1zbxy4AIjUnpHTEUfdFQ QPOkZyY+05VtnL6gbCWl1sphv5SyE5k0AuDKJ32WDRuvO1TSjO5yHqLZgBqZIGvy zsQIwxXHRCaL0vjLFFrZ4miAR6q2F/4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding: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=fm3; bh=BYqkR06JDnN2vVlG5viLFhDpTRmFBLMYDaOvY2d4y mU=; b=tLjsvSKQ4aaWPgdbbhl3TpDbWmE/UtmlyOXV5hEw7UStwxGg9L5liD8LQ wr8FC5UNJij7u/nhuM9MQgClvnBpBNCQMbaPNAi4cJ0Dc8e0lAcbULKfiv562c7i 6vO6ilFogNc5ytRO1rCUBdAroo/DGwN3As9lp4wb5+fKw5eREnKIbKYaxGyS4ARH qfnXMhdtJemqX077Wxm0WNr5fi9mBxcambxq0HmJRSSU6jr2B4XszpDVGuo4UzeL GMTiUSxPFDNHooltkwG1Ugb1RkRkKIIJkprRNfvM4QUHp52bCO9DZmKxGAfNHUBo ddqtjxwfnjaezX1w9YVHV/IifosJw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudejgdduvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesthekre dtredtjeenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhephffgfedutdefudeuhfdtleegieetfe euueehudfhgefgfffgveehueefvdegjedvnecuffhomhgrihhnpehgihhthhhusgdrtgho mhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvg hosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <49556@debbugs.gnu.org>; Tue, 13 Jul 2021 19:02:01 -0400 (EDT) From: Leo Famulari Date: Tue, 13 Jul 2021 19:01:55 -0400 Message-Id: <1a3710d2a7891dfb069d6d8dfadeca998954bc1e.1626217314.git.leo@famulari.name> X-Mailer: git-send-email 2.32.0 In-Reply-To: <3541a7f3fc7d42c6d501180100f81b357ce2d36c.1626217314.git.leo@famulari.name> References: <3541a7f3fc7d42c6d501180100f81b357ce2d36c.1626217314.git.leo@famulari.name> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches Updating to this unreleased revision allows us to package VDE 2 with wolfSSL instead of the obsolete OpenSSL 1.0: https://github.com/virtualsquare/vde-2/issues/2 * gnu/packages/networking.scm (vde2): Update to 2.3.2-0.8599321. [source]: Use git-fetch. [native-inputs]: Add autoconf, automake, and libtool [inputs]: Replace openssl-1.0 with wolfssl. --- gnu/packages/networking.scm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 19b58501e9..d99af3035c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Benz Schenk ;;; Copyright © 2016, 2017 Pjotr Prins ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2017, 2020 Leo Famulari +;;; Copyright © 2017, 2020, 2021 Leo Famulari ;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2017, 2019 Gábor Boskovits @@ -3789,22 +3789,31 @@ network. This must be enabled on the target host, usually in the BIOS.") (license license:gpl2))) (define-public vde2 + (let ((commit "8599321526d0a31925fe55cabbe132b752cb268a") + (revision "0")) (package (name "vde2") - (version "2.3.2") + (version (git-version "2.3.2" revision commit)) (source (origin - (method url-fetch) - (uri "mirror://sourceforge/vde/vde2/2.3.2/vde2-2.3.2.tar.gz") + (method git-fetch) + (uri (git-reference + (url "https://github.com/virtualsquare/vde-2") + (commit commit))) + (file-name (git-file-name name version)) (sha256 - (base32 "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2")))) + (base32 "1dirkcbjh7c5kz7d065g1yq7vg8jl93hql3brfxd84k8hc8nqjb2")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f)) ; Build fails if #t. + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (inputs `(("python" ,python) ("libpcap" ,libpcap) - ("openssl" ,openssl-1.0))) ; Build fails with 1.1. + ("wolfssl" ,wolfssl))) (home-page "https://github.com/virtualsquare/vde-2") (synopsis "Virtual Distributed Ethernet") (description "VDE is a set of programs to provide virtual software-defined @@ -3816,7 +3825,7 @@ cables.") license:lgpl2.1 ; libvdeplug (license:non-copyleft ; slirpvde "file://COPYING.slirpvde" - "See COPYING.slirpvde in the distribution."))))) + "See COPYING.slirpvde in the distribution.")))))) (define-public haproxy (package