From nobody Tue Jan 25 13:46:57 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9B74919877E9; Tue, 25 Jan 2022 13:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jjp753vnZz4cDF; Tue, 25 Jan 2022 13:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643118417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F4qHpujaaMy+2hSx7hfMAm5U9ZILuaC7xkiKI0ZB7Oo=; b=uQCUUlltCCNkQ39alSSqpcsbm03lu67LUqD8LiZ7Yp5T54io5qqJhVcBOylqW0xupzHZyp Ygu5Do1RFB12Fhr7n7Bb/iVrk2qNMgkjyeLCei8j9gecZlSQGnXzS701NpZJJ8PBZg3mx9 vTccX/uObZlJ0h/ogIN/nk9AS9yrOjMR7aJ1v8r4w6prImYytUq5iMO5rJTIeyh4Dni8rU a37cLgJAhqwjPfCn/zGnTo3Y+ko7vpFX9zSk+DNtw5oC7KBcmNQdsN41oUX3Fp5t1waDDf D+knUIEQiTV7gYRz5Cc9qqXJP1VItJCFevHfeVpuynhr+7f3t/8teZSGexxbZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 60F8629DE; Tue, 25 Jan 2022 13:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20PDkvUS019736; Tue, 25 Jan 2022 13:46:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20PDkvlg019735; Tue, 25 Jan 2022 13:46:57 GMT (envelope-from git) Date: Tue, 25 Jan 2022 13:46:57 GMT Message-Id: <202201251346.20PDkvlg019735@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: cf6fc06c6227 - 2022Q1 - dns/unbound: Fix the aaaa-filter-iterator.patch List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: cf6fc06c62277cbafa756dc74137c9c70a3d8766 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643118417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F4qHpujaaMy+2hSx7hfMAm5U9ZILuaC7xkiKI0ZB7Oo=; b=SKFDqgbN5QHRS9TTwgkjbJeizfYYGOw8KdXK+gQoD47Bc9k3sAiYQpjRWsciGu+AvcblMg aNkz62vYcKXvIPSutwoTmQx62MajLpElX8nDd1M96acyfBc28MDgd+byo3j2tvAGF4g1Qy O1n/TiqaCfuLVsztXqw+5zTjmuL0AZcSCwMw6GZ1u2edcPzs82uvEQAODeUc+3aZwWEZ3F gQpPnyQ6ldhjxlScC6suTwRlhC2iPy1x6ttozs3UDc0vbtKQ5BCY0gTSyR38cQLKrMueAV MICmebk4mLjswkk2FLLXa/ajeD1wHtHq92GlgVuaJV5CrTr8/o4otOeNKNc7QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643118417; a=rsa-sha256; cv=none; b=QtkX7DAlKlO/nVmIsObEl4EiMbpc9R1c1wvYgi6DDfDuVBUrcRVAojDM9keVR7tKtZhFzk +GaXbByl/xjq77NPeE3PjnsjD8WJMdcfAwHMj+6cbtoHrcVyaNLaeZwT79pzjiGL/kpcbj mb1Rq8STO5mOLYYwDQMjdtGR4e4biEIItr3K0x2WKEdAE8uhLlok0p5lNDloIxgr0MR1wk 2ww+DdyAXxdjkKT6R7p+zu0HQ4w29i5SBSGxOTJK51eaxMTum3Uq475LyqML+7gRhMzdxG JXTpkv9GHXWHi3HVU3FcSRhuF7OwqTuYVLzANLXRbPT41/ri0ZvCCf1g0/OsYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=cf6fc06c62277cbafa756dc74137c9c70a3d8766 commit cf6fc06c62277cbafa756dc74137c9c70a3d8766 Author: Jaap Akkerhuis AuthorDate: 2022-01-25 13:11:23 +0000 Commit: Li-Wen Hsu CommitDate: 2022-01-25 13:46:37 +0000 dns/unbound: Fix the aaaa-filter-iterator.patch PR: 260553 Reported by: tech-lists@zyxst.net (cherry picked from commit 6eb036d0d6656a72d27b34557ed4bf1feb1cd4f0) --- .../files/patch-contrib_aaaa-filter-iterator.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dns/unbound/files/patch-contrib_aaaa-filter-iterator.patch b/dns/unbound/files/patch-contrib_aaaa-filter-iterator.patch new file mode 100644 index 000000000000..c3e5fa607c2b --- /dev/null +++ b/dns/unbound/files/patch-contrib_aaaa-filter-iterator.patch @@ -0,0 +1,35 @@ +--- contrib/aaaa-filter-iterator.patch.orig 2021-12-20 17:00:58 UTC ++++ contrib/aaaa-filter-iterator.patch +@@ -109,9 +109,9 @@ index 7bc67da6..e10f547a 100644 + iter_env->supports_ipv6 = cfg->do_ip6; + iter_env->supports_ipv4 = cfg->do_ip4; + + iter_env->aaaa_filter = cfg->aaaa_filter; ++ iter_env->outbound_msg_retry = cfg->outbound_msg_retry; + return 1; + } +- + diff --git a/iterator/iterator.c b/iterator/iterator.c + index 23b07ea9..ca29b48c 100644 + --- a/iterator/iterator.c +@@ -387,15 +387,15 @@ index 1d0e8658..f284dd43 100644 + %token VAR_PRIVATE_DOMAIN VAR_REMOTE_CONTROL VAR_CONTROL_ENABLE + %token VAR_CONTROL_INTERFACE VAR_CONTROL_PORT VAR_SERVER_KEY_FILE + %token VAR_SERVER_CERT_FILE VAR_CONTROL_KEY_FILE VAR_CONTROL_CERT_FILE +-@@ -233,6 +234,7 @@ content_server: server_num_threads | server_verbosity | server_port | ++@@ -244,6 +244,7 @@ content_server: server_num_threads | server_verbosity | server_port | + server_dlv_anchor_file | server_dlv_anchor | server_neg_cache_size | + server_harden_referral_path | server_private_address | +- server_private_domain | server_extended_statistics | ++ server_private_domain | server_extended_statistics | + + server_aaaa_filter | +- server_local_data_ptr | server_jostle_timeout | +- server_unwanted_reply_threshold | server_log_time_ascii | +- server_domain_insecure | server_val_sig_skew_min | +-@@ -1563,6 +1565,15 @@ server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG ++ server_local_data_ptr | server_jostle_timeout | ++ server_unwanted_reply_threshold | server_log_time_ascii | ++ ++@@ -1742,6 +1744,15 @@ server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG + yyerror("out of memory"); + } + ;