UPDATE: neovim-0.3.8

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: neovim-0.3.8

Edd Barrett-3
Hi all,

Here's an update to neovim-0.3.8.

I was expecting to need to update the Python modules, but our package is still
at the newest version.

You may notice the following in `:checkhealth`:
---8<---
  - ERROR: Detected pip upgrade failure: Python executable can import "pynvim" but not "neovim": python2.7
    - ADVICE:
      - Use that Python version to reinstall "pynvim" and optionally "neovim".
          pip uninstall pynvim neovim
          pip install pynvim
          pip install neovim  # only if needed by third-party software
--->8---

If you were to install pynvim with pip, it'd make a module alias to the
module's old name 'neovim'. Since we are using pynvim from an OpenBSD package,
and since we have no packages which consume the old module name, we can ignore
this.

I'll be testing over the next few days.

OK?


Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/neovim/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 6 Jun 2019 16:35:41 -0000 1.16
+++ Makefile 4 Jul 2019 09:54:28 -0000
@@ -4,15 +4,14 @@ COMMENT = continuation and extension of
 
 GH_ACCOUNT = neovim
 GH_PROJECT = neovim
-GH_TAGNAME = v0.3.4
-REVISION = 1
+GH_TAGNAME = v0.3.8
 
 CATEGORIES = editors devel
 HOMEPAGE = http://neovim.org
 MAINTAINER = Edd Barrett <[hidden email]>
 
 # 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,7 +55,7 @@ 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}
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 09:17:04 -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

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: neovim-0.3.8

Paco Esteban
On Thu, 04 Jul 2019, Edd Barrett wrote:

> Hi all,

Hi Edd

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/editors/neovim/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile 6 Jun 2019 16:35:41 -0000 1.16
> +++ Makefile 4 Jul 2019 09:54:28 -0000
> @@ -4,15 +4,14 @@ COMMENT = continuation and extension of
>  
>  GH_ACCOUNT = neovim
>  GH_PROJECT = neovim
> -GH_TAGNAME = v0.3.4
> -REVISION = 1
> +GH_TAGNAME = v0.3.8
>  
>  CATEGORIES = editors devel
>  HOMEPAGE = http://neovim.org
>  MAINTAINER = Edd Barrett <[hidden email]>
>  
>  # 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,7 +55,7 @@ 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}

For some reason this does not apply cleanly, at least for me afther a
cvs up. It may be because currentlu we have REVISION = 2 at CVS not 1 ??

This is the Makefile.rej I get:

@@ -4,15 +4,14 @@
 
 GH_ACCOUNT = neovim
 GH_PROJECT = neovim
-GH_TAGNAME = v0.3.4
-REVISION = 1
+GH_TAGNAME = v0.3.8
 
 CATEGORIES = editors devel
 HOMEPAGE = http://neovim.org
 MAINTAINER = Edd Barrett <[hidden email]>
 
 # 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

I'll try it too, this is my $EDITOR ;-)

Cheers,

--
Paco Esteban.
https://onna.be/gpgkey.asc
9A6B 6083 AD9E FDC2 0EAF  5CB3 5818 130B 8A6D BC03

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: neovim-0.3.8

Edd Barrett-3
On Thu, Jul 04, 2019 at 03:46:23PM +0200, Paco Esteban wrote:
> For some reason this does not apply cleanly, at least for me afther a
> cvs up. It may be because currentlu we have REVISION = 2 at CVS not 1 ??

Oops, I was a little out of date. It's just the recent REVISION bump.

Here's an updated diff:

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 5 Jul 2019 08:47:30 -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
 MAINTAINER = Edd Barrett <[hidden email]>
 
 # 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,7 +55,7 @@ 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}
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

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: neovim-0.3.8

Edd Barrett-3
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 <[hidden email]>
 
 # 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