From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id PnRBLrrXCWHWaAEAgWs5BA (envelope-from ) for ; Wed, 04 Aug 2021 01:56:42 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id gIdgKbrXCWHAVAAA1q6Kng (envelope-from ) for ; Tue, 03 Aug 2021 23:56:42 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E3D682ACAE for ; Wed, 4 Aug 2021 01:56:41 +0200 (CEST) Received: from localhost ([::1]:57326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mB4H2-00044s-UC for larch@yhetil.org; Tue, 03 Aug 2021 19:56:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mB4GR-0003hp-JY for guix-patches@gnu.org; Tue, 03 Aug 2021 19:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58459) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mB4GR-0007PJ-Cb for guix-patches@gnu.org; Tue, 03 Aug 2021 19:56:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mB4GR-0001jo-AF for guix-patches@gnu.org; Tue, 03 Aug 2021 19:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49854] [PATCH v2 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, 03 Aug 2021 23:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49854 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49854@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16280349396616 (code B ref -1); Tue, 03 Aug 2021 23:56:03 +0000 Received: (at submit) by debbugs.gnu.org; 3 Aug 2021 23:55:39 +0000 Received: from localhost ([127.0.0.1]:41768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mB4Fy-0001iU-B7 for submit@debbugs.gnu.org; Tue, 03 Aug 2021 19:55:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:44200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mB4Fq-0001i3-0U for submit@debbugs.gnu.org; Tue, 03 Aug 2021 19:55:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mB4Fp-0003Wi-N9 for guix-patches@gnu.org; Tue, 03 Aug 2021 19:55:25 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:57297) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mB4Fl-0006wN-DB for guix-patches@gnu.org; Tue, 03 Aug 2021 19:55:25 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id E5B5A5C0085; Tue, 3 Aug 2021 19:55:20 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Tue, 03 Aug 2021 19:55:20 -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=kKpSlT8IIDbHMWLxVdZ3qWabbk7Pw+cAQJTnS0yB72I=; b=eRjiPcbooCRV xOlwKxLLKlaQuzIbZY44KCW5DjIROHsSp31yofn5UT9+SI+v1lWWV0UDYeaqjae4 uOUf6/hBce7IUdJl8PQFMS3jqLKD+DLqXAWPt3cIGRgrxf77owkF1tdb6mdMOZEG T8JPh745HzGZx9Y3y0V3MNTT00SXCIw= 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=kKpSlT8IIDbHMWLxVdZ3qWabbk7Pw+cAQJTnS0yB7 2I=; b=TDZfTebUi7hGccpm5inn87AeezVj//m2TUoNceh5OzoB/JR84uO/iMRpM yXGEjtvLpDLh/zec1xRGCdfh/MnfyR/0JmEkJIiGsHR9NEImKqi8jkv9YTckFA3/ 9WsXq7067+nh3I33KcaR4lALvCoHh6dHiCNsqjLh5bwlM4tzP/fjJFuLzgC2Fkld 4CSJyoDZ6PkwZ6Do5iKn6NnkyL2Yq0dFlP9hXI3dBUIoBxw/Hos8ngPVnLgH2qeA vlXqeMyymVlDgRmlTXnJA+vCyVBUm2neGl5ptKZ13Ezw8ddUp1UenkavRWpB2vCF WepsAYSj7BxXegxBJzJ5+sQIsJGdQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrieehgddviecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesthekre dtredtjeenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhephffgfedutdefudeuhfdtleegieetfe euueehudfhgefgfffgveehueefvdegjedvnecuffhomhgrihhnpehgihhthhhusgdrtgho mhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvg hosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 3 Aug 2021 19:55:20 -0400 (EDT) From: Leo Famulari Date: Tue, 3 Aug 2021 19:55:01 -0400 Message-Id: <4bd1f59c75dd59d9d68a642040ddf0147bc4f7d1.1628034759.git.leo@famulari.name> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=66.111.4.29; envelope-from=leo@famulari.name; helo=out5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628035002; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=kKpSlT8IIDbHMWLxVdZ3qWabbk7Pw+cAQJTnS0yB72I=; b=s7jbwp5p7jLNHc2BDb3365655335e1MrSwvhAe2V6bcOpBobuh2dk8bVpDl57qADCIsvOf TpkGtDc8tTRu5GoU5anIRnerh8hvmhmAZBa6q4FCWtcu0QC9+bW7zsE+/HYs9aepaWW2Iv +4N999jYlWTdLJBLuXQJ1uTQO28I1JlLHIgWalnJMUssaYr3AwdTcQmwZYNMeiII0vAAuf +NrGLU0jhTGr/a9r6tK3q8FJiNKkjkVOy71DF2UW3DBiMra1N7VnFVZWfYFwyP1Kd/ldTW sfKVQPedSJwVUA1wrlUqT6pMnHDhiQRZpxjE3vE4umdTSQLSoS20xNGPO72Eqg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628035002; a=rsa-sha256; cv=none; b=t9U/CfIi3oNM4CHKL6cqPqL9sDt6BFPeRmp77Xd2FvvSG9Y5xUMW+gC0i4S3xRL1YGNZk1 I4AA4W2Bwtyy5AgCjRNIkHHYG8EN2lBiO8z0asjFtpxtwQzu98UCBG+o1RyMxIlISLP2R7 TGCTrcHfROciPhRwa0xZrqN5rRbvkgx2V4x4vctBXe3OsuLFO6uAATQUQ8uKZvYyDgcr4g KXwlzZpHv1MS8MA3sQl6Ly+hcADzFXuqNR0TUdSj79jnC8khXdfx33AGNnHrKWKvzhyMfa AA5Yj1OJb4SAXvDJ/ycHOVQxVkonKY2dE9JWIjg++GSQ7lraiPmVbcl0Iqv4zA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=eRjiPcbo; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b=TDZfTebU; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=eRjiPcbo; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b=TDZfTebU; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: E3D682ACAE X-Spam-Score: -0.42 X-Migadu-Scanner: scn1.migadu.com X-TUID: fLAfWEe/3Hs7 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. [arguments]: Add a 'fix-configure' phase. --- gnu/packages/networking.scm | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 05fd092b23..2263d26c41 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 @@ -3833,22 +3833,41 @@ some traces for unprivileged users.") license:lgpl2.1+)))) ;for the libsupp subdirectory (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. + `(#:parallel-build? #f ; Build fails if #t. + #:phases + (modify-phases %standard-phases + ;; Although VDE-2 has been updated upstream to use wolfSSL + ;; instead of OpenSSL, the configure script was not updated to + ;; check for wolfSSL instead of OpenSSL. + (add-after 'unpack 'fix-wolfssl-configuration + (lambda _ + (substitute* "configure.ac" + (("crypto") "wolfssl") + (("EVP_EncryptInit") "wc_Chacha_Process"))))))) + (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 @@ -3860,7 +3879,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 -- 2.32.0