From e6388b48f3df21b792cd61f93fddc7274238bac6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 13 Jul 2021 18:54:29 -0400 Subject: [PATCH] gnu: VDE 2: Update to 2.3.2-0.8c65ebc. 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.8c65ebc. [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 05fd092b23..f1f84f986b 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,31 @@ (define-public traceroute license:lgpl2.1+)))) ;for the libsupp subdirectory (define-public vde2 + (let ((commit "8c65ebc464b2f986d5f1f4e6ae829ef4480c9d5a") + (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 "0l5xf71sv9zm5zw0wg8xgip58c0wh8zck2bazyc2a8gb67gc3s8y")))) (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 @@ -3860,7 +3869,7 @@ (define-public vde2 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