... otherwise we would end up forcefully enabling the linguist tool even
when wireshark would not be enabled.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Commit fa6feff (wireshark: needs the qt5tools lrelease utility)
introduced a circular dependency chain in Kconfig:
package/qt5/qt5base/Config.in:118:error: recursive dependency detected!
package/qt5/qt5base/Config.in:118: symbol BR2_PACKAGE_QT5BASE_GUI is selected by BR2_PACKAGE_QT5TOOLS_PIXELTOOL
package/qt5/qt5tools/Config.in:19: symbol BR2_PACKAGE_QT5TOOLS_PIXELTOOL depends on BR2_PACKAGE_QT5TOOLS
package/qt5/qt5tools/Config.in:1: symbol BR2_PACKAGE_QT5TOOLS is selected by BR2_PACKAGE_QT5BASE_WIDGETS
package/qt5/qt5base/Config.in:131: symbol BR2_PACKAGE_QT5BASE_WIDGETS is selected by BR2_PACKAGE_QT5X11EXTRAS
package/qt5/qt5x11extras/Config.in:1: symbol BR2_PACKAGE_QT5X11EXTRAS depends on BR2_PACKAGE_QT5BASE_XCB
package/qt5/qt5base/Config.in:186: symbol BR2_PACKAGE_QT5BASE_XCB depends on BR2_PACKAGE_QT5BASE_GUI
Fix that by dropping the select on the Qt5Tools, and introduce an
intermediate kconfig-level variable to represent the new condition, to
simplify the .mk file.
That would make the condition for enabling/disabling the GUI to be a
little bit more complex by adding yet another (long-ish) variable.
So we also introduce an intermediate kconfig-level variable that
represent the condition to enable the GUI.
Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Baruch Siach <baruch@tkos.co.il>
Tested-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Some distros provide a 'qtchooser' utility to select Qt library
version. Make sure not to use that host provided utility.
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fixes:
wnpa-sec-2016-56 - The Bluetooth L2CAP dissector could crash.
wnpa-sec-2016-57 - The NCP dissector could crash.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Adapt current patch for 2.2.0.
- Adapt gtk configure options for 2.2.0:
- Instead of --enable-gtk3 or --enable-gtk2, now it uses
--enable-gtk=[no/2/3/yes].
- Remove non-existing configure options:
- --enable-usr-local: removed by
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=125989780ba8e658ad0d1f1c71ec01e6d36a2266
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Remove html and txt documentation from the rootfs as they unlikely to be
needed.
[Peter: use xargs instead of GNU extensions as suggested by Yann]
Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fixes:
WNPA-SEC-2016-29 - The SPOOLS dissector could go into an infinite loop.
WNPA-SEC-2016-30 - The IEEE 802.11 dissector could crash.
WNPA-SEC-2016-31 - The IEEE 802.11 dissector could crash.
WNPA-SEC-2016-32 - The UMTS FP dissector could crash.
WNPA-SEC-2016-33 - Some USB dissectors could crash.
WNPA-SEC-2016-34 - The Toshiba file parser could crash.
WNPA-SEC-2016-35 - The CoSine file parser could crash.
WNPA-SEC-2016-36 - The NetScreen file parser could crash.
WNPA-SEC-2016-37 - The Ethernet dissector could crash.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fixes:
WNPA-SEC-2016-19 - The NCP dissector could crash.
WNPA-SEC-2016-20 - TShark could crash due to a packet reassembly bug.
WNPA-SEC-2016-21 - The IEEE 802.11 dissector could crash.
WNPA-SEC-2016-22 - The PKTC dissector could crash.
WNPA-SEC-2016-23 - The PKTC dissector could crash.
WNPA-SEC-2016-24 - The IAX2 dissector could go into an infinite loop.
WNPA-SEC-2016-25 - Wireshark and TShark could exhaust the stack.
WNPA-SEC-2016-26 - The GSM CBCH dissector could crash.
WNPA-SEC-2016-27 - MS-WSP dissector crash.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Since commit 00be67d846 (wireshark: enable GUI options, 2015-12-02) the GUI
is enabled when the required libraries are present. Update the config help
text accordingly.
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To reproduce the build error I had to install libpcap0.8-dev on my host
system, then wireshark configure picks up
checking for pcap-config... /usr/bin/pcap-config
and fails.
Fixes
http://autobuild.buildroot.net/results/7e3/7e363d18866057df0db3d0d95fa8d9116728f6ce//
and many others
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Needed for detection of various optional components.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
If host arch = target arch and liblua is in the host the buildsystem
will pick it up and try to use it since it passes basic build tests.
Forcibly disable it, since it causes no build failure, rather runtime
failures because said liblua is not present on the target.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Patch configure.ac to not assume broken inet_pton in case of cross
compiling (avoids double definition), similare patch is used
for OpenEmbedded (see [1]).
Fixes [2]:
host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libc.a(ntop.os): In function `inet_pton':
ntop.c:(.text+0x4b4): multiple definition of `inet_pton'
wsutil/.libs/libwsutil.a(inet_pton.o):inet_pton.c:(.text+0xe0): first defined here
collect2: error: ld returned 1 exit status
[1] http://cgit.openembedded.org/openembedded/tree/recipes/wireshark/files/fix-configure.patch
[2] http://autobuild.buildroot.net/results/b35/b354ba668ca9476c143f5f7ef1b727b0b5672b04
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Bump to version 1.12.6
- Update hash file
The following vulnerabilities have been fixed in 1.12.6:
- wnpa-sec-2015-19
WCCP dissector crash. (Bug 11153)
- wnpa-sec-2015-20
GSM DTAP dissector crash. (Bug 11201)
[Thomas: indicate that this is a security related updated in the
commit log, as suggested by Gustavo.]
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fixes:
CVE-2015-3808 CVE-2015-3809 - The LBMR dissector could go into an
infinite loop.
CVE-2015-3811 - The WCP dissector could crash while decompressing data.
CVE-2015-3812 - The X11 dissector could leak memory.
CVE-2015-3813 - The packet reassembly code could leak memory.
CVE-2015-3814 - The IEEE 802.11 dissector could go into an infinite
loop.
CVE-2015-3815 - The Android Logcat file parser could crash.
Patch upstream so drop and disable autoreconf.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fixes:
CVE-2015-2187 - The ATN-CPDLC dissector could crash.
CVE-2015-2188 - The WCP dissector could crash.
CVE-2015-2189 - The pcapng file parser could crash.
CVE-2015-2190 - The LLDP dissector could crash.
CVE-2015-2191 - The TNEF dissector could go into an infinite loop.
CVE-2015-2192 - The SCSI OSD dissector could go into an infinite loop.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Autogenerated from rename-patch.py (http://patchwork.ozlabs.org/patch/403345)
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fixes:
CVE-2015-0559, CVE-2015-0560 - The WCCP dissector could crash.
CVE-2015-0561 - The LPP dissector could crash.
CVE-2015-0562 - The DEC DNA Routing Protocol dissector could crash.
CVE-2015-0563 - The SMTP dissector could crash.
CVE-2015-0564 - Wireshark could crash while decypting TLS/SSL sessions.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fixes:
WNPA-SEC-2014-08 / CVE-2014-5161 / CVE-2014-5162
The Catapult DCT2000 and IrDA dissectors could underrun a buffer.
WNPA-SEC-2014-09 / CVE-2014-5163
The GSM Management dissector could crash.
WNPA-SEC-2014-10 / CVE-2014-5164
The RLC dissector could crash.
WNPA-SEC-2014-11 / CVE-2014-5165
The ASN.1 BER dissector could crash.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fixes CVE-2014-4020 (The frame metadissector could crash).
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
The following vulnerabilities have been fixed.
* [1]wnpa-sec-2014-01
The NFS dissector could crash. Discovered by Moshe Kaplan.
([2]Bug 9672)
Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12
[3]CVE-2014-2281
* [4]wnpa-sec-2014-02
The M3UA dissector could crash. Discovered by Laurent
Butti. ([5]Bug 9699)
Versions affected: 1.10.0 to 1.10.5
[6]CVE-2014-2282
* [7]wnpa-sec-2014-03
The RLC dissector could crash. ([8]Bug 9730)
Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12
[9]CVE-2014-2283
* [10]wnpa-sec-2014-04
The MPEG file parser could overflow a buffer. Discovered by
Wesley Neelen. ([11]Bug 9843)
Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12
[12]CVE-2014-2299
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fixes a couple of runtime regressions from the 1.10.4 security release.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
The current stable release of Wireshark is 1.10.3. It supersedes all
previous releases. So let's upgrade to 1.10.3.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
