Received: (at 62235-done) by debbugs.gnu.org; 22 Mar 2023 14:13:31 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 22 10:13:31 2023
Received: from localhost ([127.0.0.1]:36243 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pezDW-00086N-UE
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1pezDU-000866-AM
for 62235-done <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: Nicolas Goaziou <mail@HIDDEN>
Subject: Re: bug#62235: [PATCH] gnu: wireshark: Update to 4.0.4.
References: <20230317092723.249913-1-mail@HIDDEN>
Date: Wed, 22 Mar 2023 10:13:20 -0400
In-Reply-To: <20230317092723.249913-1-mail@HIDDEN> (Nicolas
Goaziou's message of "Fri, 17 Mar 2023 10:27:23 +0100")
Message-ID: <87355wj2m7.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 62235-done
Cc: 62235-done <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi!
Nicolas Goaziou <mail@HIDDEN> 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
Nicolas Goaziou <mail@HIDDEN>:Maxim Cournoyer <maxim.cournoyer@HIDDEN>:
Received: (at submit) by debbugs.gnu.org; 17 Mar 2023 09:27:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Mar 17 05:27:38 2023
Received: from localhost ([127.0.0.1]:43659 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pd6N7-0000rm-Qf
for submit <at> debbugs.gnu.org; Fri, 17 Mar 2023 05:27:38 -0400
Received: from lists.gnu.org ([209.51.188.17]:42716)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <mail@HIDDEN>) id 1pd6N5-0000re-Rv
for submit <at> debbugs.gnu.org; Fri, 17 Mar 2023 05:27:36 -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 <mail@HIDDEN>)
id 1pd6N5-00081c-FE
for guix-patches@HIDDEN; Fri, 17 Mar 2023 05:27:35 -0400
Received: from relay8-d.mail.gandi.net ([2001:4b98:dc4:8::228])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <mail@HIDDEN>)
id 1pd6N2-0004NN-T8
for guix-patches@HIDDEN; Fri, 17 Mar 2023 05:27:34 -0400
Received: (Authenticated sender: admin@HIDDEN)
by mail.gandi.net (Postfix) with ESMTPSA id C06AE1BF210
for <guix-patches@HIDDEN>; Fri, 17 Mar 2023 09:27:29 +0000 (UTC)
From: Nicolas Goaziou <mail@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: wireshark: Update to 4.0.4.
Date: Fri, 17 Mar 2023 10:27:23 +0100
Message-Id: <20230317092723.249913-1-mail@HIDDEN>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2001:4b98:dc4:8::228;
envelope-from=mail@HIDDEN; helo=relay8-d.mail.gandi.net
X-Spam_score_int: -25
X-Spam_score: -2.6
X-Spam_bar: --
X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.6 (-)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.6 (--)
* gnu/packages/networking.scm (wireshark): Update to 4.0.4.
[arguments]<#:phases>: Re-introduce a now succeeding test.
---
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")))))
;; Build process chokes during `validate-runpath' phase.
;;
;; Errors are like the following:
base-commit: 3893758dac76fc30b23d4715e849e262306f268d
--
2.39.2
Nicolas Goaziou <mail@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#62235; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.