Commit graph

106 commits

Author SHA1 Message Date
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
Parnell Springmeyer 6777e6f812
Merging with upstream 2017-01-29 05:54:01 -06:00
Parnell Springmeyer 2f113ee90a
setcap-wrapper: Minor refactor 2017-01-29 01:08:36 -06:00
Lancelot SIX c99540d526
wireshark: 2.2.3 -> 2.2.4
This release fixes those security related issues:
- https://www.wireshark.org/security/wnpa-sec-2017-01.html
- https://www.wireshark.org/security/wnpa-sec-2017-02.html
2017-01-26 11:30:48 +01:00
Parnell Springmeyer bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts 2017-01-25 11:08:05 -08:00
mimadrid 280d0cf20f
wireshark: 2.2.2 -> 2.2.3 2016-12-17 12:59:56 +01:00
Vladimír Čunát baa73cd6e0
Merge #20506: wireshark: add darwin support 2016-11-21 18:05:11 +01:00
Lancelot SIX e9549d293c
wireshark: 2.2.0 -> 2.2.2
See releases announcements:

- https://www.wireshark.org/docs/relnotes/wireshark-2.2.1.html
- https://www.wireshark.org/docs/relnotes/wireshark-2.2.2.html

wireshark-2.2.1 fixes the following vulnerabilities:

- CVE-2016-7957
- CVE-2016-7958

wireshard-2.2.2 fixes the following vulnerabilities:

- CVE-2016-9372
- CVE-2016-9374
- CVE-2016-9376
- CVE-2016-9373
- CVE-2016-9375
2016-11-21 14:30:17 +01:00
Matthew Bauer fe91dd36d0
wireshark: add darwin support 2016-11-17 15:10:22 -06:00
Kirill Boltaev 0f37287df5 treewide: explicitly specify gtk version 2016-09-13 21:09:24 +03:00
Kirill Boltaev bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Lancelot SIX 33300d380b wireshark: 2.0.5 -> 2.2.0
Release note:
https://www.wireshark.org/docs/relnotes/wireshark-2.2.0.html

Security related annonces related to 2.0.5 (subject to denial of
service attack):

https://www.wireshark.org/security/wnpa-sec-2016-50.html
https://www.wireshark.org/security/wnpa-sec-2016-51.html
https://www.wireshark.org/security/wnpa-sec-2016-52.html
https://www.wireshark.org/security/wnpa-sec-2016-53.html
https://www.wireshark.org/security/wnpa-sec-2016-54.html
https://www.wireshark.org/security/wnpa-sec-2016-55.html
2016-09-08 16:26:51 +02:00
Parnell Springmeyer 98c058a1ee Adapting everything for the merged permissions wrappers work. 2016-09-01 19:21:06 -05:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
mimadrid 5fbe282abd
wireshark: 2.0.4 -> 2.0.5 2016-07-29 12:11:09 +02:00
Franz Pletz a950c154c1 wireshark: 2.0.3 -> 2.0.4 (security)
Fixes a few security problems:
  https://www.wireshark.org/docs/relnotes/wireshark-2.0.4.html
2016-07-10 10:46:22 +02:00
Bjørn Forsman d809ef47cb wireshark: 2.0.2 -> 2.0.3 2016-05-22 20:04:44 +02:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Nikolay Amiantov 04c67c316c ettercap: fix gdkconfig path 2016-04-14 14:46:23 +03:00
Nikolay Amiantov 755e4633c7 mass-replace glib and gtk lib/*/include paths 2016-04-14 04:13:54 +03:00
Graham Christensen ca6108a2a1 wireshark: 2.0.0 -> 2.0.2 for: CVE-2016-2521 CVE-2016-2522 CVE-2016-2523 CVE-2016-2524 CVE-2016-2525 CVE-2016-2526 CVE-2016-2527 CVE-2016-2528 CVE-2016-2529 CVE-2016-2531 CVE-2016-2532 2016-03-04 13:31:31 -06:00
Reno Reckling 28fd7afd02 wireshark-qt: make wireshark-qt build and run again 2015-12-31 13:56:50 +01:00
Franz Pletz bfb399e3c4 wireshark: 1.12.7 -> 2.0.0
Updates wireshark to the next major stable version. Also updated and tested
the patch to search for dumpcap in PATH by @bjornfor.
2015-11-27 05:17:26 +01:00
michael bishop e72bcc348c future proof the wireshark source path 2015-11-15 16:38:58 -04:00
Bjørn Forsman b95bec7917 wireshark: 1.12.5 -> 1.12.7
Build and run tested.
2015-09-16 19:00:34 +02:00
Pascal Wittmann c0a5ffc438 wireshark: update from 1.12.4 to 1.12.5, fixes CVE-2015-3808 2015-05-29 22:17:03 +02:00
Bjørn Forsman 890534bedc wireshark: update from 1.12.3 to 1.12.4
Potentially fixes CVE-2015-2188, CVE-2015-2189, CVE-2015-2191
2015-04-11 13:48:09 +02:00
Bjørn Forsman 478969d50c wireshark: change dependency heimdal -> openssl
This fixes wirehsark build, which has been broken since commit
942e179974 (heimdal: Correct the openssl dependency).
2015-04-11 13:23:35 +02:00