Commit graph

133 commits

Author SHA1 Message Date
edef
99ece30213 wireshark: include nghttp2 by default
Without nghttp2 included, Wireshark's HTTP/2 dissector is rather neutered,
and the UI gives no indication of why.
2019-05-25 08:13:14 +02:00
Matthieu Coudron
6e21976092 wireshark: cleanup
the call to fixCmakeFiles looks useless and just pollutes git status when developing
on wireshark.
I also removed an old variable that generated a warning.
2019-05-13 10:16:48 +09:00
Daiderd Jordan
a97e16e4ec wireshark: fix Wireshark.app on darwin
Generalize install_name_tool fixup calls for Wireshark.app to avoid breaking
when version numbers change.
2019-04-09 11:09:07 +09:00
Daiderd Jordan
064bcdb22f wireshark: fix darwin build
Fixing the cycle in the cmake files is also needed on darwin.
2019-04-09 11:09:06 +09:00
Matthieu Coudron
5e19cec491 wireshark: 2.6.6 -> 3.0.1
See https://www.wireshark.org/docs/relnotes/wireshark-3.0.0.html.
Drops gtk build.
2019-04-09 11:09:06 +09:00
Jan Malakhovski
56ee5bca69 wireshark: move defaults to package file 2019-02-03 15:30:43 +00:00
R. RyanTM
699b94165b wireshark: 2.6.5 -> 2.6.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireshark-qt/versions
2019-01-16 01:13:00 -08:00
R. RyanTM
3fba6d8175 wireshark: 2.6.4 -> 2.6.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireshark-qt/versions
2018-12-14 07:38:20 -05:00
Michael Bishop
1795ca14c3 wireshark: include headers in wireshark.dev, to support building wireshark plugins 2018-10-27 08:15:31 -03:00
R. RyanTM
77d29e5f06 wireshark: 2.6.3 -> 2.6.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireshark-qt/versions
2018-10-14 09:02:12 +02:00
R. RyanTM
2d04c3f476 wireshark: 2.6.2 -> 2.6.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
wireshark-qt
2018-08-30 09:39:51 -07:00
Matthew Bauer
2d63877fa4 wireshark: fix on darwin
Need CMP0025 to be set. No way to do it from the command
line (overrode by the cmake_minimimum_version policy).

Fixes #44878
2018-08-16 22:44:07 -05:00
Frederik Rietdijk
e97e174726
Merge pull request #43904 from r-ryantm/auto-update/wireshark-gtk
wireshark-gtk: 2.6.1 -> 2.6.2
2018-07-21 19:41:16 +02:00
R. RyanTM
564e733a52 wireshark-gtk: 2.6.1 -> 2.6.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wireshark-gtk/versions.
2018-07-21 09:12:39 -07:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Michael Raskin
5fce881f60 wireshark: 2.4.7 -> 2.6.1 2018-06-19 21:21:19 +02:00
Symphorien Gibol
cb907b5d51 etherape: 0.9.17 -> 0.9.18 2018-06-15 14:18:34 +02:00
symphorien
001a84f22a etherape: 0.9.13 -> 0.9.17 (#41332)
fixes startup
2018-05-31 23:33:48 +02:00
Lancelot SIX
a7e0fb6ffc wireshark: 2.4.6 -> 2.4.7 (#41175)
See https://www.wireshark.org/docs/relnotes/wireshark-2.4.7.html for
release information
2018-05-29 00:21:33 +02:00
Matthieu Coudron
ab613b9336 wireshark: run binary from nix-shell
when in a shell, export variable WIRESHARK_RUN_FROM_BUILD_DIRECTORY to be able to run the newly built wireshark
else one get:
./build/run/wireshark: error while loading shared libraries: libwscodecs.so.0: cannot open shared object file: No such file or directory

see https://github.com/NixOS/nixpkgs/issues/29638
2018-05-09 14:39:08 +09:00
R. RyanTM
b97550f400 wireshark-gtk: 2.4.5 -> 2.4.6
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wireshark-gtk/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/wireshark-gtk -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/wireshark-gtk --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tshark -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tshark --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tfshark -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tfshark --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tfshark help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/rawshark -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/rawshark --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/randpkt -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/randpkt --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/randpkt help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/text2pcap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/text2pcap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/mergecap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/mergecap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/reordercap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/reordercap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/capinfos -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/capinfos --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/capinfos help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/captype -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/captype --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/captype help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/editcap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/editcap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/editcap help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/dumpcap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/dumpcap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.wireshark-gtk-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.wireshark-gtk-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tshark-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tshark-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tfshark-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tfshark-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tfshark-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.rawshark-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.rawshark-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.randpkt-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.randpkt-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.randpkt-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.text2pcap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.text2pcap-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.mergecap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.mergecap-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.reordercap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.reordercap-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.capinfos-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.capinfos-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.capinfos-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.captype-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.captype-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.captype-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.editcap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.editcap-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.editcap-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.dumpcap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.dumpcap-wrapped --help’ got 0 exit code
- found 2.4.6 with grep in /nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6
- directory tree listing: https://gist.github.com/ca5179603a5aebfd1a1ba1b1e3945de9
2018-04-05 19:17:27 -07:00
Franz Pletz
1a0f84d0b8
wireshark: 2.4.4 -> 2.4.5 2018-03-05 18:06:29 +01:00
Väinö Järvelä
023d584433 wireshark: Add Darwin support 2018-03-01 15:31:30 +02:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Will Dietz
3c750912e1 wireshark: fix build w/musl using upstream commit 2018-02-13 09:44:56 -06:00
Will Dietz
fecfd3b7ae wireshark: 2.4.3 -> 2.4.4
https://www.wireshark.org/docs/relnotes/wireshark-2.4.4.html
2018-01-14 15:43:42 -06:00
Andreas Rammhold
969d61dd42
wireshark: en- & disable Gtk/Qt separately
This should also fix the wireshark-cli variant
2018-01-06 06:25:43 +01:00
Andreas Rammhold
c77e0539e0 wireshark-gtk: explicitly disable the Qt build when building Gtk
In a recent Cmake(?) or wireshark release the default behaviour did
change. A failing build log can be seen at hydra [1].

[1] https://hydra.nixos.org/build/67179559/nixlog/1
2018-01-06 05:46:23 +01:00
adisbladis
cd7ce7ca70
wireshark: 2.4.2 -> 2.4.3 2018-01-04 16:34:26 +01:00
Franz Pletz
322fa6b06c
wireshark: 2.4.1 -> 2.4.2 for multiple CVEs
Fixes CVE-2017-15192, CVE-2017-15193, CVE-2017-15191, CVE-2017-15190,
CVE-2017-15189.

See https://www.wireshark.org/docs/relnotes/wireshark-2.4.2.html.
2017-10-24 14:32:33 +02:00
Orivej Desh
fda26c8476 Merge branch 'master' into staging
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
2017-10-02 00:22:12 +00:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Franz Pletz
b29051b2f5
ettercap: fix CVE-2017-8366 & CVE-2017-6430 2017-09-28 16:59:41 +02:00
Tuomas Tynkkynen
4b4bfbf3e5 darwin: Disable another bunch of packages never having built successfully
tecoc: https://hydra.nixos.org/build/61141995
shallot: https://hydra.nixos.org/build/61145497
plink-ng: https://hydra.nixos.org/build/61130149
tshark: https://hydra.nixos.org/build/61479600
2017-09-22 19:49:57 +03:00
John Ericson
ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Bjørn Forsman
f4bac5cdb7 wireshark: 2.4.0 -> 2.4.1
Remove patches that have been merged upstream.
2017-09-11 17:24:33 +02:00
Franz Pletz
95d18f3509
kismet: 2013-03-R1b -> 2016-07-R1 2017-09-05 14:24:59 +02:00
Domen Kožar
486e1c3c16 Merge pull request #27998 from davidak/macOS
replace "Mac OS X" and "OS X" with "macOS"
2017-08-11 13:01:36 +02:00
davidak
3270aa896b replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
Lancelot SIX
90d8608323
wireshark: 2.2.7 -> 2.4.0
Fixes the following CVEs:

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11409
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11406
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11407
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11408
2017-08-01 13:35:10 +02:00
Franz Pletz
1466bdd98f
wireshark: 2.2.6 -> 2.2.7 2017-06-20 03:56:42 +02:00
Robin Gloster
ece9d8867b
wireshark: 2.2.5 -> 2.2.6 2017-05-23 13:26:50 +02:00
Franz Pletz
7b27e1c3c9
wireshark: 2.2.4 -> 2.2.5 for multiple CVEs
Fixes:

  * CVE-2017-5596
  * CVE-2017-5597
  * CVE-2017-6467
  * CVE-2017-6468
  * CVE-2017-6469
  * CVE-2017-6470
  * CVE-2017-6471
  * CVE-2017-6472
  * CVE-2017-6473
  * CVE-2017-6474
2017-03-20 14:43:15 +01:00
Nikolay Amiantov
545e267adf wireshark-gtk: wrap properly 2017-03-16 00:53:42 +03:00
Thomas Tuegel
127bf18a35
extra-cmake-modules: Lift Qt dependency 2017-02-27 11:49:46 -06:00
Michael Raskin
194d137bd3 wireshark: patch for CVE-2017-6041 2017-02-22 14:17:02 +01:00
Parnell Springmeyer
9e36a58649
Merging against upstream master 2017-02-13 17:16:28 -06:00
Peter Hoeg
887590e1d2 wireshark: use cmake and move to gtk3/qt5
wireshark used to use autotools, but instead we now use cmake. The
change alone brought to light a few missing required dependencies.

Additionally, wireshark was using gtk2 and qt4, so that has changed to
gtk3 and qt5.
2017-01-31 21:20:12 +01:00