From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 6O1DGNZK0mUlZwAAe85BDQ:P1 (envelope-from ) for ; Sun, 18 Feb 2024 19:22:14 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 6O1DGNZK0mUlZwAAe85BDQ (envelope-from ) for ; Sun, 18 Feb 2024 19:22:14 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20230811 header.b=mUr1FDJU; 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=araneo.si (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708280534; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=JvgLaKPIW8vAoevIxKgXPAHdRlVKOq0bAzpZJAN1gNk=; b=CEXeLd47jxUT4NRSZi1k/1BZMuCmjGCnwWJOSgrTGegKVakb86NBos7331xAXc4uqvz1Jx jMT9x53yAHRk3J3mL2b0HPfnSTnR9/nzqn2FGJ+4FVUdsDbWU+AkIufus0HcR9/NBfLndR FUciMwhZLM9qCSfr6Vpf8Ze6eoNHUvv0t5oA/I2rlhQfZ+Qfpa52J51sILKkOkWPGIFzYY Bs1jv4KjDaVSXetgECUwhmK99wMJ3B7trWK3Z0cH5XRYqm163eeuvuBsao+n+/wdyhuEIK pDTNcTkDoJLqYZ825w4CK7jy1MBAloLZRRC2uIiN1+XXzaoJHJiY2cw4G9yoxg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20230811 header.b=mUr1FDJU; 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=araneo.si (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708280534; a=rsa-sha256; cv=none; b=ay/ZIzr4gZuADek/e4FAw4T1rlxYbGRhpIXz5x4gIYFxZeq9KU5i606EJ0reJYjZvxxxQ3 bJmN1R11A3337OhtgLHF9u3eEXOHj69G51VfUZgCROV4fM1X+nscT/ZghMURCF6p1oq6hW ACqnPyN1GUEU1hrItzxlq8lEgEk8jPKd3kOz0k+jwiXhMPNXUTjSeP0tqzv99yUgalVqRq n+HXT1GlFlLghqtGDkIDQguLemcsIeatHApEyxkRuxBMF4ivc8U+NdHGD5EmLLeChZNuNA uFvvBtGsiir6Yz07NF7DSj80L/Y5kHj/iEZn9C/ZcjMn/U1bITpVEBVU3+mXbA== 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 0B2F539B22 for ; Sun, 18 Feb 2024 19:22:14 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rblnc-00073P-G6; Sun, 18 Feb 2024 13:22:00 -0500 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 1rblnZ-00070D-QY for guix-patches@gnu.org; Sun, 18 Feb 2024 13:21:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rblnZ-0002OY-IC for guix-patches@gnu.org; Sun, 18 Feb 2024 13:21:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rblnu-00030w-4R for guix-patches@gnu.org; Sun, 18 Feb 2024 13:22:18 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69206] [PATCH] gnu: wireshark: Update to 4.2.3 [security-fixes]. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Feb 2024 18:22:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69206@debbugs.gnu.org Cc: Timotej Lazar X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170828053611564 (code B ref -1); Sun, 18 Feb 2024 18:22:17 +0000 Received: (at submit) by debbugs.gnu.org; 18 Feb 2024 18:22:16 +0000 Received: from localhost ([127.0.0.1]:37037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rblnr-000304-HK for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:22:16 -0500 Received: from lists.gnu.org ([209.51.188.17]:44974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rblN8-0001bb-NW for submit@debbugs.gnu.org; Sun, 18 Feb 2024 12:54:40 -0500 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 1rbjVq-0000LN-6z for guix-patches@gnu.org; Sun, 18 Feb 2024 10:55:30 -0500 Received: from static.51.243.21.65.clients.your-server.de ([65.21.243.51] helo=araneo.si) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rbjVn-0002x2-Cu for guix-patches@gnu.org; Sun, 18 Feb 2024 10:55:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=20230811; bh=FjcoXtY/Tcp vbpb05QD26RKmqVuAxZt8VQUoUx7pJ9U=; h=date:subject:cc:to:from; d=araneo.si; b=mUr1FDJUDAWqU1JiL4tXl26Q11WNiKJPQhPEDJXZVQPg92FuQ1+ZDJi n5Bkx2BGg9QzeWYfgovZrR9EQILmlxT69vhFEg1mvuo2iWdu2FLXFLF0pBI98u5KWoSzSW aPZZu5eAWN3Tz7a6f4aMokR47KPm8ZlmiSIBv/G6txhUnc= Received: by araneo.si (OpenSMTPD) with ESMTPSA id 91c16191 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 18 Feb 2024 15:55:18 +0000 (UTC) From: Timotej Lazar Date: Sun, 18 Feb 2024 16:54:22 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=65.21.243.51; envelope-from=timotej.lazar@araneo.si; helo=araneo.si X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.08 X-Spam-Score: -4.08 X-Migadu-Queue-Id: 0B2F539B22 X-Migadu-Scanner: mx11.migadu.com X-TUID: e5M5ya9ywp3j * gnu/packages/networking.scm (wireshark): Update to 4.2.3. [build-system]: Switch to qt-build-system. [arguments]: Drop unnecessary -DUSE_qt6 from #:configure-flags. Drop test workaround. [inputs]: Add required inputs lua-5.2 and speexdsp. Change-Id: Ib859c0e64377b2920a4eacc2ef4d4393e34426e0 --- gnu/packages/networking.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9b472500bc..ebea7e2200 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -179,6 +179,7 @@ (define-module (gnu packages networking) #:use-module (gnu packages valgrind) #:use-module (gnu packages web) #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (ice-9 match)) @@ -1774,23 +1775,23 @@ (define-public whois (define-public wireshark (package (name "wireshark") - (version "4.0.7") + (version "4.2.3") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "0xw7iagh37y02qgzgmb2xf1qagbphv5lpgra8lq3x0pzrc27p7x7")))) - (build-system cmake-build-system) + (base32 "04aqg5w8yfikqc1446c2zr2h4yyd5napwkhskdvr2galdycxb2wm")))) + (build-system qt-build-system) (arguments (list ;; This causes the plugins to register runpaths for the wireshark ;; libraries, which would otherwise cause the validate-runpath phase to ;; fail. - #:configure-flags #~(list (string-append "-DCMAKE_MODULE_LINKER_FLAGS=" - "-Wl,-rpath=" #$output "/lib") - "-DUSE_qt6=ON") + #:qtbase qtbase + #:configure-flags + #~(list (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath=" #$output "/lib")) #:phases #~(modify-phases %standard-phases (replace 'check @@ -1799,11 +1800,7 @@ (define-public wireshark (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"))))))) + "1")))))))) (inputs (list c-ares glib @@ -1816,7 +1813,7 @@ (define-public wireshark libssh libxml2 lz4 - lua + lua-5.2 mit-krb5 `(,nghttp2 "lib") minizip @@ -1827,6 +1824,7 @@ (define-public wireshark qtsvg sbc snappy + speexdsp zlib `(,zstd "lib"))) (native-inputs @@ -1842,7 +1840,7 @@ (define-public wireshark (description "Wireshark is a network protocol analyzer, or @dfn{packet sniffer}, that lets you capture and interactively browse the contents of network frames.") - (home-page "https://www.wireshark.org/") + (home-page "https://www.wireshark.org") (license license:gpl2+))) (define-public fping base-commit: f8f0a5954ae5e3880000fd870794300438231e55 -- 2.41.0