[oe] [meta-networking][v3][PATCH] wireshark: update to 2.6.2
akuster808
akuster808 at gmail.com
Mon Jul 30 15:07:58 UTC 2018
On 07/29/2018 02:50 PM, Khem Raj wrote:
> Can you also validate if it’s building ok on musl
Sure. any particular arch ? I have arm, arm64 and mips64 boards at home
plus the normal qemu ones.
>
> On Sun, Jul 29, 2018 at 9:41 AM Armin Kuster <akuster808 at gmail.com
> <mailto:akuster808 at gmail.com>> wrote:
>
> [v3]
> Get wireshark-gtk building again
> split tshark, wireshark-gtk into their own pkgs
>
> [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 at gmail.com
> <mailto:akuster808 at gmail.com>>
> ---
> .../{wireshark_2.6.1.bb <http://wireshark_2.6.1.bb> =>
> wireshark_2.6.2.bb <http://wireshark_2.6.2.bb>} | 34
> +++++++++++++++-------
> 1 file changed, 24 insertions(+), 10 deletions(-)
> rename
> meta-networking/recipes-support/wireshark/{wireshark_2.6.1.bb
> <http://wireshark_2.6.1.bb> => wireshark_2.6.2.bb
> <http://wireshark_2.6.2.bb>} (70%)
>
> diff --git
> a/meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb
> <http://wireshark_2.6.1.bb>
> b/meta-networking/recipes-support/wireshark/wireshark_2.6.2.bb
> <http://wireshark_2.6.2.bb>
> similarity index 70%
> rename from
> meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb
> <http://wireshark_2.6.1.bb>
> rename to
> meta-networking/recipes-support/wireshark/wireshark_2.6.2.bb
> <http://wireshark_2.6.2.bb>
> index 91c5e96..1735ae7 100644
> --- a/meta-networking/recipes-support/wireshark/wireshark_2.6.1.bb
> <http://wireshark_2.6.1.bb>
> +++ b/meta-networking/recipes-support/wireshark/wireshark_2.6.2.bb
> <http://wireshark_2.6.2.bb>
> @@ -14,8 +14,8 @@ SRC_URI =
> "https://1.as.dl.wireshark.org/src/${BP}.tar.xz
> <https://1.as.dl.wireshark.org/src/$%7BBP%7D.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"
>
> @@ -23,8 +23,11 @@ inherit cmake pkgconfig pythonnative perlnative
> upstream-version-is-even
>
> ARM_INSTRUCTION_SET = "arm"
>
> +# Options: gtk+, gtk+3 and qt5
> +GTK = "gtk+3"
> +
> PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc"
> -PACKAGECONFIG_append_class-target = "
> ${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk3 graphics ",
> "", d)}"
> +PACKAGECONFIG_append_class-target = "
> ${@bb.utils.contains("DISTRO_FEATURES", "x11", " ${GTK}", "", d)}"
>
> PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh"
>
> @@ -33,10 +36,8 @@ PACKAGECONFIG[libpcap] =
> "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DE
> PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi"
> 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[gtk+] = "-DENABLE_GTK=ON -DBUILD_wireshark_gtk=ON,
> -DENABLE_GTK=OFF, gtk+"
> +PACKAGECONFIG[gtk+3] = "-DENABLE_GTK3=ON
> -DBUILD_wireshark_gtk=ON, -DENABLE_GTK3=OFF, gtk+3"
> PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF,
> gnutls"
> PACKAGECONFIG[ssl] = ",,openssl"
> PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5"
> @@ -50,9 +51,9 @@ 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 -DBUILD_wireshark=ON,
> -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qtbase"
>
> -EXTRA_OECMAKE += "-DBUILD_wireshark=ON \
> - -DENABLE_NETLINK=ON \
> +EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \
> -DBUILD_mmdbresolve=OFF \
> -DBUILD_randpktdump=OFF \
> -DBUILD_androiddump=OFF \
> @@ -60,9 +61,11 @@ EXTRA_OECMAKE += "-DBUILD_wireshark=ON \
> -DM_INCLUDE_DIR=${includedir} \
> -DM_LIBRARY=${libdir} \
> "
> +CFLAGS_append = " -lm"
> +
> 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
> @@ -75,6 +78,17 @@ do_install_append_class-target() {
> done
> }
>
> +PACKAGE_BEFORE_PN += "tshark"
> +PACKAGE_BEFORE_PN += "${PN}-gtk"
> +
> +FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*"
> +FILES_${PN}-gtk = "${bindir}/wireshark-gtk ${datadir}/icons
> ${datadir}/appdata \
> + ${datadir}/applications ${datadir}/wireshark
> ${datadir}/mime \
> + ${mandir}/man1/wireshark.* "
> +
> FILES_${PN} += "${datadir}*"
>
> +RDEPENDS_tshark = "wireshark"
> +RDEPENDS_${PN}-gtk = "${@bb.utils.contains("DISTRO_FEATURES",
> "x11", "${GTK}", "", d)} wireshark"
> +
> BBCLASSEXTEND = "native"
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> <mailto:Openembedded-devel at lists.openembedded.org>
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
More information about the Openembedded-devel
mailing list