From 2eca999fb7b53ccc3774475a9d14426f548626a9 Mon Sep 17 00:00:00 2001
From: Dongsu Park <dongsupark@microsoft.com>
Date: Fri, 27 Aug 2021 11:38:57 +0200
Subject: [PATCH] net-dns/c-ares: update to 1.17.2

Update net-dns/c-ares to 1.17.2, mainly to address CVE-2021-3672 .

Gentoo ref: c06fd172f1183f13dd6802abd5c3585987f4bc86
---
 .../portage-stable/net-dns/c-ares/Manifest    |  1 +
 .../net-dns/c-ares/c-ares-1.17.1.ebuild       |  4 +-
 .../net-dns/c-ares/c-ares-1.17.2.ebuild       | 62 +++++++++++++++++++
 3 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.17.2.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/net-dns/c-ares/Manifest b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/Manifest
index 8eec62a363..99b1551d21 100644
--- a/sdk_container/src/third_party/portage-stable/net-dns/c-ares/Manifest
+++ b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/Manifest
@@ -1 +1,2 @@
 DIST c-ares-1.17.1.tar.gz 1518701 BLAKE2B 31dac21ecae231e2a201dc1ba954c1a0663a06f93eb8e7e033ca3c6d385f53e07af0b04854739f1ee8a7f0693f67f620143e152ef092b49342c62279a0480905 SHA512 b11887bcc9274d368088e1a8b6aca62414f20675cf0bc58e948f54fa04c327c39dd23cefe7509eec6397db14b550a3f6b77f5c18b3d735b3eef48ce2da1dcd00
+DIST c-ares-1.17.2.tar.gz 1538276 BLAKE2B c6f5ad65ca75f8467b624daf3caaee2f35d6e4714ce46ebe1bbf79447feecf8615915b00fa5e7bd1e97c6232864e06c53a792fbadf36a5399883529769273e24 SHA512 f625e0ef8508af6475d3e83b51ab29be8a4878e2a87e7f518bea046b76a74bfde7043ca6ec2a9e714c898ab9e5d4a5a678c3347a9f9eb68980438f7ca8ae3fc8
diff --git a/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.17.1.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.17.1.ebuild
index 4d7c73e9bc..7a5e47f106 100644
--- a/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.17.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.17.1.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-inherit autotools eutils multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="C library that resolves names asynchronously"
 HOMEPAGE="https://c-ares.haxx.se/"
 SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 # Subslot = SONAME of libcares.so.2
diff --git a/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.17.2.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.17.2.ebuild
new file mode 100644
index 0000000000..e8187e7750
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.17.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="C library that resolves names asynchronously"
+HOMEPAGE="https://c-ares.haxx.se/"
+SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
+
+# Subslot = SONAME of libcares.so.2
+SLOT="0/2"
+LICENSE="MIT"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ares_build.h
+)
+
+multilib_src_configure() {
+	# Needed for running unit tests only
+	# Violates sandbox and tests pass fine without
+	ax_cv_uts_namespace=no \
+	ax_cv_user_namespace=no \
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-nonblocking \
+		--enable-symbol-hiding \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
+
+multilib_src_test() {
+	cd "${BUILD_DIR}"/test || die
+
+	# We're skipping the "real" network tests with the filter
+	# see https://github.com/c-ares/c-ares/tree/main/test
+	local network_tests=(
+		# Most live tests have Live in the name
+		*Live*
+		# These don't but are still in ares-test-live.cc => live
+		*GetTCPSock*
+		*TimeoutValue*
+		*GetSock*
+		*GetSock_virtualized*
+	)
+
+	# The format for disabling test1, test2, and test3 looks like:
+	# -test1:test2:test3
+	./arestest --gtest_filter=-$(echo $(IFS=:; echo "${network_tests[*]}")) || die "arestest failed!"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}