git.iko.soy/typeable/nixpkgs
on master help sign in
wireshark: 3.4.10 -> 3.6.1

- wmem headers have changed place from epan/ folder to wsutil/ - sharkd protocol has changed too

commit3ad8f02c84ecb48e3376caa999679bff121c1c17 authorMatthieu Coudron <mcoudron@hotmail.com> dateTue 28 Dec 2021, 23:53 (5 years ago) parentbdb0e1f
2 files changed+13−14
compare with master
unifiedsplit
pkgs/applications/networking/sniffers/wireshark/default.nix+5−5 pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch+8−9
pkgs/applications/networking/sniffers/wireshark/default.nix+5−5
@@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
1010with lib;
1111
1212let
13− version = "3.4.10";
13+ version = "3.6.1";
1414 variant = if withQt then "qt" else "cli";
1515
1616in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
2020
2121 src = fetchurl {
2222 url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
23− sha256 = "sha256-iqfvSkSuYruNtGPPdh4swDuXMF4Od+1b5T+oNykYfO8=";
23+ sha256 = "sha256-BDTtqPtr+I4rQqZ+tdHeJUpn1QW+w7tR/unXyteSWjg=";
2424 };
2525
2626 cmakeFlags = [
@@ -67,18 +67,18 @@ in stdenv.mkDerivation {
6767 done
6868 done
6969 '' else optionalString withQt ''
70− install -Dm644 -t $out/share/applications ../wireshark.desktop
70+ install -Dm644 -t $out/share/applications ../org.wireshark.Wireshark.desktop
7171
7272 install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg
73− mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv
73+ mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil/wmem,wiretap} -pv
7474
7575 cp config.h $dev/include/wireshark/
7676 cp ../ws_*.h $dev/include
7777 cp ../epan/*.h $dev/include/epan/
78− cp ../epan/wmem/*.h $dev/include/epan/wmem/
7978 cp ../epan/ftypes/*.h $dev/include/epan/ftypes/
8079 cp ../epan/dfilter/*.h $dev/include/epan/dfilter/
8180 cp ../wsutil/*.h $dev/include/wsutil/
81+ cp ../wsutil/wmem/*.h $dev/include/wsutil/wmem/
8282 cp ../wiretap/*.h $dev/include/wiretap
8383 '');
8484
pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch+8−9
@@ -11,16 +11,18 @@ Also change execv() to execvp() because we've set argv[0] to "dumpcap"
1111and have to enable PATH lookup. Wireshark is not a setuid program, so
1212looking in PATH is not a security issue.
1313
14+EDITED by teto for wireshark 3.6
15+
1416Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de>
1517---
1618 capchild/capture_sync.c | 17 ++++++++++++++---
1719 1 file changed, 14 insertions(+), 3 deletions(-)
1820
1921diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
20−index 970688e..49914d5 100644
21−--- a/capchild/capture_sync.c
22−+++ b/capchild/capture_sync.c
23−@@ -332,7 +332,18 @@ init_pipe_args(int *argc) {
22+index f31914886a..df29b6f0ab 100644
23+--- a/capture/capture_sync.c
24++++ b/capture/capture_sync.c
25+@@ -187,7 +187,18 @@ init_pipe_args(int *argc) {
2426 #ifdef _WIN32
2527 exename = g_strdup_printf("%s\\dumpcap.exe", progfile_dir);
2628 #else
@@ -40,7 +42,7 @@ index 970688e..49914d5 100644
4042 #endif
4143
4244 /* Make that the first argument in the argument list (argv[0]). */
43−@@ -729,7 +740,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi
45+@@ -572,7 +583,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, inf
4446 */
4547 dup2(sync_pipe[PIPE_WRITE], 2);
4648 ws_close(sync_pipe[PIPE_READ]);
@@ -49,7 +51,7 @@ index 970688e..49914d5 100644
4951 g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
5052 argv[0], g_strerror(errno));
5153 sync_pipe_errmsg_to_parent(2, errmsg, "");
52−@@ -997,7 +1008,7 @@ sync_pipe_open_command(char** argv, int *data_read_fd,
54+@@ -811,7 +822,7 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd,
5355 dup2(sync_pipe[PIPE_WRITE], 2);
5456 ws_close(sync_pipe[PIPE_READ]);
5557 ws_close(sync_pipe[PIPE_WRITE]);
@@ -58,6 +60,3 @@ index 970688e..49914d5 100644
5860 g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
5961 argv[0], g_strerror(errno));
6062 sync_pipe_errmsg_to_parent(2, errmsg, "");
61−--
62−2.6.3
63−