From 735ab1984b84b5fce9447d4643026981128f8534 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Thu, 27 Oct 2022 21:13:24 +0200 Subject: wireshark: 3.6.5 -> 4.0.1 The release notes for the major update to 4.0.0 are at https://www.wireshark.org/news/20221004.html The release notes for the 4.0.1 release can be found at https://www.wireshark.org/docs/relnotes/wireshark-4.0.1.html --- .../networking/sniffers/wireshark/default.nix | 23 ++++++++-------- .../wireshark-lookup-dumpcap-in-path.patch | 32 ++++++++++++---------- 2 files changed, 30 insertions(+), 25 deletions(-) (limited to 'pkgs/applications/networking/sniffers') diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 2f41d0ec55ff..08f9bc0b8af2 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares -, gnutls, libgcrypt, libgpg-error, geoip, openssl, lua5, python3, libcap, glib -, libssh, nghttp2, zlib, cmake, makeWrapper, wrapGAppsHook +{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre2, perl, flex, bison +, gettext, libpcap, libnl, c-ares, gnutls, libgcrypt, libgpg-error, geoip, openssl +, lua5, python3, libcap, glib, libssh, nghttp2, zlib, cmake, makeWrapper, wrapGAppsHook , withQt ? true, qt5 ? null , ApplicationServices, SystemConfiguration, gmp , asciidoctor @@ -11,7 +11,7 @@ assert withQt -> qt5 != null; with lib; let - version = "3.6.5"; + version = "4.0.1"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-otdB1g/zUWE31LnzjNwH7uVKVuw2BG9MOv7mv7T26qE="; + sha256 = "sha256-s7AC+Z0Tu/R/ntO+frNyywwkVL0PrqKadWgZzgGf/cI="; }; cmakeFlags = [ @@ -44,7 +44,7 @@ in stdenv.mkDerivation { depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ - gettext pcre libpcap lua5 libssh nghttp2 openssl libgcrypt + gettext pcre2 libpcap lua5 libssh nghttp2 openssl libgcrypt libgpg-error gnutls geoip c-ares glib zlib ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ optionals stdenv.isLinux [ libcap libnl ] @@ -73,19 +73,20 @@ in stdenv.mkDerivation { done done '' else optionalString withQt '' - install -Dm644 -t $out/share/applications ../org.wireshark.Wireshark.desktop + pwd + install -Dm644 -t $out/share/applications ../resources/freedesktop/org.wireshark.Wireshark.desktop - install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg - mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil/wmem,wiretap} -pv + install -Dm644 ../resources/icons/wsicon.svg $out/share/icons/wireshark.svg + mkdir -pv $dev/include/{epan/{wmem,ftypes,dfilter},wsutil/wmem,wiretap} cp config.h $dev/include/wireshark/ - cp ../ws_*.h $dev/include cp ../epan/*.h $dev/include/epan/ cp ../epan/ftypes/*.h $dev/include/epan/ftypes/ cp ../epan/dfilter/*.h $dev/include/epan/dfilter/ + cp ../include/ws_*.h $dev/include/ + cp ../wiretap/*.h $dev/include/wiretap/ cp ../wsutil/*.h $dev/include/wsutil/ cp ../wsutil/wmem/*.h $dev/include/wsutil/wmem/ - cp ../wiretap/*.h $dev/include/wiretap ''); dontFixCmake = true; diff --git a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch index 5829457375f2..0e523db0a32a 100644 --- a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch +++ b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch @@ -1,6 +1,6 @@ -From 5bef9deeff8a2e4401de0f45c9701cd6f98f29d8 Mon Sep 17 00:00:00 2001 +From 2f0cbc740a0fe050f4de082620296c5eea18eba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= -Date: Thu, 26 Nov 2015 21:03:35 +0100 +Date: Thu, 27 Oct 2022 20:56:07 +0200 Subject: [PATCH] Lookup dumpcap in PATH NixOS patch: Look for dumpcap in PATH first, because there may be a @@ -11,22 +11,26 @@ Also change execv() to execvp() because we've set argv[0] to "dumpcap" and have to enable PATH lookup. Wireshark is not a setuid program, so looking in PATH is not a security issue. +ORIGINALLY by Björn Forsman + EDITED by teto for wireshark 3.6 +EDITED by esclear for wireshark 4.0 + Signed-off-by: Franz Pletz --- - capchild/capture_sync.c | 17 ++++++++++++++--- + capture/capture_sync.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) -diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c -index f31914886a..df29b6f0ab 100644 +diff --git a/capture/capture_sync.c b/capture/capture_sync.c +index fc5552f02c..a556f109af 100644 --- a/capture/capture_sync.c +++ b/capture/capture_sync.c -@@ -187,7 +187,18 @@ init_pipe_args(int *argc) { +@@ -239,7 +239,18 @@ init_pipe_args(int *argc) { #ifdef _WIN32 - exename = g_strdup_printf("%s\\dumpcap.exe", progfile_dir); + exename = ws_strdup_printf("%s\\dumpcap.exe", progfile_dir); #else -- exename = g_strdup_printf("%s/dumpcap", progfile_dir); +- exename = ws_strdup_printf("%s/dumpcap", progfile_dir); + /* + * NixOS patch: Look for dumpcap in PATH first, because there may be a + * dumpcap wrapper that we want to use instead of the default @@ -34,29 +38,29 @@ index f31914886a..df29b6f0ab 100644 + */ + if (system("command -v dumpcap >/dev/null") == 0) { + /* Found working dumpcap */ -+ exename = g_strdup_printf("dumpcap"); ++ exename = ws_strdup_printf("dumpcap"); + } else { + /* take Wireshark's absolute program path and replace "Wireshark" with "dumpcap" */ -+ exename = g_strdup_printf("%s/dumpcap", progfile_dir); ++ exename = ws_strdup_printf("%s/dumpcap", progfile_dir); + } #endif /* Make that the first argument in the argument list (argv[0]). */ -@@ -572,7 +583,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, inf +@@ -690,7 +701,7 @@ sync_pipe_start(capture_options *capture_opts, GPtrArray *capture_comments, */ dup2(sync_pipe[PIPE_WRITE], 2); ws_close(sync_pipe[PIPE_READ]); - execv(argv[0], argv); + execvp(argv[0], argv); - g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", + snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", argv[0], g_strerror(errno)); sync_pipe_errmsg_to_parent(2, errmsg, ""); -@@ -811,7 +822,7 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, +@@ -946,7 +957,7 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, dup2(sync_pipe[PIPE_WRITE], 2); ws_close(sync_pipe[PIPE_READ]); ws_close(sync_pipe[PIPE_WRITE]); - execv(argv[0], argv); + execvp(argv[0], argv); - g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", + snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", argv[0], g_strerror(errno)); sync_pipe_errmsg_to_parent(2, errmsg, ""); -- cgit 1.4.1