aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoromni <omni+alpine@hack.org>2021-06-14 21:54:40 +0000
committerLeo <thinkabit.ukim@gmail.com>2021-06-15 02:46:58 -0300
commitf5e22f55f0264556a0f1ee7096bd53710e1a0feb (patch)
tree0caec4710b1b163f1e1cb9ad30306bce8537a63f
parentf4ac72dc0135edb5db1b5bfe5784067edbdea79c (diff)
downloadaports-f5e22f55f0264556a0f1ee7096bd53710e1a0feb.tar.gz
aports-f5e22f55f0264556a0f1ee7096bd53710e1a0feb.tar.bz2
aports-f5e22f55f0264556a0f1ee7096bd53710e1a0feb.tar.xz
community/wireshark: security upgrade to 3.4.6
- add CVE numbers to secfixes list - align patch
-rw-r--r--community/wireshark/APKBUILD10
-rw-r--r--community/wireshark/fix-udpdump.patch6
2 files changed, 10 insertions, 6 deletions
diff --git a/community/wireshark/APKBUILD b/community/wireshark/APKBUILD
index 0345804009..544ae28f2b 100644
--- a/community/wireshark/APKBUILD
+++ b/community/wireshark/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=wireshark
# 3.3.x is an experimental release for 3.4.x, stay on stable
-pkgver=3.4.5
+pkgver=3.4.6
pkgrel=0
pkgdesc="Network protocol analyzer"
url="https://www.wireshark.org"
@@ -42,6 +42,10 @@ source="https://www.wireshark.org/download/src/wireshark-$pkgver.tar.xz
"
# secfixes:
+# 3.4.6-r0:
+# - CVE-2021-22222
+# 3.4.5-r0:
+# - CVE-2021-22207
# 3.4.4-r0:
# - CVE-2021-22191
# 3.4.3-r0:
@@ -304,6 +308,6 @@ tshark() {
mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark
}
-sha512sums="f54d9287a48f09bbc085170791b5ca2dcc84cda55040f45f2c4a6abbe828548391e4a931536163c781e69843765a598bd29a240ad43276d0d1bb42d1cd23972a wireshark-3.4.5.tar.xz
-287159576be76fc8afbce450a53f969bbd519321e038c812b96857ca08c352052dbbfaa9208d54ed30d7a0c9ca4192b83c8865de60562c4490d99d75c61ede0b fix-udpdump.patch
+sha512sums="eac358bb6457ba704db364a8a8431652e8427f17f5a69d92195fe00afb8db028b92a6a36e216ee5f692621b1ad35ea2f6cebdb08076f091e76a04e048192b89d wireshark-3.4.6.tar.xz
+fb7594ee632174d12ab070a68f2d6070026e3111c164fc5815c03066efe960b31cde801b205087c672782f04aaabedd23979a4fb071db233879a820350a7c9d3 fix-udpdump.patch
3c907a037504d39a56766db37eecc9d5f968fdcb90c431e099b3f77e4ffc52fb65cb6c3896406aa939a846d526daf5676693ae5c2ff933e1d878e39ac074417a disable-tests.patch"
diff --git a/community/wireshark/fix-udpdump.patch b/community/wireshark/fix-udpdump.patch
index 08d11d3eec..4ae8ac0c21 100644
--- a/community/wireshark/fix-udpdump.patch
+++ b/community/wireshark/fix-udpdump.patch
@@ -1,8 +1,8 @@
--- a/extcap/udpdump.c
+++ b/extcap/udpdump.c
-@@ -50,6 +50,10 @@
- #include <wsutil/inet_addr.h>
- #include <wsutil/filesystem.h>
+@@ -45,6 +45,10 @@
+
+ #include <cli_main.h>
+#ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>