Fix snprintf buffer overflow with tags

resolves: rhbz#2181836
Fix snprintf buffer overflow
2023-04-06 11:16:05 +02:00 · 2023-04-06 11:16:04 +02:00 · 2023-04-06 11:16:03 +02:00 · 2023-04-06 11:16:01 +02:00 · 2023-04-06 11:15:59 +02:00 · 2023-02-02 15:47:53 +01:00
13 changed files with 2204 additions and 660 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,3 @@
-/*.log
-/*.rpm
-/series
-/x86_64/
-/results_neovim/
 /neovim-0.1.7.tar.gz
 /neovim-0.2.0.tar.gz
 /neovim-0.2.1.tar.gz
@ -29,39 +24,3 @@
 /neovim-0.8.1.tar.gz
 /neovim-0.8.2.tar.gz
 /neovim-0.8.3.tar.gz
-/neovim-0.9.0.tar.gz
-/neovim-0.9.1.tar.gz
-/neovim-0.9.2.tar.gz
-/neovim-0.9.4.tar.gz
-/neovim-0.9.5.tar.gz
-/neovim-0.10.0.tar.gz
-/neovim-0.10.0-vendor.tar.gz
-/neovim-0.10.1.tar.gz
-/neovim-0.10.1-vendor.tar.gz
-/neovim-0.10.1-vendor-treesitter.tar.gz
-/neovim-0.10.2.tar.gz
-/neovim-0.10.2-vendor.tar.gz
-/neovim-0.10.2-vendor-treesitter.tar.gz
-/neovim-0.10.3.tar.gz
-/neovim-0.10.3-vendor.tar.gz
-/neovim-0.10.3-vendor-treesitter.tar.gz
-/neovim-0.10.4.tar.gz
-/neovim-0.10.4-vendor.tar.gz
-/neovim-0.10.4-vendor-treesitter.tar.gz
-/neovim-0.11.0.tar.gz
-/neovim-0.11.0-vendor.tar.gz
-/neovim-0.11.0-vendor-treesitter.tar.gz
-/neovim-0.11.1.tar.gz
-/neovim-0.11.1-vendor.tar.gz
-/neovim-0.11.1-vendor-treesitter.tar.gz
-/neovim-0.11.2.tar.gz
-/neovim-0.11.2-vendor.tar.gz
-/neovim-0.11.2-vendor-treesitter.tar.gz
-/neovim-0.11.3.tar.gz
-/neovim-0.11.3-vendor.tar.gz
-/neovim-0.11.3-vendor-treesitter.tar.gz
-/neovim-0.11.4.tar.gz
-/neovim-0.11.4-vendor.tar.gz
-/neovim-0.11.4-vendor-treesitter.tar.gz
-/neovim-0.11.5.tar.gz
-/neovim-0.11.5-vendor.tar.gz
--- a/22729.patch
+++ b/22729.patch
@ -0,0 +1,52 @@
+From a917104263ac6dda15a9c9b7ab61e3378aec58a9 Mon Sep 17 00:00:00 2001
+From: koeleck <779769+koeleck@users.noreply.github.com>
+Date: Sun, 19 Mar 2023 22:32:37 +0100
+Subject: [PATCH] fix: invalid buffer size argument to snprintf #22729
+
+Problem:
+Crash in findtags_add_match with FORTIFY_SOURCE=3.
+Note: Fedora 38 packages are now built with -D_FORTIFY_SOURCE=3 by default.
+1. Compile with overflow protection.
+2. nvim --clean
+3. :h <Space> <Tab>
+4. `*** overflow detected ***: terminated`
+
+The additional checks for the stated buffer size and the actual bounds
+of the buffer do not match. See `___snprintf_chk` in the glibc sources:
+https://sourceware.org/git/?p=glibc.git;a=blob;f=debug/snprintf_chk.c;h=59577de076c570b81307dd31c8c73e265808cf4c;hb=HEAD#l28
+
+Solution:
+Fix arithmetic error: The length of the previously written data is now
+subtracted from the total size of the buffer, instead of added on top.
+
+close #22718
+
+Backported by: Andreas Schneider <asn@cryptomilk.org>
+---
+ src/nvim/tag.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/nvim/tag.c b/src/nvim/tag.c
+index a8d8eebb0..501f31196 100644
+--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
+@@ -2029,13 +2029,14 @@ parse_line:
+             // The format is {tagname}@{lang}NUL{heuristic}NUL
+             *tagp.tagname_end = NUL;
+             len = (size_t)(tagp.tagname_end - (char_u *)tagp.tagname);
+-            mfp = xmalloc(sizeof(char) + len + 10 + ML_EXTRA + 1);
+            size_t mfp_size = sizeof(char) + len + 10 + ML_EXTRA + 1;
+            mfp = xmalloc(mfp_size);
+ 
+             p = (char_u *)mfp;
+             STRCPY(p, tagp.tagname);
+             p[len] = '@';
+             STRCPY(p + len + 1, help_lang);
+-            snprintf((char *)p + len + 1 + ML_EXTRA, STRLEN(p) + len + 1 + ML_EXTRA, "%06d",
+            snprintf(p + len + 1 + ML_EXTRA, mfp_size - (len + 1 + ML_EXTRA), "%06d",
+                      help_heuristic(tagp.tagname,
+                                     match_re ? matchoff : 0, !match_no_ic)
+                      + help_pri);
+-- 
+2.39.2
+
--- a/22780.patch
+++ b/22780.patch
@ -0,0 +1,158 @@
+From a4640cc51fda6b5688c9b79c2d4d7d19e6d758a3 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Sat, 25 Mar 2023 11:26:36 +0100
+Subject: [PATCH] fix: snprintf buffer overflow detected by -D_FORTIFY_SOURCE=3
+
+Thread no. 1 (24 frames)
+ #8 snprintf at /usr/include/bits/stdio2.h:54
+ #9 set_cmdarg at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/eval.c:7044
+ #10 apply_autocmds_group at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/autocmd.c:1843
+ #11 apply_autocmds_exarg at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/autocmd.c:1549
+ #12 readfile at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/fileio.c:617
+ #13 buf_reload at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/fileio.c:5038
+ #14 buf_check_timestamp at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/fileio.c:4952
+ #15 check_timestamps at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/fileio.c:4678
+ #16 ex_checktime at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/ex_cmds2.c:765
+ #17 execute_cmd0 at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/ex_docmd.c:1620
+ #18 do_one_cmd at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/ex_docmd.c:2275
+ #19 do_cmdline at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/ex_docmd.c:584
+ #20 ex_execute at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/eval.c:7727
+ #21 execute_cmd0 at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/ex_docmd.c:1620
+ #22 do_one_cmd at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/ex_docmd.c:2275
+ #23 do_cmdline at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/ex_docmd.c:584
+ #24 do_ucmd at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/usercmd.c:1661
+ #25 execute_cmd0 at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/ex_docmd.c:1612
+ #26 do_one_cmd at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/ex_docmd.c:2275
+ #27 do_cmdline at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/ex_docmd.c:584
+ #28 nv_colon at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/normal.c:4058
+ #29 normal_execute at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/normal.c:1172
+ #30 state_enter at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/state.c:88
+ #31 normal_enter at /usr/src/debug/neovim-0.8.2-2.fc38.x86_64/src/nvim/normal.c:471
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+---
+ src/nvim/eval.c | 73 +++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 55 insertions(+), 18 deletions(-)
+
+diff --git a/src/nvim/eval.c b/src/nvim/eval.c
+index cd76d1108..c652d9507 100644
+--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
+@@ -6999,20 +6999,18 @@ char *set_cmdarg(exarg_T *eap, char *oldarg)
+ {
+   char *oldval = vimvars[VV_CMDARG].vv_str;
+   if (eap == NULL) {
+-    xfree(oldval);
+-    vimvars[VV_CMDARG].vv_str = oldarg;
+-    return NULL;
+    goto error;
+   }
+ 
+   size_t len = 0;
+   if (eap->force_bin == FORCE_BIN) {
+-    len = 6;
+    len += 6;  // " ++bin"
+   } else if (eap->force_bin == FORCE_NOBIN) {
+-    len = 8;
+    len += 8;  // " ++nobin"
+   }
+ 
+   if (eap->read_edit) {
+-    len += 7;
+    len += 7;  // " ++edit"
+   }
+ 
+   if (eap->force_ff != 0) {
+@@ -7027,38 +7025,77 @@ char *set_cmdarg(exarg_T *eap, char *oldarg)
+ 
+   const size_t newval_len = len + 1;
+   char *newval = xmalloc(newval_len);
+  size_t xlen = 0;
+  int rc = 0;
+ 
+   if (eap->force_bin == FORCE_BIN) {
+-    snprintf(newval, newval_len, " ++bin");
+    rc = snprintf(newval, newval_len, " ++bin");
+   } else if (eap->force_bin == FORCE_NOBIN) {
+-    snprintf(newval, newval_len, " ++nobin");
+    rc = snprintf(newval, newval_len, " ++nobin");
+   } else {
+     *newval = NUL;
+   }
+  if (rc < 0) {
+    goto error;
+  }
+  xlen += (size_t)rc;
+ 
+   if (eap->read_edit) {
+-    STRCAT(newval, " ++edit");
+    rc = snprintf(newval + xlen, newval_len - xlen, " ++edit");
+    if (rc < 0) {
+      goto error;
+    }
+    xlen += (size_t)rc;
+   }
+ 
+   if (eap->force_ff != 0) {
+-    snprintf(newval + strlen(newval), newval_len, " ++ff=%s",
+-             eap->force_ff == 'u' ? "unix" :
+-             eap->force_ff == 'd' ? "dos" : "mac");
+    rc = snprintf(newval + xlen,
+                  newval_len - xlen,
+                  " ++ff=%s",
+                  eap->force_ff == 'u'   ? "unix"
+                  : eap->force_ff == 'd' ? "dos" : "mac");
+    if (rc < 0) {
+      goto error;
+    }
+    xlen += (size_t)rc;
+   }
+   if (eap->force_enc != 0) {
+-    snprintf(newval + strlen(newval), newval_len, " ++enc=%s",
+-             eap->cmd + eap->force_enc);
+    rc = snprintf(newval + (xlen), newval_len - xlen, " ++enc=%s", eap->cmd + eap->force_enc);
+    if (rc < 0) {
+      goto error;
+    }
+    xlen += (size_t)rc;
+   }
+
+   if (eap->bad_char == BAD_KEEP) {
+-    STRCPY(newval + strlen(newval), " ++bad=keep");
+    rc = snprintf(newval + xlen, newval_len - xlen, " ++bad=keep");
+    if (rc < 0) {
+      goto error;
+    }
+    xlen += (size_t)rc;
+   } else if (eap->bad_char == BAD_DROP) {
+-    STRCPY(newval + strlen(newval), " ++bad=drop");
+    rc = snprintf(newval + xlen, newval_len - xlen, " ++bad=drop");
+    if (rc < 0) {
+      goto error;
+    }
+    xlen += (size_t)rc;
+   } else if (eap->bad_char != 0) {
+-    snprintf(newval + strlen(newval), newval_len, " ++bad=%c",
+-             eap->bad_char);
+    rc = snprintf(newval + xlen, newval_len - xlen, " ++bad=%c", eap->bad_char);
+    if (rc < 0) {
+      goto error;
+    }
+    xlen += (size_t)rc;
+   }
+
+  assert(xlen <= newval_len);
+
+   vimvars[VV_CMDARG].vv_str = newval;
+   return oldval;
+
+error:
+  xfree(oldval);
+  vimvars[VV_CMDARG].vv_str = oldarg;
+  return NULL;
+ }
+ 
+ /// Check if variable "name[len]" is a local variable or an argument.
+-- 
+2.39.2
+
--- a/README.md
+++ b/README.md
@ -1,10 +0,0 @@
-# neovim
-
-The hyper-extensible Vim-based text editor
-
-## Updating the package
-
-* Update the version in the spec file
-* Download the new tarball
-* Add the tarball with `fedpkg new-sources neovim-<version>.tar.gz`
-* Run `bash mkvendor.sh`
--- a/294
+++ b/294
@ -1,294 +0,0 @@
-* Mon Mar 04 2024 Andreas Schneider <asn@redhat.com> - 0.9.5-4
- resolves: #2222911 - Build with luajit on s390x
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Jan 02 2024 Andreas Schneider <asn@redhat.com> - 0.9.5-1
- Update to version 0.9.5
-  * https://github.com/neovim/neovim/releases/tag/v0.9.5
-  * For bigger version bump changelog see `:help news`
-  * resolves: rhbz#2256278
-
-* Fri Oct 20 2023 Andreas Schneider <asn@redhat.com> - 0.9.4-1
- Update to version 0.9.4
-  * https://github.com/neovim/neovim/releases/tag/v0.9.4
-  * For bigger version bump changelog see `:help news`
-  * resolves: rhbz#2243010
-
-* Thu Sep 07 2023 Andreas Schneider <asn@redhat.com> - 0.9.2-1
- Update to version 0.9.2
-  * For changelog see `:help news`
-
-* Mon Aug 28 2023 LuK1337 <priv.luk@gmail.com> - 0.9.1-4
- Improve spec template
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jun 06 2023 Andreas Schneider <asn@redhat.com> - 0.9.1-2
- Build with new libluv-devel
-
-* Wed May 31 2023 Andreas Schneider <asn@redhat.com> - 0.9.1-1
- Update to version 0.9.1
-  * For changelog see `:help news`
-
-* Tue May 02 2023 Andreas Schneider <asn@redhat.com> - 0.9.0-3
- Improve semantic token performance
- related: rhbz#2188229 - Fix applying patches
-
-* Fri Apr 21 2023 Andreas Schneider <asn@redhat.com> - 0.9.0-2
- resolves: rhbz#2188229 - Fix buffer overflow for user command
-
-* Fri Apr 07 2023 Andreas Schneider <asn@redhat.com> - 0.9.0-1
- Update to version 0.9.0
-  * For changelog see `:help news`
-
-* Mon Mar 27 2023 Andreas Schneider <asn@redhat.com> - 0.8.3-4
- resolves: rhbz#2181836 - Fix snprintf buffer overflow with tags
-
-* Sat Mar 25 2023 Andreas Schneider <asn@redhat.com> - 0.8.3-3
- resolves: rhbz#2165805 - Fix snprintf buffer overflow
-
-* Sun Mar 05 2023 Andreas Schneider <asn@redhat.com> - 0.8.3-2
- Update License to SPDX expression
- Update spec template for auto(release|changelog)
-
-* Thu Feb 02 2023 Andreas Schneider <asn@redhat.com> - 0.8.3-1
- Update to version 0.8.3
-  * https://github.com/neovim/neovim/releases/tag/v0.8.3
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Dec 30 2022 Andreas Schneider <asn@redhat.com> - 0.8.2-1
- Update to version 0.8.2
-  * https://github.com/neovim/neovim/releases/tag/v0.8.2
-
-* Mon Nov 14 2022 Andreas Schneider <asn@redhat.com> - 0.8.1-1
- Update to version 0.8.1
-  * https://github.com/neovim/neovim/releases/tag/v0.8.1
-
-* Fri Sep 30 2022 Andreas Schneider <asn@redhat.com> - 0.8.0-1
- Update to version 0.8.0
-  * https://github.com/neovim/neovim/releases/tag/v0.8.0
-
-* Wed Sep 21 2022 Andreas Schneider <asn@redhat.com> - 0.7.2-4
- Build with libvterm 0.3
-
-* Thu Aug 25 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.7.2-3
- Enforce the minimum tree-sitter version at runtime (Fixes: rhbz#2100577)
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sun Jun 26 2022 Andreas Schneider <asn@redhat.com> - 0.7.2-1
- Update to version 0.7.2
-
-* Fri Apr 15 2022 Andreas Schneider <asn@redhat.com> - 0.7.0-1
- Update to version 0.7.0
-
-* Thu Mar 17 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.6.1-4
- Support building on EPEL 8
-
-* Wed Feb 09 2022 Andreas Schneider <asn@redhat.com> - 0.6.1-3
- Fix libvterm 0.2 support
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Jan 01 2022 Andreas Schneider <asn@redhat.com> - 0.6.1-1
- Update to version 0.6.1
-
-* Wed Dec 01 2021 Andreas Schneider <asn@redhat.com> - 0.6.0-1
- Update to version 0.6.0
-
-* Thu Oct 28 2021 Andreas Schneider <asn@redhat.com> - 0.5.1-2
- Use luajit also on aarch64
-
-* Mon Sep 27 2021 Andreas Schneider <asn@redhat.com> - 0.5.1-1
- Update to version 0.5.1
-
-* Fri Jul 30 2021 Andreas Schneider <asn@redhat.com> - 0.5.0-5
- Build with luajit2.1-luv when we use luajit
-
-* Fri Jul 30 2021 Andreas Schneider <asn@redhat.com> - 0.5.0-4
- resolves: rhbz#1983288 - Build with lua-5.1 on platforms where luajit is not
-  available
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jul 08 2021 Andreas Schneider <asn@redhat.com> - 0.5.0-2
- Fixed execute bits of bat and awk files
-
-* Mon Jul 05 2021 Andreas Schneider <asn@redhat.com> - 0.5.0-1
- Raise BuildRequires for some libraries
-
-* Sat Jul 03 2021 Andreas Schneider <asn@redhat.com> - 0.5.0-0
- Update to version 0.5.0
-  * https://github.com/neovim/neovim/releases/tag/v0.5.0
-
-* Mon Apr 19 2021 Andreas Schneider <asn@redhat.com> - 0.4.4-5
- resolves: #1909495 - Load installed vim plugins
- Make build reproducible
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Sep  1 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.4.4-3
- When using Lua 5.4, also pull in lua-bit32 at installation
-
-* Mon Aug 31 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.4.4-2
- Do not hardcode Lua version
- Patch to support detecting Lua 5.4
- Pull in lua-bit32 when built against Lua 5.4
-
-* Wed Aug 05 2020 Andreas Schneider <asn@redhat.com> - 0.4.4-1
- Update to version 0.4.4
- Use new cmake macros
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.3-8
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Mar 22 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.4.3-6
- Update build requirements
-
-* Sun Feb 23 2020 Andreas Schneider <asn@redhat.com> - 0.4.3-5
- Update to upstream patchset for -fno-common
-
-* Mon Feb 17 2020 Andreas Schneider <asn@redhat.com> - 0.4.3-4
- Update patchset for -fno-common
-
-* Mon Feb 17 2020 Andreas Schneider <asn@redhat.com> - 0.4.3-3
- resolves: #1799680 - Fix -fno-common issues
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Nov 07 2019 Andreas Schneider <asn@redhat.com> - 0.4.3-1
- Update to version 0.4.3
-
-* Mon Oct 28 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.2-2
- Fix glitches for terminals sayin xterm but not xterm
-
-* Thu Oct 03 2019 Andreas Schneider <asn@redhat.com> - 0.4.2-1
- Update to version 0.4.2
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jul 05 2019 Andreas Schneider <asn@redhat.com> - 0.3.8-1
- Update to version 0.3.8
-
-* Wed May 29 2019 Andreas Schneider <asn@redhat.com> - 0.3.7-1
- Update to version 0.3.7
-
-* Wed May 29 2019 Andreas Schneider <asn@redhat.com> - 0.3.6-1
- resolves: #1714849 - Update to version 0.3.6
-
-* Tue May 07 2019 Andreas Schneider <asn@redhat.com> - 0.3.5-1
- resolves: #1703867 - Update to version 0.3.5
-
-* Wed Mar 06 2019 Aron Griffis <aron@scampersand.com> - 0.3.4-1
- Update to version 0.3.4 with luajit, rhbz #1685781
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 07 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3.3-2
- Remove Recommends: xterm
-
-* Sun Jan 06 2019 Andreas Schneider <asn@redhat.com> - 0.3.3-1
- Update to version 0.3.3
-
-* Wed Jan 02 2019 Andreas Schneider <asn@redhat.com> - 0.3.2-1
- Update to version 0.3.2
-
-* Fri Aug 10 2018 Andreas Schneider <asn@redhat.com> - 0.3.1-1
- Update to version 0.3.1
-
-* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 0.3.0-6
- Rebuild with fixed binutils
-
-* Fri Jul 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3.0-5
- Rebuild for new binutils
-
-* Fri Jul 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3.0-4
- Disable jemalloc
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Andreas Schneider <asn@redhat.com> - 0.3.0-2
- resolves: #1592474 - Add jemalloc as a requirement
-
-* Mon Jun 11 2018 Andreas Schneider <asn@redhat.com> - 0.3.0-1
- Update to version 0.3.0
- resolves: #1450624 - Set default python_host_prog
-
-* Sat May 26 2018 Andreas Schneider <asn@redhat.com> - 0.2.2-3
- Rebuild against unibilium-2.0.0
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sat Dec 23 2017 Andreas Schneider <asn@redhat.com> - 0.2.2-1
- resolves: #1510899 - Update to version 0.2.2
-
-* Wed Nov 08 2017 Andreas Schneider <asn@redhat.com> - 0.2.1-1
- resolves: #1510762 - Update to version 0.2.1
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed May 31 2017 Than Ngo <than@redhat.com> 0.2.0-3
- fixed bz#1451143, ppc64/le build failure
-
-* Mon May 15 2017 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.2.0-2
- Adjust spec for building on epel7
-
-* Mon May 08 2017 Andreas Schneider <asn@redhat.com> - 0.2.0-1
- resolves: #1447481 - Update to 0.2.0
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Dec 29 2016 Filip Szymański <fszymanski at, fedoraproject.org> - 0.1.7-6
- Add RPM spec file template
-
-* Thu Dec 08 2016 Filip Szymański <fszymanski at, fedoraproject.org> - 0.1.7-5
- Add recommends for python2-neovim and xsel
- Remove unused CMake options
- Use %%make_build and %%make_install macros
- Remove unnecessary %%defattr directive
-
-* Mon Dec 05 2016 Andreas Schneider <asn@redhat.com> - 0.1.7-4
- Set license file correctly
-
-* Mon Dec 05 2016 Andreas Schneider <asn@redhat.com> - 0.1.7-3
- Update build requires
-
-* Mon Dec 05 2016 Andreas Schneider <asn@redhat.com> - 0.1.7-2
- Add Recommends for python3-neovim
- Use 'bit32' from lua 5.3
-
-* Mon Nov 28 2016 Andreas Schneider <asn@redhat.com> - 0.1.7-1
- Update to version 0.1.7
-
-* Tue Nov 15 2016 Andreas Schneider <asn@redhat.com> - 0.1.6-2
- Removed Group:
- Removed BuildRoot:
-
-* Thu Nov 10 2016 Andreas Schneider <asn@redhat.com> - 0.1.6-1
- Initial version 0.1.6
--- a/mkvendor.sh
+++ b/mkvendor.sh
@ -1,61 +0,0 @@
-#!/usr/bin/bash -x
-
-set -euo pipefail
-
-nvim_url="$(rpmspec -P neovim.spec | sed -En 's/^Source0:[[:space:]]+//p')"
-nvim_archive="$(basename "$nvim_url")"
-nvim_tmpdir="$(mktemp --tmpdir -d nvim-XXXXXXXX)"
-nvim_srcdir="$(pwd)"
-
-cleanup_tmpdir() {
-    popd 2>/dev/null || true
-    rm -rf "${nvim_tmpdir}"
-}
-trap cleanup_tmpdir SIGINT
-
-cleanup_and_exit() {
-    cleanup_tmpdir
-    if test "$1" = 0 -o -z "$1" ; then
-        exit 0
-    else
-        exit "${1}"
-    fi
-}
-
-if [ ! -w "${nvim_archive}" ]; then
-    curl -Lo "${nvim_archive}" "${nvim_url}"
-    fedpkg new-sources "${nvim_archive}"
-fi
-
-mkdir -p "${nvim_tmpdir}/src"
-tar -zxf "${nvim_srcdir}/${nvim_archive}" -C "${nvim_tmpdir}/src" --strip-components=1
-
-pushd "${nvim_tmpdir}" || cleanup_and_exit 1
-
-cmake \
-    -S "${nvim_tmpdir}/src/cmake.deps" \
-    -B "${nvim_tmpdir}/deps" -G Ninja \
-    -DUSE_BUNDLED=OFF \
-    -DUSE_BUNDLED_TS=ON \
-    -DUSE_BUNDLED_TS_PARSERS=ON
-
-readarray -t targets < <(basename -a "${nvim_tmpdir}/deps/build/downloads/"treesitter* | \
-    xargs -I {} echo build/src/{}-stamp/{}-download)
-ninja -C "${nvim_tmpdir}/deps" "${targets[@]}"
-
-nvim_vendor="${nvim_archive%.tar.gz}-vendor"
-nvim_vendor_archive="${nvim_vendor}.tar.gz"
-tar -zcf "${nvim_srcdir}/${nvim_vendor_archive}" \
-    -H pax \
-    --numeric-owner \
-    --owner=0:0 \
-    -C "${nvim_tmpdir}/deps/build/downloads" . \
-    --transform="s/^\\./${nvim_vendor}/"
-popd
-
-cksum -a sha512 "${nvim_archive}" "${nvim_vendor_archive}" | tee sources
-
-echo
-echo "Run: fedpkg new-sources ${nvim_archive} ${nvim_vendor_archive}"
-
-cleanup_and_exit 0
--- a/neovim-bundled-licenses.txt
+++ b/neovim-bundled-licenses.txt
@ -1,2 +0,0 @@
-"Apache-2.0"
-"MIT"
--- a/neovim-fix-fortify-source.patch
+++ b/neovim-fix-fortify-source.patch
@ -0,0 +1,39 @@
+Index: neovim-0.8.2/CMakeLists.txt
+===================================================================
+--- neovim-0.8.2.orig/CMakeLists.txt	2022-12-29 17:12:10.000000000 +0100
+++ neovim-0.8.2/CMakeLists.txt	2022-12-30 10:33:00.250094998 +0100
+@@ -203,34 +203,6 @@ if(${INIT_FLAGS_NAME})
+   set(CMAKE_REQUIRED_FLAGS "${${INIT_FLAGS_NAME}}")
+ endif()
+ 
+-# Include <string.h> because some toolchains define _FORTIFY_SOURCE=2 in
+-# internal header files, which should in turn be #included by <string.h>.
+-check_c_source_compiles("
+-#include <string.h>
+-
+-#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 1
+-#error \"_FORTIFY_SOURCE > 1\"
+-#endif
+-int
+-main(void)
+-{
+-  return 0;
+-}
+-" HAS_ACCEPTABLE_FORTIFY)
+-
+-if(NOT HAS_ACCEPTABLE_FORTIFY)
+-  message(STATUS "Unsupported _FORTIFY_SOURCE found, forcing _FORTIFY_SOURCE=1")
+-  # Extract possible prefix to _FORTIFY_SOURCE (e.g. -Wp,-D_FORTIFY_SOURCE).
+-  STRING(REGEX MATCH "[^\ ]+-D_FORTIFY_SOURCE" _FORTIFY_SOURCE_PREFIX "${CMAKE_C_FLAGS}")
+-  STRING(REPLACE "-D_FORTIFY_SOURCE" "" _FORTIFY_SOURCE_PREFIX "${_FORTIFY_SOURCE_PREFIX}" )
+-  if(NOT _FORTIFY_SOURCE_PREFIX STREQUAL "")
+-    message(STATUS "Detected _FORTIFY_SOURCE Prefix=${_FORTIFY_SOURCE_PREFIX}")
+-  endif()
+-  # -U in add_definitions doesn't end up in the correct spot, so we add it to
+-  # the flags variable instead.
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_FORTIFY_SOURCE_PREFIX}-U_FORTIFY_SOURCE ${_FORTIFY_SOURCE_PREFIX}-D_FORTIFY_SOURCE=1")
+-endif()
+-
+ # Remove --sort-common from linker flags, as this seems to cause bugs (see #2641, #3374).
+ # TODO: Figure out the root cause.
+ if(CMAKE_EXE_LINKER_FLAGS MATCHES "--sort-common" OR
--- a/neovim-lua-bit32.patch
+++ b/neovim-lua-bit32.patch
@ -1,31 +1,36 @@
-Index: neovim-0.11.0/src/nvim/ex_cmds.lua
+Index: neovim-0.8.0/CMakeLists.txt
 ===================================================================
--- neovim-0.11.0.orig/src/nvim/ex_cmds.lua	2025-03-26 18:02:38.217064177 +0100
-+++ neovim-0.11.0/src/nvim/ex_cmds.lua	2025-03-26 18:02:41.424747978 +0100
+--- neovim-0.8.0.orig/CMakeLists.txt	2022-09-30 17:15:13.000000000 +0200
+++ neovim-0.8.0/CMakeLists.txt	2022-10-01 07:03:31.650272466 +0200
+@@ -548,7 +548,7 @@ endforeach()
+ 
+ # Find Lua interpreter
+ include(LuaHelpers)
+-set(LUA_DEPENDENCIES lpeg mpack bit)
+set(LUA_DEPENDENCIES lpeg mpack bit32)
+ if(NOT LUA_PRG)
+   foreach(CURRENT_LUA_PRG luajit lua5.1 lua5.2 lua)
+     unset(_CHECK_LUA_PRG CACHE)
+Index: neovim-0.8.0/src/nvim/ex_cmds.lua
+===================================================================
+--- neovim-0.8.0.orig/src/nvim/ex_cmds.lua	2022-09-30 17:15:13.000000000 +0200
+++ neovim-0.8.0/src/nvim/ex_cmds.lua	2022-10-01 07:03:31.651272464 +0200
@@ -1,4 +1,4 @@
 -local bit = require 'bit'
 +local bit = require 'bit32'
 
- local M = {}
+ local module = {}
 
-Index: neovim-0.11.0/runtime/lua/vim/lsp/_watchfiles.lua
+Index: neovim-0.8.0/src/nvim/generators/gen_ex_cmds.lua
 ===================================================================
--- neovim-0.11.0.orig/runtime/lua/vim/lsp/_watchfiles.lua	2025-03-26 14:48:09.000000000 +0100
-+++ neovim-0.11.0/runtime/lua/vim/lsp/_watchfiles.lua	2025-03-26 18:04:19.210556853 +0100
-@@ -1,4 +1,4 @@
-local bit = require('bit')
-+local bit = require('bit32')
- local glob = vim.glob
- local watch = vim._watch
- local protocol = require('vim.lsp.protocol')
-Index: neovim-0.11.0/runtime/lua/vim/lsp/semantic_tokens.lua
-===================================================================
--- neovim-0.11.0.orig/runtime/lua/vim/lsp/semantic_tokens.lua	2025-03-26 14:48:09.000000000 +0100
-+++ neovim-0.11.0/runtime/lua/vim/lsp/semantic_tokens.lua	2025-03-26 18:04:28.696322064 +0100
-@@ -1,5 +1,5 @@
- local api = vim.api
-local bit = require('bit')
-+local bit = require('bit32')
- local ms = require('vim.lsp.protocol').Methods
- local util = require('vim.lsp.util')
- local uv = vim.uv
+--- neovim-0.8.0.orig/src/nvim/generators/gen_ex_cmds.lua	2022-09-30 17:15:13.000000000 +0200
+++ neovim-0.8.0/src/nvim/generators/gen_ex_cmds.lua	2022-10-01 07:03:31.651272464 +0200
+@@ -22,7 +22,7 @@ local defsfname = autodir .. '/ex_cmds_d
+ local enumfile = io.open(enumfname, 'w')
+ local defsfile = io.open(defsfname, 'w')
+ 
+-local bit = require 'bit'
+local bit = require 'bit32'
+ local ex_cmds = require('ex_cmds')
+ local defs = ex_cmds.cmds
+ local flags = ex_cmds.flags
--- a/neovim.spec
+++ b/neovim.spec
--- a/3
+++ b/3
@ -1,2 +1 @@
-SHA512 (neovim-0.11.5.tar.gz) = 1b2bb241261eefd195275e28bb9ebe4102261d61d8b7fe38ccebad7131ccc38d29fae8494d511b4c440ad71ef95dc405a2ba6e98b5d47426f215c8137c8bc91f
-SHA512 (neovim-0.11.5-vendor.tar.gz) = 388e8afb7919d89c7bceab3f03a49909ef307c3c2ac29d9899f5e30e475c18d453010290cc8929e5cae0a1252b2b7056a5d2bedfc9a3f3a12c0530aa52e14b0c
+SHA512 (neovim-0.8.3.tar.gz) = 0ecf60b564a323eb95eb2e67f7dc7e1c1e7bfc70b08466a66eb668d1b75a7362ca42901cd5a64fda22292375e2921ba61c299ac846f820ac146dc55426813eb8
--- a/4
+++ b/4
@ -1,6 +1,6 @@
 Name:
 Version:
-Release:        %autorelease
+Release:        %{autorelease}
 Summary:

 License:
@ -35,4 +35,4 @@ Requires:


 %changelog
-%autochangelog
+%{autochangelog}
--- a/sysinit.vim
+++ b/sysinit.vim
@ -1,6 +1,9 @@
 let g:python_host_prog = '/usr/bin/python2'
 let g:python3_host_prog = '/usr/bin/python3'

+" In order for neovim to use installed plugins shared with vim
+set runtimepath+=/usr/share/vim/vimfiles/
+
 augroup Fedora
  autocmd!
  " RPM spec file template
Author	SHA1	Message	Date
Andreas Schneider	5d343abfff	Fix snprintf buffer overflow with tags resolves: rhbz#2181836	2023-04-06 11:16:05 +02:00
Andreas Schneider	86d3469aa8	Fix snprintf buffer overflow resolves: rhbz#2165805	2023-04-06 11:16:04 +02:00
Andreas Schneider	0dc028fee1	New build for SPDX expression	2023-04-06 11:16:03 +02:00
Andreas Schneider	d563e7c507	Update spec-template https://fedoraproject.org/wiki/Changes/Rpmautospec_by_Default	2023-04-06 11:16:01 +02:00
Andreas Schneider	b9d8c6a8a3	Update License to SPDX expressions https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1	2023-04-06 11:15:59 +02:00
Andreas Schneider	ed7f4bee8b	Update to version 0.8.3	2023-02-02 15:47:53 +01:00
Andreas Schneider	c77ae51842	Update to version 0.8.2	2022-12-30 11:05:01 +01:00
Andreas Schneider	84971845eb	Recommend tree-sitter-cli	2022-11-15 10:11:20 +01:00
Andreas Schneider	9b1524e375	Update to version 0.8.1	2022-11-14 18:10:37 +01:00
Andreas Schneider	0f60fcea73	Update patches for s390 and ppc	2022-10-05 12:11:53 +02:00
Andreas Schneider	f1b24203d5	Update to version 0.8.0	2022-10-05 12:11:51 +02:00
Andreas Schneider	df500bb497	Fix libvterm 0.3 patch	2022-09-23 09:18:18 +02:00
Andreas Schneider	8d59d27fa9	Fix typo	2022-09-23 09:18:16 +02:00
Andreas Schneider	d172245ca5	Build with libvterm 0.3	2022-09-23 09:18:12 +02:00
Michel Alexandre Salim	5ab51fdcbf	Enforce the minimum tree-sitter version at runtime (Fixes: rhbz#2100577) Signed-off-by: Michel Alexandre Salim <michel@michel-slm.name>	2022-08-26 14:38:32 +02:00
Fedora Release Engineering	40fe6f1856	Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-08-26 14:38:30 +02:00
Andreas Schneider	b404a349ff	Update to version 0.7.2	2022-06-26 22:02:41 +02:00
Andreas Schneider	d5678c2da3	Update to version 0.7.0	2022-04-15 15:27:35 +02:00
Michel Alexandre Salim	985faae2ea	Force out-of-source build on EPEL 8 (neovim requires it, but it's not the default with EPEL 8's %%cmake) Disable luajit on EL8 aarch64 Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>	2022-04-15 15:27:33 +02:00
Andreas Schneider	ae1a47e868	Fix libvterm 0.2 support	2022-02-09 21:31:11 +01:00