git: 15f85ad99e9c - main - editors/neovim: Add support for UseBlocklist as a preferred alias for UseBlacklist

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Adam Weinberger <adamw_at_FreeBSD.org>
Date: Wed, 26 Oct 2022 10:59:51 UTC

The branch main has been updated by adamw:

URL: https://cgit.FreeBSD.org/ports/commit/?id=15f85ad99e9c2aef4bbc5766debe5ea537e0f4a9

commit 15f85ad99e9c2aef4bbc5766debe5ea537e0f4a9
Author:     Jose Luis Duran <jlduran@gmail.com>
AuthorDate: 2022-10-26 10:57:43 +0000
Commit:     Adam Weinberger <adamw@FreeBSD.org>
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