From nobody Wed Oct 26 10:59:51 2022 X-Original-To: dev-commits-ports-all@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 4My5Rr1Yzjz4gkfZ; Wed, 26 Oct 2022 10:59:52 +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 4My5Rr0zcdz3v2t; Wed, 26 Oct 2022 10:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666781992; 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=BkakAOqNDXPShTkw2CPpzOdXAKybDwJtFE/VNKZMWPw=; b=PoYe2+qJdPhU7gxViTTd5ZoqMsE5wscAbhi20yQimrBSigNuckrI2pf8r0DTl/1tTa9e54 wrQmfegYxaXGRAuNeOPojXSHBgF/F0RjnMjA7gERTJvL0mmT2op9+n04vOl1H4QFHfSj1I ktaQDOJx3B9c3baYuFxFt8WECF9Qke1LqOHPZernKEB1EOmvk/vaMJL/Jq3ePF1Ju5Bb2T 0OK+Wd8xbTbtAYhRZCl3cOyNZeO2oGgFbLsm/CWWD7/CFT4mbX1TUzNQeUY3vQgTnVtrMh VXsEiBVFy/z0q4dgOb3/bHoFH0LVGy21OJ+RFV1TQDiDBo5/vWWJ2mbwqRAYWQ== 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 4My5Rq73LJzFgH; Wed, 26 Oct 2022 10:59:51 +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 29QAxp4c090361; Wed, 26 Oct 2022 10:59:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29QAxpXa090360; Wed, 26 Oct 2022 10:59:51 GMT (envelope-from git) Date: Wed, 26 Oct 2022 10:59:51 GMT Message-Id: <202210261059.29QAxpXa090360@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: 15f85ad99e9c - main - editors/neovim: Add support for UseBlocklist as a preferred alias for UseBlacklist List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15f85ad99e9c2aef4bbc5766debe5ea537e0f4a9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666781992; 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=BkakAOqNDXPShTkw2CPpzOdXAKybDwJtFE/VNKZMWPw=; b=Rwsa693CGWI5d0iA/AwIL4BzJwsmCclk5R2MZkciNXcsokuxnLzgMYNChOKFIK9BdSNXx9 kn9XM1M5scMd4SsxiucdOSRSVmp3CWpvkZVPWU4bqTo95hATxbhY1JWr9fBKGCCvZQvdod weMvZeWS91jFrlcM4jWrpmIeCZ6Qk4TNHmyvzRvdv5ezNLsB+0wLyLoQB/2Ekhg24LE4eS vJKbfNaihirlK5Oo1bfn7rLCYeGAlKDaQdEO2RvptkID8Nu3G4SDwRJBud6v9XniLi0Los uRpUpTmK7CyKuqz9/bghWmJS7k7WW0DjjDBgM87sJ9zD4oFxhvvaJzea6E4eqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666781992; a=rsa-sha256; cv=none; b=ju2ivlsBp00JiPAwx3cx47bkhs0WfJnaR6/7lV3CQgd5enVlZmLU/TDIcqt6kSD+mqx6LD 6QtNiU3JgZTmakchWV/1auIlXbwVAOz3Z5PjXCgpvN1/k2cBr9XlhxtEhZRrO1rmCR5u5T rV/SDEuBrTxzfTRFrsxDHkowLGV3pNA4uO2ujZRpjW/VP/AOaClpjNGoC2e3bc8xWFDKtm aUtJAsiZ9JmV6aiOMo6QtgMmaKM184JNstxpQ9WEl8BegesvXYuOVnVNg4rN7K6PNtdH3m YSkvxOzSly0YWN5Bt0KQv7HSmgi6bnhTDYUKg/9hrWANwZalmssTf56bEn6iEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=15f85ad99e9c2aef4bbc5766debe5ea537e0f4a9 commit 15f85ad99e9c2aef4bbc5766debe5ea537e0f4a9 Author: Jose Luis Duran AuthorDate: 2022-10-26 10:57:43 +0000 Commit: Adam Weinberger CommitDate: 2022-10-26 10:59:31 +0000 editors/neovim: Add support for UseBlocklist as a preferred alias for UseBlacklist PR: 267354 --- editors/neovim/Makefile | 2 +- ...shdconfig-UseBlacklist => patch-runtime_syntax_sshdconfig.vim} | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile index c59921b92b76..c7aa54e0af63 100644 --- a/editors/neovim/Makefile +++ b/editors/neovim/Makefile @@ -1,7 +1,7 @@ PORTNAME= neovim DISTVERSIONPREFIX= v DISTVERSION= 0.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MAINTAINER= adamw@FreeBSD.org diff --git a/editors/neovim/files/patch-sshdconfig-UseBlacklist b/editors/neovim/files/patch-runtime_syntax_sshdconfig.vim similarity index 59% rename from editors/neovim/files/patch-sshdconfig-UseBlacklist rename to editors/neovim/files/patch-runtime_syntax_sshdconfig.vim index 7523d1feb39c..add09834c402 100644 --- a/editors/neovim/files/patch-sshdconfig-UseBlacklist +++ b/editors/neovim/files/patch-runtime_syntax_sshdconfig.vim @@ -1,10 +1,16 @@ +blacklistd has been renamed to blocklistd, so UseBlocklist +is the preferred alias for UseBlacklist. + +See https://github.com/freebsd/freebsd-src/commit/e426c743 + --- runtime/syntax/sshdconfig.vim.orig 2018-07-26 22:51:00 UTC +++ runtime/syntax/sshdconfig.vim -@@ -221,6 +221,7 @@ syn keyword sshdconfigKeyword Subsystem +@@ -221,6 +221,8 @@ syn keyword sshdconfigKeyword Subsystem syn keyword sshdconfigKeyword SyslogFacility syn keyword sshdconfigKeyword TCPKeepAlive syn keyword sshdconfigKeyword TrustedUserCAKeys +syn keyword sshdconfigKeyword UseBlacklist ++syn keyword sshdconfigKeyword UseBlocklist syn keyword sshdconfigKeyword UseDNS syn keyword sshdconfigKeyword UseLogin syn keyword sshdconfigKeyword UsePAM