From nobody Wed Feb 08 15:52:05 2023 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 4PBkyY3XkVz3nYgb; Wed, 8 Feb 2023 15:52:05 +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 4PBkyY36mqz3KPm; Wed, 8 Feb 2023 15:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675871525; 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=hYp2FQAtlKiE/UtLzrXSlKGcsrRENo3nOjqbjhqAa6o=; b=mr+gJBwGyeP3VVzlq46BmEIeET/B4dAfFpdlUUFJttJa6L1B1zv2l79fUebMq0umlAhWwZ Rqc49SnOV1XXtR4w4FMxFFf7wSJepgCZgy7AgFhp4rTUVD5Mx2lF/t3up+NKZMZOPPOl+N Uu1P/jcS6onFlH30J6DfCygKP38DQLKgeeAyBc4Dpbd6tEZjF8cR5VKc3zLxYXMV2BfFCf iem2DGYgZnby/mVErwT0hmtA4xeum2FeyF5yF4TFSMHPG2RNU0LwgRjgEoq1MXdkf1hM15 j9XqJ6iYsOXqoku+NqWDnT9nI3IdCCknwlfhVNkYzWDK6RSoeBnWLrstUT99AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675871525; 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=hYp2FQAtlKiE/UtLzrXSlKGcsrRENo3nOjqbjhqAa6o=; b=DCmftL4i1bt751i7C7/FEURzMd9Z1jIPTULKXo7nGMf0BqnnwJ93imyW1M7xZTSFPbgnTK VGd5JZuLUjjGXM20cHlaGtjuQRPPZDSspOkgVtrcP1ezWR9Jd1ZUu8PQd5kSlcg+SSRjDA KxU+OmtAGPr399dsvGqfr7/WmaRZDGcxTirtNIxUUCb1v17SNW6Qa4L7TzFkGEgRRm5VxX 2XKH85W8IFrzY0zVTTrnJXdx3TjoD+vBrRI3GqHGedGzVNz3funBvMyK2dOxz4uoC6XLPD 2PdwBnGQuIT5AWYbdCfpQUg4J2FmmCAHyF3VbbYIXoSR+ICGoLLmSy5p0F0Flg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675871525; a=rsa-sha256; cv=none; b=FBh24aLvD9lRwqSKBb3T//KD3kLB84ytfTajtjsy7XM1Wy43RRdOLvUlEs7QMfceYERkN8 HmMtjTVqd7YtjRiNt+iRBVbCr3xuM99lH+Y9uWo3UWnaLYCYKK3EUtWFtK2uGnAye5zjck kgAkekWnIR9gK1jb46n0hh0E3IxPfPUMZRdDn4Fn8kTxwoLXLEg22jEnugUPx7digIFjcu +GBqnZSsC1JCrh8DH+WXmSruzGSiGX472QJ05BPxD1vWjaJMvE0mEeKsUwlLAwFUOtJEJb 4MQHJOeW5bbTC1MUA7HqQLgOqHGgNlhPTQ+9El81YY3PbNrXD4kaqwNA4x1nWw== 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 4PBkyY2BV7z12t2; Wed, 8 Feb 2023 15:52:05 +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 318Fq5R4019753; Wed, 8 Feb 2023 15:52:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 318Fq5bR019752; Wed, 8 Feb 2023 15:52:05 GMT (envelope-from git) Date: Wed, 8 Feb 2023 15:52:05 GMT Message-Id: <202302081552.318Fq5bR019752@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: cb79b14bfda6 - 2023Q1 - dns/unbound: fix build 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: cb79b14bfda68b7e2e779c596d12de0123bda417 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=cb79b14bfda68b7e2e779c596d12de0123bda417 commit cb79b14bfda68b7e2e779c596d12de0123bda417 Author: Fernando Apesteguía AuthorDate: 2023-02-08 15:46:19 +0000 Commit: Fernando Apesteguía CommitDate: 2023-02-08 15:46:19 +0000 dns/unbound: fix build Due to bad conflict resolution while cherry-picking. PR: 269407 Reported by: marcarianalexandru@gmail.com Fixes: b4f7886cf0032d73980c1cb49e9c7beb0da0a92c --- dns/unbound/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile index 65c928650e36..99733d2cd3c6 100644 --- a/dns/unbound/Makefile +++ b/dns/unbound/Makefile @@ -1,6 +1,5 @@ PORTNAME= unbound -DISTVERSION= 1.17.1 -PORTREVISION= 2 +DISTVERSION= 1.17.0 CATEGORIES= dns MASTER_SITES= https://www.nlnetlabs.nl/downloads/unbound/