vim: Update to 8.1.1518 to fix CVE-2019-12735

Submitted by Tom Rini on June 12, 2019, 12:10 a.m. | Patch ID: 162128

Details

Message ID 1560298258-21454-1-git-send-email-trini@konsulko.com
State New
Headers show

Commit Message

Tom Rini June 12, 2019, 12:10 a.m.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 meta/recipes-support/vim/vim-tiny_8.1.1240.bb | 12 ------------
 meta/recipes-support/vim/vim-tiny_8.1.1518.bb | 12 ++++++++++++
 meta/recipes-support/vim/vim.inc              |  2 +-
 meta/recipes-support/vim/vim_8.1.1240.bb      | 10 ----------
 meta/recipes-support/vim/vim_8.1.1518.bb      | 10 ++++++++++
 5 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 meta/recipes-support/vim/vim-tiny_8.1.1240.bb
 create mode 100644 meta/recipes-support/vim/vim-tiny_8.1.1518.bb
 delete mode 100644 meta/recipes-support/vim/vim_8.1.1240.bb
 create mode 100644 meta/recipes-support/vim/vim_8.1.1518.bb

Patch hide | download patch | download mbox

diff --git a/meta/recipes-support/vim/vim-tiny_8.1.1240.bb b/meta/recipes-support/vim/vim-tiny_8.1.1240.bb
deleted file mode 100644
index e4c26d23f69d..000000000000
--- a/meta/recipes-support/vim/vim-tiny_8.1.1240.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_8.1.1518.bb b/meta/recipes-support/vim/vim-tiny_8.1.1518.bb
new file mode 100644
index 000000000000..e4c26d23f69d
--- /dev/null
+++ b/meta/recipes-support/vim/vim-tiny_8.1.1518.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 5f9f3d79de96..0a31e68cb7cc 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -12,7 +12,7 @@  SRC_URI = "git://github.com/vim/vim.git \
            file://vim-add-knob-whether-elf.h-are-checked.patch \
            file://0001-src-Makefile-improve-reproducibility.patch \
 "
-SRCREV = "d96dbd6f95ea22f609042cc9c6272f14a21ff1a5"
+SRCREV = "202d982b36d87cf91d992bd7e30d3223bdc72cd9"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta/recipes-support/vim/vim_8.1.1240.bb b/meta/recipes-support/vim/vim_8.1.1240.bb
deleted file mode 100644
index 60946a181f42..000000000000
--- a/meta/recipes-support/vim/vim_8.1.1240.bb
+++ /dev/null
@@ -1,10 +0,0 @@ 
-require vim.inc
-
-PROVIDES = "xxd"
-
-PACKAGECONFIG_class-native = ""
-BBCLASSEXTEND = "native"
-
-ALTERNATIVE_${PN}_append = " xxd"
-ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
-ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
diff --git a/meta/recipes-support/vim/vim_8.1.1518.bb b/meta/recipes-support/vim/vim_8.1.1518.bb
new file mode 100644
index 000000000000..60946a181f42
--- /dev/null
+++ b/meta/recipes-support/vim/vim_8.1.1518.bb
@@ -0,0 +1,10 @@ 
+require vim.inc
+
+PROVIDES = "xxd"
+
+PACKAGECONFIG_class-native = ""
+BBCLASSEXTEND = "native"
+
+ALTERNATIVE_${PN}_append = " xxd"
+ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
+ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"

Comments

Tom Rini June 12, 2019, 12:13 a.m.
On Tue, Jun 11, 2019 at 08:10:58PM -0400, Tom Rini wrote:

> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  meta/recipes-support/vim/vim-tiny_8.1.1240.bb | 12 ------------
>  meta/recipes-support/vim/vim-tiny_8.1.1518.bb | 12 ++++++++++++
>  meta/recipes-support/vim/vim.inc              |  2 +-
>  meta/recipes-support/vim/vim_8.1.1240.bb      | 10 ----------
>  meta/recipes-support/vim/vim_8.1.1518.bb      | 10 ++++++++++
>  5 files changed, 23 insertions(+), 23 deletions(-)
>  delete mode 100644 meta/recipes-support/vim/vim-tiny_8.1.1240.bb
>  create mode 100644 meta/recipes-support/vim/vim-tiny_8.1.1518.bb
>  delete mode 100644 meta/recipes-support/vim/vim_8.1.1240.bb
>  create mode 100644 meta/recipes-support/vim/vim_8.1.1518.bb

Note that for warrior, if desired we can simply cherry-pick
https://github.com/vim/vim/commit/53575521406739cf20bbe4e384d88e7dca11f040
to resolve the CVE in question.