summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <pbarker@toganlabs.com>2017-03-14 17:09:17 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2017-03-16 23:34:34 +0100
commit078cfe871b31d202a8bafd43a0401f0419f56a8f (patch)
treef8f5620ff29e3c19cdacd11051e0006a0d1243c5
parentdcdd064a5020fa40944367ef8bb13e76faad50c9 (diff)
downloadmeta-openembedded-078cfe871b31d202a8bafd43a0401f0419f56a8f.tar.gz
vim: Update to 8.0.0427
8.0.0427 is currently used in Arch Linux so we know it has at least had some testing. Upstream has fixed the following CVEs since 8.0.0022: * CVE-2016-1248 in 8.0.0056 * CVE-2017-5953 in 8.0.0322 * CVE-2017-6349 in 8.0.0377 * CVE-2017-6350 in 8.0.0378 See http://www.cvedetails.com/product/14270/VIM-VIM.html?vendor_id=8218 Patches are updated as src/configure.in was renamed upstream. Signed-off-by: Paul Barker <pbarker@toganlabs.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/vim/files/disable_acl_header_check.patch6
-rw-r--r--meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch8
-rw-r--r--meta-oe/recipes-support/vim/vim-tiny_8.0.0427.bb (renamed from meta-oe/recipes-support/vim/vim-tiny_8.0.0022.bb)0
-rw-r--r--meta-oe/recipes-support/vim/vim_8.0.0427.bb (renamed from meta-oe/recipes-support/vim/vim_8.0.0022.bb)2
4 files changed, 8 insertions, 8 deletions
diff --git a/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch b/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch
index 8f824e78b..65e5f58c6 100644
--- a/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch
+++ b/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch
@@ -4,10 +4,10 @@ Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny.
4 4
5Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> 5Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
6================================================ 6================================================
7diff --git a/src/configure.in b/src/configure.in 7diff --git a/src/configure.ac b/src/configure.ac
8index fb965e5..d734064 100644 8index fb965e5..d734064 100644
9--- a/src/configure.in 9--- a/src/configure.ac
10+++ b/src/configure.in 10+++ b/src/configure.ac
11@@ -2511,7 +2511,7 @@ AC_CHECK_HEADERS(stdarg.h stdint.h stdlib.h string.h \ 11@@ -2511,7 +2511,7 @@ AC_CHECK_HEADERS(stdarg.h stdint.h stdlib.h string.h \
12 sys/systeminfo.h locale.h sys/stream.h termios.h \ 12 sys/systeminfo.h locale.h sys/stream.h termios.h \
13 libc.h sys/statfs.h poll.h sys/poll.h pwd.h \ 13 libc.h sys/statfs.h poll.h sys/poll.h pwd.h \
diff --git a/meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch b/meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch
index 693d130e4..6c620f9f2 100644
--- a/meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch
+++ b/meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch
@@ -7,13 +7,13 @@ Upstream-status: Pending
7 7
8Signed-off-by: Chong Lu <Chong.Lu@windriver.com> 8Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
9--- 9---
10 src/configure.in | 7 +++++++ 10 src/configure.ac | 7 +++++++
11 1 file changed, 7 insertions(+) 11 1 file changed, 7 insertions(+)
12 12
13diff --git a/src/configure.in b/src/configure.in 13diff --git a/src/configure.ac b/src/configure.ac
14index d734064..f504fa6 100644 14index d734064..f504fa6 100644
15--- a/src/configure.in 15--- a/src/configure.ac
16+++ b/src/configure.in 16+++ b/src/configure.ac
17@@ -2483,11 +2483,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [int x __attribute__((unused));], 17@@ -2483,11 +2483,18 @@ AC_TRY_COMPILE([#include <stdio.h>], [int x __attribute__((unused));],
18 AC_MSG_RESULT(no)) 18 AC_MSG_RESULT(no))
19 19
diff --git a/meta-oe/recipes-support/vim/vim-tiny_8.0.0022.bb b/meta-oe/recipes-support/vim/vim-tiny_8.0.0427.bb
index bb8f2b7ea..bb8f2b7ea 100644
--- a/meta-oe/recipes-support/vim/vim-tiny_8.0.0022.bb
+++ b/meta-oe/recipes-support/vim/vim-tiny_8.0.0427.bb
diff --git a/meta-oe/recipes-support/vim/vim_8.0.0022.bb b/meta-oe/recipes-support/vim/vim_8.0.0427.bb
index 920391adb..1f86fcd2f 100644
--- a/meta-oe/recipes-support/vim/vim_8.0.0022.bb
+++ b/meta-oe/recipes-support/vim/vim_8.0.0427.bb
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/vim/vim.git \
10 file://disable_acl_header_check.patch;patchdir=.. \ 10 file://disable_acl_header_check.patch;patchdir=.. \
11 file://vim-add-knob-whether-elf.h-are-checked.patch;patchdir=.. \ 11 file://vim-add-knob-whether-elf.h-are-checked.patch;patchdir=.. \
12" 12"
13SRCREV = "ec68a99464055029c01082762517e97245ddae0c" 13SRCREV = "ad4187e6fc9c8e1083a172852d958a70a689a75c"
14 14
15S = "${WORKDIR}/git/src" 15S = "${WORKDIR}/git/src"
16 16