Re: [meta-networking][V2][PATCH] wireshark: update to 2.6.2

[akuster808 <akuster808@gmail.com>]

Found out the  "wireshark-gtk" is not being built with the way the new
cmake options are being set. I will be sending v3. Note: I never built
the QT version so I don't intend on addressing this at this time as it
supports qt4 & 5

- armin

On 07/28/2018 05:12 PM, Armin Kuster wrote:
> [v2]
> Fix native build, lemon is the only one needed natively
>
> [v1]
> includes security fixes:
>
> wnpa-sec-2018-34 BGP dissector large loop. Bug 13741. CVE-2018-14342.
> wnpa-sec-2018-35 ISMP dissector crash. Bug 14672. CVE-2018-14344.
> wnpa-sec-2018-36 Multiple dissectors could crash. Bug 14675. CVE-2018-14340.
> wnpa-sec-2018-37 ASN.1 BER dissector crash. Bug 14682. CVE-2018-14343.
> wnpa-sec-2018-38 MMSE dissector infinite loop. Bug 14738. CVE-2018-14339.
> wnpa-sec-2018-39 DICOM dissector crash. Bug 14742. CVE-2018-14341.
> wnpa-sec-2018-40 Bazaar dissector infinite loop. Bug 14841. CVE-2018-14368.
> wnpa-sec-2018-41 HTTP2 dissector crash. Bug 14869. CVE-2018-14369.
> wnpa-sec-2018-42 CoAP dissector crash. Bug 14966. CVE-2018-14367.
>
> Signed-off-by: Armin Kuster <akuster808@gmail.com>
> ---
>  .../wireshark/{wireshark_2.6.1.bb => wireshark_2.6.2.bb}          | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>  rename meta-networking/recipes-support/wireshark/{wireshark_2.6.1.bb => wireshark_2.6.2.bb} (94%)
>
> diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb b/meta-networking/recipes-support/wireshark/wireshark_2.6.2.bb
> similarity index 94%
> rename from meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb
> rename to meta-networking/recipes-support/wireshark/wireshark_2.6.2.bb
> index 91c5e96..91ad639 100644
> --- a/meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb
> +++ b/meta-networking/recipes-support/wireshark/wireshark_2.6.2.bb
> @@ -14,8 +14,8 @@ SRC_URI = "https://1.as.dl.wireshark.org/src/${BP}.tar.xz \
>  
>  UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
>  
> -SRC_URI[md5sum] = "b0e9e5fe22e96d9fdfad18f750fa8f55"
> -SRC_URI[sha256sum] = "ab6e5bbc3464c956347b8671ce8397950ad5daff3bf9964c967d495f4ddbcd88"
> +SRC_URI[md5sum] = "086d235509717190d06554b2ab870209"
> +SRC_URI[sha256sum] = "49b2895ee3ba17ef9ef0aebfdc4d32a778e0f36ccadde184516557d5f3357094"
>  
>  PE = "1"
>  
> @@ -35,7 +35,6 @@ PACKAGECONFIG[libnl] = ",,libnl"
>  PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19"
>  PACKAGECONFIG[gtk2] = "-DENABLE_GTK=ON,-DENABLE_GTK=OFF, gtk+"
>  PACKAGECONFIG[gtk3] = "-DENABLE_GTK3=ON,-DENABLE_GTK3=OFF, gtk+3"
> -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qtbase"
>  PACKAGECONFIG[graphics] = ",-DENABLE_GTK=OFF,"
>  PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls"
>  PACKAGECONFIG[ssl] = ",,openssl"
> @@ -50,6 +49,7 @@ PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4"
>  
>  # these next two options require addional layers
>  PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares"
> +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qtbase"
>  
>  EXTRA_OECMAKE += "-DBUILD_wireshark=ON \
>                    -DENABLE_NETLINK=ON \
> @@ -62,7 +62,7 @@ EXTRA_OECMAKE += "-DBUILD_wireshark=ON \
>                   "
>  do_install_append_class-native() {
>  	install -d ${D}${bindir}
> -	for f in make-dissectors lemon make-taps
> +	for f in lemon
>  	do
>  		install -m 0755 ${B}/run/$f ${D}${bindir}
>  	done