TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnu: wireshark: Update to 4.2.3 [security-fixes]. 

* 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
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
This commit is contained in:
Timotej Lazar 2024-02-18 16:54:22 +01:00 committed by Sharlatan Hellseher
parent 313458c58c
commit 04c558dd1b
No known key found for this signature in database
GPG Key ID: 76D727BFF62CD2B5
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/networking.scm
View File

@ -179,6 +179,7 @@
#:use-module (gnu packages valgrind) #:use-module (gnu packages valgrind)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages wxwidgets) #:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
@ -1774,23 +1775,23 @@ of the same name.")
(define-public wireshark (define-public wireshark
(package (package
(name "wireshark") (name "wireshark")
(version "4.0.7") (version "4.2.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.wireshark.org/download/src/wireshark-" (uri (string-append "https://www.wireshark.org/download/src/wireshark-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 "0xw7iagh37y02qgzgmb2xf1qagbphv5lpgra8lq3x0pzrc27p7x7")))) (base32 "04aqg5w8yfikqc1446c2zr2h4yyd5napwkhskdvr2galdycxb2wm"))))
(build-system cmake-build-system) (build-system qt-build-system)
(arguments (arguments
(list (list
;; This causes the plugins to register runpaths for the wireshark ;; This causes the plugins to register runpaths for the wireshark
;; libraries, which would otherwise cause the validate-runpath phase to ;; libraries, which would otherwise cause the validate-runpath phase to
;; fail. ;; fail.
#:configure-flags #~(list (string-append "-DCMAKE_MODULE_LINKER_FLAGS=" #:qtbase qtbase
"-Wl,-rpath=" #$output "/lib") #:configure-flags
"-DUSE_qt6=ON") #~(list (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath=" #$output "/lib"))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'check (replace 'check
@ -1799,11 +1800,7 @@ of the same name.")
(invoke "ctest" "-VV" (invoke "ctest" "-VV"
"-j" (if parallel-tests? "-j" (if parallel-tests?
(number->string (parallel-job-count)) (number->string (parallel-job-count))
"1") "1"))))))))
;; Skip the suite_extcaps.case_extcaps.test_sdjournal
;; test as it requires sdjournal (from systemd) and
;; fails.
"-E" "suite_extcaps")))))))
(inputs (inputs
(list c-ares (list c-ares
glib glib
@ -1816,7 +1813,7 @@ of the same name.")
libssh libssh
libxml2 libxml2
lz4 lz4
lua lua-5.2
mit-krb5 mit-krb5
`(,nghttp2 "lib") `(,nghttp2 "lib")
minizip minizip
@ -1827,6 +1824,7 @@ of the same name.")
qtsvg qtsvg
sbc sbc
snappy snappy
speexdsp
zlib zlib
`(,zstd "lib"))) `(,zstd "lib")))
(native-inputs (native-inputs
@ -1842,7 +1840,7 @@ of the same name.")
(description "Wireshark is a network protocol analyzer, or @dfn{packet (description "Wireshark is a network protocol analyzer, or @dfn{packet
sniffer}, that lets you capture and interactively browse the contents of sniffer}, that lets you capture and interactively browse the contents of
network frames.") network frames.")
(home-page "https://www.wireshark.org/") (home-page "https://www.wireshark.org")
(license license:gpl2+))) (license license:gpl2+)))
(define-public fping (define-public fping