From 092d6abdc7530f83062f09c29d2afc3fb3475afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 25 Dec 2020 07:36:45 +0700 Subject: [PATCH] wireshark: update to 3.4.2. CVE-2020-26422 --- srcpkgs/wireshark/template | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index 7e6e9e24218..65eec2e652e 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,8 +1,9 @@ # Template file for 'wireshark' pkgname=wireshark -version=3.4.0 +version=3.4.2 revision=1 build_style=cmake +configure_args="-DCMAKE_BUILD_TYPE=None" hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel qt5-tools qt5-host-tools qt5-qmake" makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel @@ -16,15 +17,20 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.wireshark.org" distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.xz" -checksum=67e4ebbd9153fc589fd67dc21b93176674c73adc3d5a43934c3ac69d8594a8ae +checksum=de9868729e426a469baabd8d444240d84fa5445020e92c842dd19afd0d47a4c4 system_groups="wireshark" -CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" -CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.2" +CFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2" +CXXFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2" -pre_configure() { - # unittests fail - vsed -i CMakeLists.txt -e '/suite_unittests/d' +post_patch() { + # systemd-journal integration + vsed -i '/test_sdjournal/,/check_extcap.*sdjournal/d' \ + test/suite_extcaps.py +} + +pre_check() { + make ${makejobs} -C build test-programs } post_install() {