From 9f7e9c0f4360469b9775372272e0a442c7cc06c8 Mon Sep 17 00:00:00 2001
From: Tim Orling <ticotimo@gmail.com>
Date: Sun, 18 Feb 2024 08:57:38 -0800
Subject: vim: upgrade from 9.0.2130 -> 9.1.0114

https://www.vim.org/vim-9.1-released.php

Vim 9.1 is available

The Vim project is happy to announce that Vim 9.1 has finally been released.
This release is dedicated to Bram Moolenaar, Vim's lead developer for more
than 30 years, who passed away half a year ago. The Vim project wouldn't
exist without his work!

Vim 9.1 is mainly a bug fix release, it contains hundreds of bug fixes, a
few new features and there are many minor improvements.

Changes:
https://github.com/vim/vim/compare/v9.0.2130...v9.1.0114

CVE: CVE-2024-22667
(includes commit https://github.com/vim/vim/commit/b39b240c386a5a29241415541f1c99e2e6b8ce47)

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-support/vim/vim-tiny_9.0.bb | 12 ------------
 meta/recipes-support/vim/vim-tiny_9.1.bb | 12 ++++++++++++
 meta/recipes-support/vim/vim.inc         |  4 ++--
 meta/recipes-support/vim/vim_9.0.bb      | 23 -----------------------
 meta/recipes-support/vim/vim_9.1.bb      | 23 +++++++++++++++++++++++
 5 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 meta/recipes-support/vim/vim-tiny_9.0.bb
 create mode 100644 meta/recipes-support/vim/vim-tiny_9.1.bb
 delete mode 100644 meta/recipes-support/vim/vim_9.0.bb
 create mode 100644 meta/recipes-support/vim/vim_9.1.bb

(limited to 'meta/recipes-support')

diff --git a/meta/recipes-support/vim/vim-tiny_9.0.bb b/meta/recipes-support/vim/vim-tiny_9.0.bb
deleted file mode 100644
index e4c26d23f6..0000000000
--- a/meta/recipes-support/vim/vim-tiny_9.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require vim.inc
-
-SUMMARY += " (with tiny features)"
-
-PACKAGECONFIG += "tiny"
-
-do_install() {
-    install -D -m 0755 ${S}/src/vim ${D}/${bindir}/vim.tiny
-}
-
-ALTERNATIVE_PRIORITY = "90"
-ALTERNATIVE_TARGET = "${bindir}/vim.tiny"
diff --git a/meta/recipes-support/vim/vim-tiny_9.1.bb b/meta/recipes-support/vim/vim-tiny_9.1.bb
new file mode 100644
index 0000000000..e4c26d23f6
--- /dev/null
+++ b/meta/recipes-support/vim/vim-tiny_9.1.bb
@@ -0,0 +1,12 @@
+require vim.inc
+
+SUMMARY += " (with tiny features)"
+
+PACKAGECONFIG += "tiny"
+
+do_install() {
+    install -D -m 0755 ${S}/src/vim ${D}/${bindir}/vim.tiny
+}
+
+ALTERNATIVE_PRIORITY = "90"
+ALTERNATIVE_TARGET = "${bindir}/vim.tiny"
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index 6b440d8947..071deed338 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -19,8 +19,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
            file://no-path-adjust.patch \
            "
 
-PV .= ".2130"
-SRCREV = "075ad7047457debfeef13442c01e74088b461092"
+PV .= ".0114"
+SRCREV = "fcaed6a70faf73bff3e5405ada556d726024f866"
 
 # Do not consider .z in x.y.z, as that is updated with every commit
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0"
diff --git a/meta/recipes-support/vim/vim_9.0.bb b/meta/recipes-support/vim/vim_9.0.bb
deleted file mode 100644
index fee9f055e9..0000000000
--- a/meta/recipes-support/vim/vim_9.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require vim.inc
-
-PROVIDES = "xxd"
-
-RDEPENDS:${PN} = "ncurses-terminfo-base ${PN}-xxd"
-# Recommend that runtime data is installed along with vim
-RRECOMMENDS:${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common"
-
-PACKAGECONFIG:class-native = ""
-BBCLASSEXTEND = "native nativesdk"
-
-PACKAGES =+ "${PN}-xxd"
-FILES:${PN}-xxd = "${bindir}/xxd"
-RPROVIDES:${PN}-xxd = "xxd"
-
-ALTERNATIVE:${PN}-xxd = "xxd"
-ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
-ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
-
-# We override the default in security_flags.inc because vim (not vim-tiny!) will abort
-# in many places for _FORTIFY_SOURCE=2.  Security flags become part of CC.
-#
-lcl_maybe_fortify = "${@oe.utils.conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=1',d)}"
diff --git a/meta/recipes-support/vim/vim_9.1.bb b/meta/recipes-support/vim/vim_9.1.bb
new file mode 100644
index 0000000000..fee9f055e9
--- /dev/null
+++ b/meta/recipes-support/vim/vim_9.1.bb
@@ -0,0 +1,23 @@
+require vim.inc
+
+PROVIDES = "xxd"
+
+RDEPENDS:${PN} = "ncurses-terminfo-base ${PN}-xxd"
+# Recommend that runtime data is installed along with vim
+RRECOMMENDS:${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common"
+
+PACKAGECONFIG:class-native = ""
+BBCLASSEXTEND = "native nativesdk"
+
+PACKAGES =+ "${PN}-xxd"
+FILES:${PN}-xxd = "${bindir}/xxd"
+RPROVIDES:${PN}-xxd = "xxd"
+
+ALTERNATIVE:${PN}-xxd = "xxd"
+ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
+ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
+
+# We override the default in security_flags.inc because vim (not vim-tiny!) will abort
+# in many places for _FORTIFY_SOURCE=2.  Security flags become part of CC.
+#
+lcl_maybe_fortify = "${@oe.utils.conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=1',d)}"
-- 
cgit 1.2.3-korg