From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] wireshark: update to 3.4.2.
Date: Fri, 25 Dec 2020 02:28:48 +0100 [thread overview]
Message-ID: <20201225012848.7gJQ78-QD4ivGlyYJZhYf7ldsglq4Kn_3dDnb5Lx9Sg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27413@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 340 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages wireshark-CVE-2020-26422
https://github.com/void-linux/void-packages/pull/27413
wireshark: update to 3.4.2.
CVE-2020-26422
A patch file from https://github.com/void-linux/void-packages/pull/27413.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wireshark-CVE-2020-26422-27413.patch --]
[-- Type: text/x-diff, Size: 1827 bytes --]
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?=
<congdanhqx@gmail.com>
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 <gottox@voidlinux.org>"
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() {
next prev parent reply other threads:[~2020-12-25 1:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-25 0:54 [PR PATCH] " sgn
2020-12-25 1:28 ` sgn [this message]
2020-12-25 14:25 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201225012848.7gJQ78-QD4ivGlyYJZhYf7ldsglq4Kn_3dDnb5Lx9Sg@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).