On Fri, Jul 05, 2019 at 10:08:54AM +0100, Edd Barrett wrote: > Here's an updated diff:
And one more with kn@'s suggestions applied: * Update homepage to the proper https one. * Simplify test invocation. I have an OK; will commit shortly if no one has objections. P.S. We've made a little progress on the test failure here: https://github.com/neovim/neovim/issues/10420 Index: Makefile =================================================================== RCS file: /cvs/ports/editors/neovim/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile 25 Jun 2019 20:25:20 -0000 1.17 +++ Makefile 6 Jul 2019 11:20:49 -0000 @@ -4,15 +4,14 @@ COMMENT = continuation and extension of GH_ACCOUNT = neovim GH_PROJECT = neovim -GH_TAGNAME = v0.3.4 -REVISION = 2 +GH_TAGNAME = v0.3.8 CATEGORIES = editors devel -HOMEPAGE = http://neovim.org +HOMEPAGE = https://neovim.io MAINTAINER = Edd Barrett <[email protected]> # Apache 2.0 + Vim License -PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE = Yes WANTLIB += c iconv intl ${MODLUA_WANTLIB} m msgpackc pthread termkey WANTLIB += unibilium util uv vterm @@ -56,9 +55,9 @@ TEST_DEPENDS = shells/bash \ # "busted" test suite for Lua, which is not yet ported. # # There is currently one (minor) test failure: -# https://github.com/neovim/neovim/issues/9704 +# https://github.com/neovim/neovim/issues/10420 do-test: - cd ${WRKSRC} && env LC_CTYPE=en_US.UTF-8 ${MAKE_PROGRAM} \ - -C src/nvim/testdir NVIM_PRG=${WRKBUILD}/bin/nvim ${MAKE_FLAGS} + cd ${WRKSRC}/src/nvim/testdir && env LC_CTYPE=en_US.UTF-8 \ + ${MAKE_PROGRAM} NVIM_PRG=${WRKBUILD}/bin/nvim ${MAKE_FLAGS} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/editors/neovim/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 17 Mar 2019 13:13:40 -0000 1.5 +++ distinfo 4 Jul 2019 10:10:20 -0000 @@ -1,2 +1,2 @@ -SHA256 (neovim-0.3.4.tar.gz) = pkEQi96/rzGYRO1Gsb811vfDDvWurespugbhnDJ0vA4= -SIZE (neovim-0.3.4.tar.gz) = 9231575 +SHA256 (neovim-0.3.8.tar.gz) = lT4TRWjYJNrXy/Mu4xFJUXMvmnUMRi5DDmtZP0GK92w= +SIZE (neovim-0.3.8.tar.gz) = 9233661 Index: patches/patch-src_nvim_getchar_c =================================================================== RCS file: patches/patch-src_nvim_getchar_c diff -N patches/patch-src_nvim_getchar_c --- patches/patch-src_nvim_getchar_c 6 Jun 2019 16:35:41 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -$OpenBSD: patch-src_nvim_getchar_c,v 1.1 2019/06/06 16:35:41 edd Exp $ - -Security patch: Source command doesn't check for the sandbox. -https://github.com/neovim/neovim/pull/10082 - -Detailed description: -https://github.com/numirias/security/blob/master/doc/2019-06-04_ace-vim-neovim.md - -Index: src/nvim/getchar.c ---- src/nvim/getchar.c.orig -+++ src/nvim/getchar.c -@@ -1244,6 +1244,13 @@ openscript ( - EMSG(_(e_nesting)); - return; - } -+ -+ // Disallow sourcing a file in the sandbox, the commands would be executed -+ // later, possibly outside of the sandbox. -+ if (check_secure()) { -+ return; -+ } -+ - if (ignore_script) - /* Not reading from script, also don't open one. Warning message? */ - return; -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
