From 5654a24057659554eb6518c7d2df4c94c9d0ddca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Sep 2021 23:08:12 +0200 Subject: gnu: batctl: Update to 2021.3. * gnu/packages/networking.scm (batctl): Update to 2021.3. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 3657d69511..3655a3dac7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3650,14 +3650,14 @@ written (and providing API) in C. Current implementation covers YANG 1.0 (RFC (define-public batctl (package (name "batctl") - (version "2020.4") + (version "2021.3") (source (origin (method url-fetch) (uri (string-append "https://downloads.open-mesh.org/batman/releases/batman-adv-" version "/batctl-" version ".tar.gz")) (sha256 - (base32 "05rrpfbpdhxn5zgdps849qls2ifis6a94cjryb60d4y1nc2n0d7w")))) + (base32 "087w8xxxpqxs5cz4aj4l9wzbh0ga8163nh7qy44ld2lgqbplnbzj")))) (inputs `(("libnl" ,libnl))) (native-inputs -- cgit 1.4.1 From a5b2474037d749f42a816c60f0393941ba97444e Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 15 Jun 2021 16:31:41 +0000 Subject: gnu: Consolidate duplicate copyright names. * gnu/packages/android.scm: Consolidate copyright lines with the same email address. * gnu/packages/code.scm: Likewise. * gnu/packages/cpp.scm: Likewise. * gnu/packages/databases.scm: Likewise. * gnu/packages/emacs-xyz.scm: Likewise. * gnu/packages/file.scm: Likewise. * gnu/packages/freedesktop.scm: Likewise. * gnu/packages/gl.scm: Likewise. * gnu/packages/gps.scm: Likewise. * gnu/packages/linux.scm: Likewise. * gnu/packages/networking.scm: Likewise. * gnu/packages/python-xyz.scm: Likewise. * gnu/packages/python.scm: Likewise. * gnu/packages/video.scm: Likewise. * gnu/packages/xdisorg.scm: Likewise. * gnu/services/web.scm: Likewise. Signed-off-by: Liliana Marie Prikler --- gnu/packages/android.scm | 3 +-- gnu/packages/code.scm | 3 +-- gnu/packages/cpp.scm | 3 +-- gnu/packages/databases.scm | 3 +-- gnu/packages/emacs-xyz.scm | 1 - gnu/packages/file.scm | 3 +-- gnu/packages/freedesktop.scm | 3 +-- gnu/packages/gl.scm | 1 - gnu/packages/gps.scm | 1 - gnu/packages/linux.scm | 3 +-- gnu/packages/networking.scm | 3 +-- gnu/packages/python-xyz.scm | 4 +--- gnu/packages/python.scm | 2 -- gnu/packages/video.scm | 3 +-- gnu/packages/xdisorg.scm | 1 - gnu/services/web.scm | 3 +-- 16 files changed, 11 insertions(+), 29 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 99c283dfaf..0a551c7d30 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -4,12 +4,11 @@ ;;; Copyright © 2016, 2020 Marius Bakke ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2017 Hartmut Goebel -;;; Copyright © 2017 Maxim Cournoyer +;;; Copyright © 2017, 2020 Maxim Cournoyer ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019, 2020 Andreas Enge ;;; Copyright © 2019 Ricardo Wurmus -;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Sergey Trofimov ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 04b354b71e..7551b31e85 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015, 2018, 2020, 2021 Ludovic Courtès -;;; Copyright © 2015 Andreas Enge +;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -9,7 +9,6 @@ ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2014 Eric Bavier -;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Maxim Cournoyer diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index f4708eda91..4af71ba93a 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Jan Wielkiewicz -;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020, 2021 Nicolò Balzarotti ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Brice Waegeneire @@ -18,7 +18,6 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Milkey Mouse ;;; Copyright © 2021 Raghav Gururajan -;;; Copyright © 2021 Nicolò Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a27fd637eb..b519aa91fb 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2017, 2018 Alex Vong ;;; Copyright © 2017, 2018 Ben Woodcroft ;;; Copyright © 2017 Rutger Helling -;;; Copyright © 2017, 2018 Pierre Langlois +;;; Copyright © 2017, 2018, 2019 Pierre Langlois ;;; Copyright © 2015, 2017, 2018, 2019, 2021 Ricardo Wurmus ;;; Copyright © 2017 Kristofer Buffington ;;; Copyright © 2018 Amirouche Boubekki @@ -36,7 +36,6 @@ ;;; Copyright © 2019 Jack Hill ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Gábor Boskovits -;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019, 2021 Guillaume Le Vaillant ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020, 2021 Nicolò Balzarotti diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 05d10bc4ae..2754ce7049 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -74,7 +74,6 @@ ;;; Copyright © 2020 Ryan Desfosses ;;; Copyright © 2020 Marcin Karpezo ;;; Copyright © 2020 Fredrik Salomonsson -;;; Copyright © 2020 Ryan Desfosses ;;; Copyright © 2020 Eric Bavier ;;; Copyright © 2020, 2021 Morgan Smith ;;; Copyright © 2020 Peng Mei Yu diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm index 3f1145b520..f811ba77c7 100644 --- a/gnu/packages/file.scm +++ b/gnu/packages/file.scm @@ -1,9 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index bc47ddb0d1..514125977b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2017, 2018 Mark H Weaver ;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2017, 2020 Brendan Tildesley +;;; Copyright © 2017, 2020, 2021 Brendan Tildesley ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Stefan Stefanović @@ -22,7 +22,6 @@ ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Anders Thuné ;;; Copyright © 2020 Raghav Gururajan -;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 pineapples ;;; Copyright © 2021 Robby Zambito ;;; diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f6b9232e0a..a417e363bb 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -5,7 +5,6 @@ ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver ;;; Copyright © 2016 Nikita ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus -;;; Copyright © 2016 David Thompson ;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2018, 2019 Rutger Helling diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 7a5b1eb118..03bff15760 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -7,7 +7,6 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 Björn Höfling -;;; Copyright © 2021 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 63141da3ab..2836a01d49 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -30,12 +30,11 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018, 2020 Brendan Tildesley ;;; Copyright © 2018 Manuel Graf -;;; Copyright © 2018 Pierre Langlois +;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2018 Vasile Dumitrascu ;;; Copyright © 2019 Tim Gesthuizen ;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2019 Stefan Stefanović -;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019, 2020, 2021 Brice Waegeneire ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2020, 2021 Oleg Pykhalov diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 3655a3dac7..c6788e8d86 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2018 Adam Van Ymeren ;;; Copyright © 2018 Fis Trivial -;;; Copyright © 2018 Tonton +;;; Copyright © 2018, 2019 Tonton ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Theodoros Foradis ;;; Copyright © 2018, 2020, 2021 Marius Bakke @@ -31,7 +31,6 @@ ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Timotej Lazar ;;; Copyright © 2019, 2020, 2021 Brice Waegeneire -;;; Copyright © 2019 Tonton ;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2019, 2020 Jan Wielkiewicz ;;; Copyright © 2019 Daniel Schaefer diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d9d1c8eb35..20502ac255 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -42,7 +42,6 @@ ;;; Copyright © 2017, 2020, 2021 Roel Janssen ;;; Copyright © 2017, 2018, 2019 Kei Kebreau ;;; Copyright © 2017 Rutger Helling -;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017, 2019, 2021 Brendan Tildesley ;;; Copyright © 2018 Ethan R. Jones @@ -72,9 +71,8 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 sirgazil ;;; Copyright © 2020 Sebastian Schott -;;; Copyright © 2020 Alexandros Theodotou -;;; Copyright © 2020 Josh Marshall ;;; Copyright © 2020, 2021 Alexandros Theodotou +;;; Copyright © 2020 Josh Marshall ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Matthew James Kraai diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3bb57ee2bd..6fa0987d24 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -28,7 +28,6 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör -;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017 Alex Vong ;;; Copyright © 2016, 2017, 2018 Arun Isaac ;;; Copyright © 2016, 2017, 2018 Julien Lepiller @@ -43,7 +42,6 @@ ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2017, 2018 Kei Kebreau ;;; Copyright © 2017 Rutger Helling -;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Ethan R. Jones diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c0be286cec..b6acebcecc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4,13 +4,12 @@ ;;; Copyright © 2014, 2015, 2016, 2018, 2020 Mark H Weaver ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner -;;; Copyright © 2015 Andy Patterson +;;; Copyright © 2015, 2016 Andy Patterson ;;; Copyright © 2015, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Alex Vong ;;; Copyright © 2016, 2017 Alex Griffin ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016 Dmitry Nikolaev -;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2018, 2019, 2020, 2021 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index eb3f30eca7..2e4eb30a9c 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -13,7 +13,6 @@ ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Leo Famulari -;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016, 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2016 Petter ;;; Copyright © 2017 Mekeor Melire diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 6a093cf4e4..bb42eacf83 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -3,11 +3,10 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2016 Nikita ;;; Copyright © 2016, 2017, 2018 Julien Lepiller -;;; Copyright © 2017 Christopher Baines +;;; Copyright © 2017, 2018, 2019 Christopher Baines ;;; Copyright © 2017 nee ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2018 Pierre-Antoine Rouby -;;; Copyright © 2017, 2018, 2019 Christopher Baines ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2019, 2020 Florian Pelz ;;; Copyright © 2020 Ricardo Wurmus -- cgit 1.4.1 From 73c6459d214b10419fc2dec4b661703cf870cf34 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 4 Oct 2021 03:14:05 +0200 Subject: gnu: ndisc6: Update to 1.0.5. * gnu/packages/networking.scm (ndisc6): Update to 1.0.5. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c6788e8d86..228f303271 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -829,14 +829,14 @@ residing in IPv4-only networks, even when they are behind a NAT device.") (define-public ndisc6 (package (name "ndisc6") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append "https://www.remlab.net/files/ndisc6/ndisc6-" version ".tar.bz2")) (sha256 (base32 - "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb")))) + "0lgkbnnll8nrr7h63ywd42sg8fiv6jhhymd7rnml8a3yqjgjz4rn")))) (build-system gnu-build-system) (home-page "https://www.remlab.net/ndisc6/") (synopsis "IPv6 diagnostic tools") -- cgit 1.4.1 From fa6bcae4c48b6838c960b164b80d9f68a754f855 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 4 Oct 2021 03:26:55 +0200 Subject: gnu: squid: Update to 4.16. * gnu/packages/networking.scm (squid): Update to 4.16. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/networking.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 228f303271..45e48e0c1a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1745,14 +1745,14 @@ TCP connection, TLS handshake and so on) in the terminal.") (define-public squid (package (name "squid") - (version "4.15") + (version "4.16") (source (origin (method url-fetch) (uri (string-append "http://www.squid-cache.org/Versions/v4/squid-" version ".tar.xz")) (sha256 - (base32 "09aaz0hi7q4s5jalgl5i5fakmgzv5akf03gnajlah498mgjs94xn")))) + (base32 "0qxswdv90lmbxpb47hnqhjv32q0c8j7qkja6wpd0473wfn8yh03y")))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -1766,8 +1766,7 @@ TCP connection, TLS handshake and so on) in the terminal.") (substitute* "test-suite/testheaders.sh" (("/bin/true") (string-append (assoc-ref inputs "coreutils") - "/bin/true"))) - #t))))) + "/bin/true")))))))) (inputs `(("perl" ,perl) ("openldap" ,openldap) -- cgit 1.4.1 From 0a6f874b8388597d4f260c0abce8be420517d2f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Oct 2021 23:58:53 +0200 Subject: gnu: Open vSwitch: Update to 2.16.0. * gnu/packages/networking.scm (openvswitch): Update to 2.16.0. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 45e48e0c1a..83e54becc8 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2497,7 +2497,7 @@ procedure calls (RPCs).") (define-public openvswitch (package (name "openvswitch") - (version "2.13.3") + (version "2.16.0") (source (origin (method url-fetch) (uri (string-append @@ -2505,7 +2505,7 @@ procedure calls (RPCs).") version ".tar.gz")) (sha256 (base32 - "1wc5zspy9aln7di7m9a1qy4lv3h05gmhgd1nffhb9nxdcxqgnpgp")))) + "0sldyib85v5lh3qp9af0jgvf304pwdmjd0y7rknfwliykgjvgqsm")))) (build-system gnu-build-system) (arguments '(;; FIXME: many tests fail with: -- cgit 1.4.1 From 772c0fbc55156f09eb15ef66267dc943dc458295 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 5 Oct 2021 12:30:01 +0200 Subject: gnu: Open vSwitch: Enable tests. * gnu/packages/networking.scm (openvswitch)[arguments]: Remove #:tests?. Add two new phases to patch /bin/sh, and create a 'kill -0' script that handles zombies. [native-inputs]: Add BASH and PROCPS. [inputs]: Add BASH-MINIMAL. --- gnu/packages/networking.scm | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 83e54becc8..7e5636f560 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -82,6 +82,7 @@ #:use-module (gnu packages autogen) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) @@ -2508,18 +2509,42 @@ procedure calls (RPCs).") "0sldyib85v5lh3qp9af0jgvf304pwdmjd0y7rknfwliykgjvgqsm")))) (build-system gnu-build-system) (arguments - '(;; FIXME: many tests fail with: - ;; […] - ;; test -e $OVS_RUNDIR/ovs-vswitchd.pid - ;; ovs-appctl -t ovs-vswitchd exit - ;; hard failure - #:tests? #f - #:configure-flags + '(#:configure-flags '("--enable-shared" "--localstatedir=/var" "--with-dbdir=/var/lib/openvswitch") #:phases (modify-phases %standard-phases + (add-after 'unpack 'use-absolute-/bin/sh + (lambda* (#:key inputs #:allow-other-keys) + (let* ((bash (assoc-ref inputs "bash-minimal"))) + (substitute* "ovsdb/ovsdb-server.c" + (("/bin/sh") (string-append bash "/bin/sh")))))) + (add-before 'check 'adjust-tests + (lambda* (#:key inputs #:allow-other-keys) + (let* ((bash (assoc-ref inputs "bash-minimal")) + (/bin/sh (string-append bash "/bin/sh"))) + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (substitute* (find-files "tests" ".*(run|testsuite)$") + (("#! /bin/sh") + (string-append "#! " /bin/sh)) + + ;; The tests use 'kill -0' to check whether a test has + ;; completed, but it does not work in the build container + ;; because zombies are not reaped automatically (PID 1 is + ;; the builder script). Change to something that handles + ;; undead processes. + (("kill -0") + "kill-0"))) + (mkdir "/tmp/bin") + (call-with-output-file "/tmp/bin/kill-0" + (lambda (port) + (format port "#!~a +ps --no-header -p $1 -o state= | grep -qv '^Z$'" + /bin/sh))) + (chmod "/tmp/bin/kill-0" #o755) + (setenv "PATH" + (string-append "/tmp/bin:" (getenv "PATH")))))) (replace 'install (lambda _ (invoke "make" @@ -2534,9 +2559,12 @@ procedure calls (RPCs).") ("pkg-config" ,pkg-config) ("python" ,python-wrapper) ;; for testing + ("bash" ,bash) ;for 'compgen' + ("procps" ,procps) ("util-linux" ,util-linux))) (inputs - `(("libcap-ng" ,libcap-ng) + `(("bash-minimal" ,bash-minimal) + ("libcap-ng" ,libcap-ng) ("openssl" ,openssl))) (synopsis "Virtual network switch") (home-page "https://www.openvswitch.org/") -- cgit 1.4.1 From e75fcb1ebb50aae24e609f4ec9a6e6d0500392e5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 7 Oct 2021 08:54:39 +0200 Subject: gnu: wireshark: Update to 3.4.9. * gnu/packages/networking.scm (wireshark): Update to 3.4.9. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7e5636f560..a0c526a83b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1470,14 +1470,14 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "3.4.8") + (version "3.4.9") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "09fpvfj4m7glisj6p4zb8wylkrjkqqw69xnwnz4ah410zs6zm9sq")))) + (base32 "084nv4fbgpxsf6b6cfi6cinn8l3wsbn0g8lsd7p2aifjkf15wln6")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit 1.4.1