summaryrefslogtreecommitdiffstats
path: root/package/wireshark/0002-androiddump-add-missing-sys-time.h-header.patch
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2018-11-04 11:10:25 +0100
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2018-11-07 00:10:29 +0100
commit72bafd5e458e2fe22178ae920e6323e7b8f71411 (patch)
tree6996bccd0228f963a33b27d69af5152387286c94 /package/wireshark/0002-androiddump-add-missing-sys-time.h-header.patch
parenta75ee0e8124023185f4a05e95b2fcd29fa9449d8 (diff)
downloadbuildroot-72bafd5e458e2fe22178ae920e6323e7b8f71411.tar.gz
buildroot-72bafd5e458e2fe22178ae920e6323e7b8f71411.zip
wireshark: bump to version 2.6.4
- Remove first patch (inet_pton test removed since version 2.5.0 and https://github.com/wireshark/wireshark/commit/12d63c428f973b1f7e04ad58d432d778e2035a9a) - Remove second patch (already in version, since https://github.com/wireshark/wireshark/commit/3761ef378537f6a9e0424f7cbded7e7403ba425c) - Remove WIRESHARK_AUTORECONF=yes as configure.ac is not patched anymore - gcrypt is a mandatory dependency since version 2.4.0 and https://github.com/wireshark/wireshark/commit/6b84ddee83e70aff944da084129624226b7a32fa - geoip support has been replaced by maxminddb since version 2.5.0 and https://github.com/wireshark/wireshark/commit/a1da75c554881667dd92e11f098630f2d604872b - Drop includedir "hack", this is not needed anymore and wireshark is now installing files in target. With this hack, build fails on: wireshark: installs files in /home/fabrice/buildroot/output/target//home/fabrice/buildroot/output package/pkg-generic.mk:310: recipe for target '/home/fabrice/buildroot/output/build/wireshark-2.6.4/.stamp_target_installed' failed - Disable all new optional features Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> [Arnout: keep optional dependencies alphabetic on Config.in name; add comment of libgcrypt -> libgpg-error dependency.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Diffstat (limited to 'package/wireshark/0002-androiddump-add-missing-sys-time.h-header.patch')
-rw-r--r--package/wireshark/0002-androiddump-add-missing-sys-time.h-header.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/package/wireshark/0002-androiddump-add-missing-sys-time.h-header.patch b/package/wireshark/0002-androiddump-add-missing-sys-time.h-header.patch
deleted file mode 100644
index ae1198018a..0000000000
--- a/package/wireshark/0002-androiddump-add-missing-sys-time.h-header.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1ab938e762ee6ebd3211c22ef25a7575e37791c4 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Thu, 29 Dec 2016 20:16:53 +0200
-Subject: [PATCH] androiddump: add missing sys/time.h header
-
-struct timeval requires sys/time.h. Fixes the following musl libc build error:
-
-androiddump.c: In function 'useSndTimeout':
-androiddump.c:262:18: error: variable 'socket_timeout' has initializer but incomplete type
- const struct timeval socket_timeout = {
- ^
-
-Change-Id: I52e204f32a012aabea2e54877e564576c072fe08
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: https://code.wireshark.org/review/19460
----
- extcap/androiddump.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/extcap/androiddump.c b/extcap/androiddump.c
-index 8287c4bb1a76..fab7c10e05cc 100644
---- a/extcap/androiddump.c
-+++ b/extcap/androiddump.c
-@@ -30,6 +30,7 @@
- #include <string.h>
- #include <errno.h>
- #include <time.h>
-+#include <sys/time.h>
-
- #ifdef HAVE_NETINET_IN_H
- # include <netinet/in.h>
---
-2.11.0
-
OpenPOWER on IntegriCloud