From 390cdb0062c5fe823d79366143fcca004de1d0ea Mon Sep 17 00:00:00 2001
From: Dan Theisen <djt@hxx.in>
Date: Mon, 4 Oct 2021 13:29:53 +0000
Subject: user/tcpdump: bump to 4.99.1

---
 user/tcpdump/APKBUILD                       | 12 ++++++----
 user/tcpdump/rm-vendor-specific-tests.patch | 34 +++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 user/tcpdump/rm-vendor-specific-tests.patch

(limited to 'user')

diff --git a/user/tcpdump/APKBUILD b/user/tcpdump/APKBUILD
index d2d2ec909..81b99632b 100644
--- a/user/tcpdump/APKBUILD
+++ b/user/tcpdump/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=tcpdump
-pkgver=4.9.3
-pkgrel=1
+pkgver=4.99.1
+pkgrel=0
 pkgdesc="A tool for network monitoring and data acquisition"
 url="http://www.tcpdump.org"
 arch="all"
@@ -10,9 +10,12 @@ license="BSD-3-Clause"
 depends=""
 makedepends="libpcap-dev openssl-dev perl"
 subpackages="$pkgname-doc"
-source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz"
+source="http://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz
+	rm-vendor-specific-tests.patch"
 
 # secfixes:
+#   4.99.1-r0:
+#     - CVE-2020-8037
 #   4.9.2-r1:
 #     - CVE-2018-19519
 #   4.9.2-r2:
@@ -65,4 +68,5 @@ package() {
 	rm -f "$pkgdir"/usr/sbin/tcpdump.4*
 }
 
-sha512sums="3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22  tcpdump-4.9.3.tar.gz"
+sha512sums="53d31355e1a6ef5a65bb3bf72454169fc80adf973a327a5768840e6ccf0550fbeb3c8a41f959635076d871df0619680321910a3a97879607f481cdaa8b7ceda7  tcpdump-4.99.1.tar.gz
+83e731c2c253e69a9fb5d2d42abbe8cc6439d3d9dadd2e412ed0e2a83d820228a1f4018fa1627568c723d376562a85bd099dd2738fd79dcc63abcfc8306fece3  rm-vendor-specific-tests.patch"
diff --git a/user/tcpdump/rm-vendor-specific-tests.patch b/user/tcpdump/rm-vendor-specific-tests.patch
new file mode 100644
index 000000000..234124b00
--- /dev/null
+++ b/user/tcpdump/rm-vendor-specific-tests.patch
@@ -0,0 +1,34 @@
+--- ./tests/TESTLIST	2021-10-04 13:24:39.359685770 +0000
++++ ./tests/TESTLIST	2021-10-04 13:26:27.408368225 +0000
+@@ -36,24 +36,24 @@
+ bgp-rt-prefix	bgp-rt-prefix.pcap	bgp-rt-prefix.out	-v
+ 
+ # Broadcom tag tests
+-brcmtag		brcm-tag.pcap		brcm-tag.out
+-brcmtag-e	brcm-tag.pcap		brcm-tag-e.out	-e
+-brcmtagprepend	brcm-tag-prepend.pcap	brcm-tag-prepend.out -e
++#brcmtag		brcm-tag.pcap		brcm-tag.out
++#brcmtag-e	brcm-tag.pcap		brcm-tag-e.out	-e
++#brcmtagprepend	brcm-tag-prepend.pcap	brcm-tag-prepend.out -e
+ 
+ # Broadcom LI
+ bcm-li bcm-li.pcap bcm-li.out
+ bcm-li-v bcm-li.pcap bcm-li-v.out -v
+ 
+ # Marvell DSA tag tests
+-dsa		dsa.pcap		dsa.out
+-dsa-e		dsa.pcap		dsa-e.out	-e
++#dsa		dsa.pcap		dsa.out
++#dsa-e		dsa.pcap		dsa-e.out	-e
+ 
+ # EAP tests
+ # now in smb.tests
+ 
+ # Marvell DSA tag tests
+-edsa		edsa.pcap		edsa.out
+-edsa-e		edsa.pcap		edsa-e.out	-e
++#edsa		edsa.pcap		edsa.out
++#edsa-e		edsa.pcap		edsa-e.out	-e
+ 
+ # ESP tests
+ esp0		02-sunrise-sunset-esp.pcap	esp0.out
-- 
cgit v1.2.3-60-g2f50