From 6916f04de8a47f8b031b07ea8be84afa806bc858 Mon Sep 17 00:00:00 2001
From: Dongsu Park <dongsu@kinvolk.io>
Date: Thu, 17 Sep 2020 13:41:47 +0200
Subject: [PATCH] net-libs/libpcap: update to 1.9.1

Update net-libs/libpcap to 1.9.1, to address security issue
CVE-2019-15163, an issue of allowing attackers to cause a denial of
service (NULL pointer dereference and daemon crash) if a crypt() call
fails.
---
 .../portage-stable/net-libs/libpcap/Manifest  |  3 +-
 .../libpcap/files/libpcap-1.10.0-usbmon.patch | 14 ++++++
 .../files/libpcap-1.6.1-prefix-solaris.patch  | 35 --------------
 .../files/libpcap-1.8.1-cross-compile.patch   | 16 -------
 .../libpcap/files/libpcap-1.8.1-darwin.patch  | 15 ------
 .../files/libpcap-1.8.1-disable-remote.patch  | 31 ------------
 .../libpcap/files/libpcap-1.8.1-libnl.patch   | 22 ---------
 ...libpcap-1.9.0-pcap-config-includedir.patch | 36 ++++++++++++++
 .../files/libpcap-1.9.1-pcap-config.patch     | 43 +++++++++++++++++
 .../libpcap/files/libpcap-9999-parallel.patch | 22 ---------
 .../files/libpcap-9999-prefix-darwin.patch    |  5 +-
 ....1-r2.ebuild => libpcap-1.10.0_pre.ebuild} | 47 ++++++++++---------
 ...p-1.8.1.ebuild => libpcap-1.9.1-r3.ebuild} | 40 +++++++++-------
 ...p-1.8.1-r1.ebuild => libpcap-1.9.1.ebuild} | 23 ++++-----
 .../net-libs/libpcap/libpcap-9999.ebuild      | 29 ++++++++----
 .../net-libs/libpcap/metadata.xml             |  4 ++
 16 files changed, 177 insertions(+), 208 deletions(-)
 create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch
 create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch
 create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.9.1-pcap-config.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-9999-parallel.patch
 rename sdk_container/src/third_party/portage-stable/net-libs/libpcap/{libpcap-1.8.1-r2.ebuild => libpcap-1.10.0_pre.ebuild} (53%)
 rename sdk_container/src/third_party/portage-stable/net-libs/libpcap/{libpcap-1.8.1.ebuild => libpcap-1.9.1-r3.ebuild} (57%)
 rename sdk_container/src/third_party/portage-stable/net-libs/libpcap/{libpcap-1.8.1-r1.ebuild => libpcap-1.9.1.ebuild} (64%)

diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/Manifest
index ec878f2758..e437bfba26 100644
--- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/Manifest
+++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/Manifest
@@ -1 +1,2 @@
-DIST libpcap-1.8.1.tar.gz 753405 BLAKE2B f80fbd6451cf788fc43e5f2240e5ecb267ac98b57bca3fa56dd63576b57d10966bfacde5005d07282352fc2b30d8ef5964cbd126f8f63e565f1bb3dc6f8d9a1c SHA512 7e6a7351bb4213e1c3dd95ef7a460e91f733d933e39ba518ad8ba6d2f86b6e7cfa50ae667c8dc1300ef47bf8693ac8a1f18e068f41175ca5d0147a0b72278882
+DIST libpcap-1.10.0-bp.tar.gz 911001 BLAKE2B bbcb1f48c5cbe8bfc46003cbf7c691e0b3a2051e319aa3ec761de045ac11bbacafe1a06b52c4cd332eb85e598a0a1ff5403ae7c3a611cc0cdd2eeab859587487 SHA512 c3d6047192ab1521687d856f2a954a38bfd8d42aedb853559a698ed3c24bfe5698efb6f81c0280b696229165c1088a58471e8d62f071343fcb14b1464f65fe3f
+DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch
new file mode 100644
index 0000000000..e5524ac3ba
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.10.0-usbmon.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2225,10 +2225,7 @@
+       AC_DEFINE(PCAP_SUPPORT_LINUX_USBMON, 1, [target host supports Linux usbmon for USB sniffing])
+       MODULE_C_SRC="$MODULE_C_SRC pcap-usb-linux.c"
+       AC_MSG_RESULT(yes)
+-      ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null`
+-      if test $? -ne 0 ; then
+-        ac_usb_dev_name="usbmon"
+-      fi
++      ac_usb_dev_name="usbmon"
+       AC_DEFINE_UNQUOTED(LINUX_USB_MON_DEV, "/dev/$ac_usb_dev_name", [path for device for USB sniffing])
+       AC_MSG_NOTICE(Device for USB sniffing is /dev/$ac_usb_dev_name)
+       #
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
deleted file mode 100644
index 324aead551..0000000000
--- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.6.1-prefix-solaris.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Prefix' Solaris uses GNU ld
-
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -415,7 +415,7 @@
- 	    aix*)
- 		    ;;
- 
--	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
-+	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
- 	    	    #
- 		    # Platforms where the linker is the GNU linker
- 		    # or accepts command-line arguments like
-@@ -429,10 +429,10 @@
- 		    PIC_OPT=-fpic
- 		    case "$host_cpu" in
- 
--		    sparc64*)
-+		    sparc64*|sparcv9*)
- 			case "$host_os" in
- 
--			freebsd*|openbsd*)
-+			freebsd*|solaris*|openbsd*)
- 			    PIC_OPT=-fPIC
- 			    ;;
- 			esac
-@@ -497,7 +497,7 @@
- 		    V_SHLIB_OPT="-G -bnoentry -bexpall"
- 		    ;;
- 
--	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
-+	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
- 		    #
- 		    # "cc" is GCC.
- 		    #
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch
deleted file mode 100644
index 361cdeb5ec..0000000000
--- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-cross-compile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -291,7 +291,12 @@
- dnl XXX This could be done for cross-compiling, but for now it's not.
- dnl
- if test -z "$with_pcap" && test "$cross_compiling" = yes; then
--	AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...)
-+	if test -z "$with_pcap" ; then
-+		case $host in
-+			*-linux*) with_pcap="linux";;
-+			*) AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...);;
-+		esac
-+	fi
- fi
- AC_ARG_WITH(pcap,
- AC_HELP_STRING([--with-pcap=TYPE],[use packet capture TYPE]))
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch
deleted file mode 100644
index 650bea8251..0000000000
--- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-darwin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this setup
-Check for bluetooth/mgmt.h before use
-
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1117,7 +1117,7 @@
- 	if test "$enable_universal" != "no"; then
- 		case "$host_os" in
- 
--		darwin[0-7].*)
-+		darwin**)
- 			#
- 			# Pre-Tiger.  Build only for 32-bit PowerPC; no
- 			# need for any special compiler or linker flags.
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch
deleted file mode 100644
index df68a5f0aa..0000000000
--- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-This patch was taken directly from debian: https://packages.debian.org/source/stretch/libpcap
-
-Disable bits of remote capture support inherited from the WinPCAP merge
-which cause applications to FTBFS if they define HAVE_REMOTE (#843384).
-
---- a/pcap/pcap.h
-+++ b/pcap/pcap.h
-@@ -506,6 +506,11 @@
-   #define MODE_STAT 1
-   #define MODE_MON 2
- 
-+#ifdef HAVE_REMOTE
-+  /* Includes most of the public stuff that is needed for the remote capture */
-+  #include <remote-ext.h>
-+#endif	 /* HAVE_REMOTE */
-+
- #elif defined(MSDOS)
- 
-   /*
-@@ -526,11 +531,6 @@
- 
- #endif /* _WIN32/MSDOS/UN*X */
- 
--#ifdef HAVE_REMOTE
--  /* Includes most of the public stuff that is needed for the remote capture */
--  #include <remote-ext.h>
--#endif	 /* HAVE_REMOTE */
--
- #ifdef __cplusplus
- }
- #endif
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch
deleted file mode 100644
index 61dfc4e201..0000000000
--- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.8.1-libnl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -453,10 +453,6 @@
- 
-                 incdir=-I/usr/include/libnl3
-                 libnldir=
--                if test x$withval != x ; then
--                  libnldir=-L${withval}/lib/.libs
--                  incdir=-I${withval}/include
--                fi
- 
- 		#
- 		# Try libnl 3.x first.
-@@ -471,7 +467,7 @@
- 			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
- 			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
- 			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
--			V_INCLS="$V_INCLS ${incdir}"
-+			V_INCLS="${incdir} $V_INCLS"
- 			have_any_nl="yes"
- 		],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
- 
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch
new file mode 100644
index 0000000000..cd2c9fe61f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch
@@ -0,0 +1,36 @@
+--- a/pcap-config.in
++++ b/pcap-config.in
+@@ -59,13 +59,13 @@
+ 	#
+ 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
+ 	then
+-		echo "-I$includedir -L$libdir -lpcap $LIBS"
++		echo "-L$libdir -lpcap $LIBS"
+ 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
+ 	then
+-		echo "-I$includedir -L$libdir $LIBS"
++		echo "-L$libdir $LIBS"
+ 	elif [ "$show_cflags" = 1 ]
+ 	then
+-		echo "-I$includedir"
++		echo ""
+ 	elif [ "$show_libs" = 1 ]
+ 	then
+ 		echo "-L$libdir -lpcap $LIBS"
+@@ -80,13 +80,13 @@
+ 	#
+ 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
+ 	then
+-		echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
++		echo "-L$libdir $RPATH -l$PACKAGE_NAME"
+ 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
+ 	then
+-		echo "-I$includedir"
++		echo ""
+ 	elif [ "$show_cflags" = 1 ]
+ 	then
+-		echo "-I$includedir"
++		echo ""
+ 	elif [ "$show_libs" = 1 ]
+ 	then
+ 		echo "-L$libdir $RPATH -l$PACKAGE_NAME"
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.9.1-pcap-config.patch b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.9.1-pcap-config.patch
new file mode 100644
index 0000000000..937273c43f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-1.9.1-pcap-config.patch
@@ -0,0 +1,43 @@
+--- a/pcap-config.in
++++ b/pcap-config.in
+@@ -59,16 +59,16 @@
+ 	#
+ 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
+ 	then
+-		echo "-I$includedir -L$libdir -lpcap $LIBS"
++		echo "-lpcap $LIBS"
+ 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
+ 	then
+-		echo "-I$includedir -L$libdir $LIBS"
++		echo "$LIBS"
+ 	elif [ "$show_cflags" = 1 ]
+ 	then
+-		echo "-I$includedir"
++		echo ""
+ 	elif [ "$show_libs" = 1 ]
+ 	then
+-		echo "-L$libdir -lpcap $LIBS"
++		echo "-lpcap $LIBS"
+ 	elif [ "$show_additional_libs" = 1 ]
+ 	then
+ 		echo "$LIBS"
+@@ -80,15 +80,15 @@
+ 	#
+ 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
+ 	then
+-		echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
++		echo " $RPATH -l$PACKAGE_NAME"
+ 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
+ 	then
+-		echo "-I$includedir"
++		echo ""
+ 	elif [ "$show_cflags" = 1 ]
+ 	then
+-		echo "-I$includedir"
++		echo ""
+ 	elif [ "$show_libs" = 1 ]
+ 	then
+-		echo "-L$libdir $RPATH -l$PACKAGE_NAME"
++		echo "$RPATH -l$PACKAGE_NAME"
+ 	fi
+ fi
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-9999-parallel.patch b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-9999-parallel.patch
deleted file mode 100644
index 61381a8e6d..0000000000
--- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-9999-parallel.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0dd90a6bdbce4dca14106859eee63ef643a106e2 Mon Sep 17 00:00:00 2001
-From: Alfredo Alvarez Fernandez <alfredoalvarezernandez@gmail.com>
-Date: Tue, 21 Feb 2017 11:41:43 +0100
-Subject: [PATCH] Makefile.in: Fix missing dependency
-
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 7044f0438..f5d443aed 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -465,7 +465,7 @@ grammar.h: grammar.c
- 		$(MAKE) $(MAKEFLAGS) grammar.c; \
- 	fi
- 
--grammar.o: grammar.c
-+grammar.o: grammar.c scanner.h
- 	$(CC) $(FULL_CFLAGS) -c grammar.c
- 
- gencode.o: $(srcdir)/gencode.c grammar.h scanner.h
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch
index 9bcbfe92ee..5ac34fd464 100644
--- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch
+++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/files/libpcap-9999-prefix-darwin.patch
@@ -1,13 +1,12 @@
 Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this setup
-Check for bluetooth/mgmt.h before use
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1271,7 +1267,7 @@
+@@ -1860,7 +1860,7 @@
  	if test "$enable_universal" != "no"; then
  		case "$host_os" in
  
--		darwin[0-7].*)
+-		darwin[[0-7]].*)
 +		darwin**)
  			#
  			# Pre-Tiger.  Build only for 32-bit PowerPC; no
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.8.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.0_pre.ebuild
similarity index 53%
rename from sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
rename to sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.0_pre.ebuild
index cbce63e8d6..3a80522a9f 100644
--- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.0_pre.ebuild
@@ -1,53 +1,52 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools multilib-minimal ltprune
+EAPI=7
+inherit autotools multilib-minimal
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 HOMEPAGE="
-	http://www.tcpdump.org/
+	https://www.tcpdump.org/
 	https://github.com/the-tcpdump-group/libpcap
 "
 SRC_URI="
-	https://github.com/the-tcpdump-group/${PN}/archive/${P}.tar.gz
+	https://github.com/the-tcpdump-group/${PN}/archive/${P/_pre/-bp}.tar.gz
 "
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth dbus netlink static-libs usb"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 
 RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	rdma? ( sys-cluster/rdma-core )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
 	sys-devel/flex
 	virtual/yacc
-	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	dbus? ( virtual/pkgconfig )
 "
 
-S=${WORKDIR}/${PN}-${P}
+S=${WORKDIR}/${PN}-${P/_pre/-bp}
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
-	"${FILESDIR}"/${PN}-1.8.1-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
-	"${FILESDIR}"/${PN}-1.8.1-libnl.patch
-	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-	"${FILESDIR}"/${PN}-1.8.1-disable-remote.patch
-	"${FILESDIR}"/${PN}-9999-parallel.patch
+	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
+	"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
 )
 
 src_prepare() {
 	default
 
-	eapply_user
-
-	echo ${PV} > VERSION || die
+	if ! [[ -f VERSION ]]; then
+		echo ${PV} > VERSION || die
+	fi
 
 	eautoreconf
 }
@@ -56,8 +55,11 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
 	econf \
 		$(use_enable bluetooth) \
-		$(use_enable usb) \
 		$(use_enable dbus) \
+		$(use_enable rdma) \
+		$(use_enable remote) \
+		$(use_enable usb) \
+		$(use_enable yydebug) \
 		$(use_with netlink libnl) \
 		--enable-ipv6
 }
@@ -67,13 +69,14 @@ multilib_src_compile() {
 }
 
 multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
+	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
 
 	# remove static libraries (--disable-static does not work)
 	if ! use static-libs; then
 		find "${ED}" -name '*.a' -exec rm {} + || die
 	fi
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
 
 	# We need this to build pppd on G/FBSD systems
 	if [[ "${USERLAND}" == "BSD" ]]; then
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.8.1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
similarity index 57%
rename from sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.8.1.ebuild
rename to sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
index e362e19d2b..2e669584a7 100644
--- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.8.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
@@ -1,44 +1,44 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools multilib-minimal ltprune
+EAPI=7
+inherit autotools multilib-minimal
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 HOMEPAGE="
-	http://www.tcpdump.org/
+	https://www.tcpdump.org/
 	https://github.com/the-tcpdump-group/libpcap
 "
 SRC_URI="
-	https://github.com/the-tcpdump-group/${PN}/archive/${P}.tar.gz
+	https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
 "
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth dbus netlink static-libs usb"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 
 RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	rdma? ( sys-cluster/rdma-core )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
 	sys-devel/flex
 	virtual/yacc
-	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	dbus? ( virtual/pkgconfig )
 "
 
-S=${WORKDIR}/${PN}-${P}
+S=${WORKDIR}/${PN}-${P/_}
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
-	"${FILESDIR}"/${PN}-1.8.1-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
-	"${FILESDIR}"/${PN}-1.8.1-libnl.patch
 	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-	"${FILESDIR}"/${PN}-9999-parallel.patch
+	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
 )
 
 src_prepare() {
@@ -53,8 +53,11 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
 	econf \
 		$(use_enable bluetooth) \
-		$(use_enable usb) \
 		$(use_enable dbus) \
+		$(use_enable rdma) \
+		$(use_enable remote) \
+		$(use_enable usb) \
+		$(use_enable yydebug) \
 		$(use_with netlink libnl) \
 		--enable-ipv6
 }
@@ -64,17 +67,18 @@ multilib_src_compile() {
 }
 
 multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
+	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
 
 	# remove static libraries (--disable-static does not work)
 	if ! use static-libs; then
 		find "${ED}" -name '*.a' -exec rm {} + || die
 	fi
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
 
 	# We need this to build pppd on G/FBSD systems
 	if [[ "${USERLAND}" == "BSD" ]]; then
 		insinto /usr/include
-		doins pcap-int.h
+		doins pcap-int.h portability.h
 	fi
 }
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.8.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.9.1.ebuild
similarity index 64%
rename from sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.8.1-r1.ebuild
rename to sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.9.1.ebuild
index e3cfd9d274..4775c7d9c5 100644
--- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.8.1-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,16 +6,16 @@ inherit autotools multilib-minimal ltprune
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 HOMEPAGE="
-	http://www.tcpdump.org/
+	https://www.tcpdump.org/
 	https://github.com/the-tcpdump-group/libpcap
 "
 SRC_URI="
-	https://github.com/the-tcpdump-group/${PN}/archive/${P}.tar.gz
+	https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
 "
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink static-libs usb"
 
 RDEPEND="
@@ -27,18 +27,14 @@ DEPEND="
 	${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
-	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	dbus? ( virtual/pkgconfig )
 "
 
-S=${WORKDIR}/${PN}-${P}
+S=${WORKDIR}/${PN}-${P/_}
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
-	"${FILESDIR}"/${PN}-1.8.1-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
-	"${FILESDIR}"/${PN}-1.8.1-libnl.patch
 	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
-	"${FILESDIR}"/${PN}-9999-parallel.patch
+	"${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch
 )
 
 src_prepare() {
@@ -53,9 +49,10 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
 	econf \
 		$(use_enable bluetooth) \
-		$(use_enable usb) \
 		$(use_enable dbus) \
+		$(use_enable usb) \
 		$(use_with netlink libnl) \
+		--disable-rdma \
 		--enable-ipv6
 }
 
@@ -64,7 +61,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
+	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
 
 	# remove static libraries (--disable-static does not work)
 	if ! use static-libs; then
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-9999.ebuild
index ad1d934515..b716f85059 100644
--- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-9999.ebuild
@@ -1,36 +1,40 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools git-r3 multilib-minimal ltprune
+EAPI=7
+inherit autotools git-r3 multilib-minimal
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
 EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
 HOMEPAGE="
-	http://www.tcpdump.org/
-	${EGIT_REPO_URI}
+	https://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/libpcap
 "
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="bluetooth dbus netlink static-libs usb"
+IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 KEYWORDS=""
 
 RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	rdma? ( sys-cluster/rdma-core )
 	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
 	sys-devel/flex
 	virtual/yacc
-	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	dbus? ( virtual/pkgconfig )
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
+	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
+	"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
 	"${FILESDIR}"/${PN}-9999-prefix-darwin.patch
 )
 
@@ -45,8 +49,12 @@ multilib_src_configure() {
 	econf \
 		$(use_enable bluetooth) \
 		$(use_enable dbus) \
+		$(use_enable rdma) \
+		$(use_enable remote) \
 		$(use_enable usb) \
-		$(use_with netlink libnl)
+		$(use_enable yydebug) \
+		$(use_with netlink libnl) \
+		--enable-ipv6
 }
 
 multilib_src_compile() {
@@ -60,7 +68,8 @@ multilib_src_install_all() {
 	if ! use static-libs; then
 		find "${ED}" -name '*.a' -exec rm {} + || die
 	fi
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
 
 	# We need this to build pppd on G/FBSD systems
 	if [[ "${USERLAND}" == "BSD" ]]; then
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/metadata.xml b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/metadata.xml
index 488e8703b1..9c9e8fcf34 100644
--- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/metadata.xml
@@ -7,8 +7,12 @@
 </maintainer>
 <use>
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.</flag>
+<flag name="rdma">Enable RDMA capture support using <pkg>sys-cluster/rdma-core</pkg></flag>
+<flag name="remote">Enable remote packet capture which may expose libpcap-based applications to attacks by malicious remote capture servers!</flag>
+<flag name="yydebug">Enable parser debugging code</flag>
 </use>
 <upstream>
+<remote-id type="cpe">cpe:/a:tcpdump:libpcap</remote-id>
 <remote-id type="github">the-tcpdump-group/libpcap</remote-id>
 </upstream>
 </pkgmetadata>