From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id UFajFVoNG2SLIwAASxT56A (envelope-from ) for ; Wed, 22 Mar 2023 15:14:50 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id cC94FVoNG2RmdgEAauVa8A (envelope-from ) for ; Wed, 22 Mar 2023 15:14:50 +0100 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 F20E22AF62 for ; Wed, 22 Mar 2023 15:14:49 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pezEJ-0005JI-Ou; Wed, 22 Mar 2023 10:14:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pezE5-0005F0-PV for guix-patches@gnu.org; Wed, 22 Mar 2023 10:14:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pezE4-0001BR-C1 for guix-patches@gnu.org; Wed, 22 Mar 2023 10:14:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pezE4-00088K-4s for guix-patches@gnu.org; Wed, 22 Mar 2023 10:14:04 -0400 Subject: bug#62235: [PATCH] gnu: wireshark: Update to 4.0.4. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Wed, 22 Mar 2023 14:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 62235 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Goaziou Cc: 62235-done@debbugs.gnu.org Mail-Followup-To: 62235@debbugs.gnu.org, maxim.cournoyer@gmail.com, mail@nicolasgoaziou.fr Received: via spool by 62235-done@debbugs.gnu.org id=D62235.167949441131151 (code D ref 62235); Wed, 22 Mar 2023 14:14:03 +0000 Received: (at 62235-done) by debbugs.gnu.org; 22 Mar 2023 14:13:31 +0000 Received: from localhost ([127.0.0.1]:36243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pezDW-00086N-UE for submit@debbugs.gnu.org; Wed, 22 Mar 2023 10:13:31 -0400 Received: from mail-qv1-f42.google.com ([209.85.219.42]:33628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pezDU-000866-AM for 62235-done@debbugs.gnu.org; Wed, 22 Mar 2023 10:13:28 -0400 Received: by mail-qv1-f42.google.com with SMTP id m6so12244644qvq.0 for <62235-done@debbugs.gnu.org>; Wed, 22 Mar 2023 07:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679494402; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=w3BtUXl0pW/VKg+lfQC0PH+2jGxwj8zmqvEtr45h/2k=; b=Pv0G/jKYrjE5N0fIDsZwg7JP/kF9R0z84+dHV0QA9WXHrs37ix4HMSXakbD3Niy838 7PRhOt4OCerKSuVNPui4UKh8UzpVZLjf1ojsHwjNygZgJnEhqHd8Zz8SO9qj1vcCt6ig 0qHjO6fCqJ9ynGX+LTKUPyNsoZB+AA1A7tzcSZUj+NsROkKUwsNWA2OlZJ3jhqvwWA2O fOIY8/aE5LSq/9XqqjQwzxvlJjplETrpO3Q7vQlvkbWmsyjZlB6PlFuEO6TtCxxxn4ah LVJJoRwvfwUyV3593ZRKNXrnMzQ4WIfiDZCwcggPjjNxda8Z7zfcm8LxxxgvRDIv0v94 A4XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679494402; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=w3BtUXl0pW/VKg+lfQC0PH+2jGxwj8zmqvEtr45h/2k=; b=6G48ywdfnFCPkjfXNPGpdvOGOaNbN5wjMi6YPtJpkGh7Fb+AHEuE7mbR5R1Oh9Lr37 S12s5gTjLNvmymg3bSMZ2bTPDrImOwXbEFRdzb9zoESi/fdEj3xE0khaMybOu2Ni8UFI aiem4XLP9gr6kIDMY8DXWq9zYyZoR7LOf/pin75oCH76OpD68wHaNeQAxW4aWO1KrJt8 ePDqAL/z0+zHv5AwhEvgPBBRjGxZwJnJF/XmUmfNLzYvz/FgOrij0s/f4bWmPkV8RZ1U 54H4bNKQQTVrrb4TFIzFiuN+0c1W5/AF9trNyEGomrtB1GvHEQMIrBT8Wv/uTeb4Cn3w Xd6A== X-Gm-Message-State: AO0yUKUqnryJi69Cfz8eod3q/EMegRsrghWOKo6dSDDvXO/PgyCej9MR 4jLL9ycw59UkhZxbeWzevezjDcdoU2+YLA== X-Google-Smtp-Source: AK7set8KTH+yyR+FyXJrt7MTli4SIdx45bw0nDv38TolSwqXzLunoYGBiqi770nCm3SB6/EyQxCFFg== X-Received: by 2002:a05:6214:2a48:b0:5af:af15:8d44 with SMTP id jf8-20020a0562142a4800b005afaf158d44mr7780607qvb.45.1679494402633; Wed, 22 Mar 2023 07:13:22 -0700 (PDT) Received: from hurd (dsl-10-130-195.b2b2c.ca. [72.10.130.195]) by smtp.gmail.com with ESMTPSA id p11-20020a05620a22ab00b0074357fa9e15sm11381452qkh.42.2023.03.22.07.13.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 07:13:22 -0700 (PDT) From: Maxim Cournoyer References: <20230317092723.249913-1-mail@nicolasgoaziou.fr> Date: Wed, 22 Mar 2023 10:13:20 -0400 In-Reply-To: <20230317092723.249913-1-mail@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Fri, 17 Mar 2023 10:27:23 +0100") Message-ID: <87355wj2m7.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679494490; a=rsa-sha256; cv=none; b=c8gRqlQ8+wn5Hf3RzDxJvT3QYBshskNLFVxyu8lbULELQ34mEY1gkII355pUZpf9vl018y bwvxBmr0NO8cZfaTbLNZZsUUgQGpCsjE+no0C+WA3Pq01Nlb6+6gP06Bjjp4EjDvLLObRb iRGE61PW6hQRsivH/n4LpxdBHSd8Yf0cmZAv2RJznJViqjCwtP5im4NJnF1cFNrdx0lYY3 jwTeJdI38MYkmXrjjdFIRNkncCV41tP0IN6HcBcCnFTbt+m3Lkr+S8pOgce/jTGMqUY+q1 +Wb9h3+uWh9iYb+cKPs3kFUlhX2ta06K7hrXGwblrBcdDIR34xGBVKXFOSQdaQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="Pv0G/jKY"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679494490; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to: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=w3BtUXl0pW/VKg+lfQC0PH+2jGxwj8zmqvEtr45h/2k=; b=e1RRI9gVYiZvDcSwB+4ONdLtba2NX+ri244cA6VbaYseMHPh9b9QppLeiTmmh7P9LkjnsD RAZQNk6FBrq+h/DjR+pY873POU5qsgBAdhi72UPetdQlGsSL4Q1/KJE6l9Q+nmJEBTFphS MmsknslvdhMDNFKymfCxFydBq6qtwXGf+Gwq/FLMK4MgNj4wBuWIF74Y1ovZlZRVilluoL G4tiVRUm8oXZceZqb/kqsVAvt0FEZMQNhDXRqcEepOaSaExcpASpfGTj29d3Odm1U07l+P VxVXzvPC7ZvYiqtByBC0zLLgVor8tOwey7pOU8bIjnDeQuhZnenBSQAPruQaUQ== X-Migadu-Spam-Score: -0.65 X-Spam-Score: -0.65 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="Pv0G/jKY"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-Migadu-Queue-Id: F20E22AF62 X-Migadu-Scanner: scn1.migadu.com X-TUID: XSVvZ6FJRG3z Hi! Nicolas Goaziou writes: > * gnu/packages/networking.scm (wireshark): Update to 4.0.4. > [arguments]<#:phases>: Re-introduce a now succeeding test. Thanks for this. > --- > gnu/packages/networking.scm | 14 ++++---------- > 1 file changed, 4 insertions(+), 10 deletions(-) > > diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm > index 3fac05c411..bec707a390 100644 > --- a/gnu/packages/networking.scm > +++ b/gnu/packages/networking.scm > @@ -1758,29 +1758,23 @@ (define-public whois > (define-public wireshark > (package > (name "wireshark") > - (version "4.0.3") > + (version "4.0.4") > (source > (origin > (method url-fetch) > (uri (string-append "https://www.wireshark.org/download/src/wireshark-" > version ".tar.xz")) > (sha256 > - (base32 "04cmgvmkyvxdpfy08adxf3smklgzakrvyvb89rrr7yqaridy2lbc")))) > + (base32 "0jz76ra86gy7r4wwb174lggnl5y29nn68l7ydw1kj1phcijrz854")))) > (build-system cmake-build-system) > (arguments > `(#:phases > (modify-phases %standard-phases > (replace 'check > (lambda* (#:key tests? #:allow-other-keys) > - ;; Skip test suite failing with "Program reassemble_test is not > - ;; available" and alike errors. Also skip test suite failing > - ;; with "AssertionError: Program extcap/sdjournal is not > - ;; available" error.' > + ;; Skip failing test suite. > (when tests? > - (invoke "ctest" > - "-E" > - (string-join (list "suite_unittests" "suite_extcaps") > - "|")))))) > + (invoke "ctest" "-E" "suite_extcaps"))))) I've modified the change like this, preserving the useful comment (and enabling parallel tests): --8<---------------cut here---------------start------------->8--- modified gnu/packages/networking.scm @@ -1771,10 +1771,16 @@ (define-public wireshark `(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - ;; Skip failing test suite. + (lambda* (#:key parallel-tests? tests? #:allow-other-keys) (when tests? - (invoke "ctest" "-E" "suite_extcaps"))))) + (invoke "ctest" "-VV" + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1") + ;; Skip the suite_extcaps.case_extcaps.test_sdjournal + ;; test as it requires sdjournal (from systemd) and + ;; fails. + "-E" "suite_extcaps"))))) ;; Build process chokes during `validate-runpath' phase. ;; ;; Errors are like the following: --8<---------------cut here---------------end--------------->8--- I've now installed this change, along a few others updating the dependencies to Qt6 and restoring validate-runpath. -- Thanks, Maxim