mirror of
git://git.yoctoproject.org/poky
synced 2026-05-17 22:51:13 +00:00
5cfc6ef28d
There's a fairly constant flow of CVEs being fixed in Vim, which are getting increasing non-trivial to backport. Instead of trying to backport (and potentially introduce more bugs), or just ignoring them entirely, upgrade vim to the latest patch in the hope that vim 8.3 will be released before we release Kirkstone. (From OE-Core rev: 78a4796de27d710f97c336d288d797557a58694e) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From 5ed25c076a1fb1889a3c50dddf29f21850b59a13 Mon Sep 17 00:00:00 2001
|
|
From: Wenzong Fan <wenzong.fan@windriver.com>
|
|
Date: Tue, 26 Jun 2018 17:29:09 +0800
|
|
Subject: [PATCH] disable acl header check
|
|
|
|
Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
|
|
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
|
---
|
|
src/configure.ac | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
Index: git/src/configure.ac
|
|
===================================================================
|
|
--- git.orig/src/configure.ac
|
|
+++ git/src/configure.ac
|
|
@@ -3292,7 +3292,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h strin
|
|
sys/systeminfo.h locale.h sys/stream.h termios.h \
|
|
libc.h sys/statfs.h poll.h sys/poll.h pwd.h \
|
|
utime.h sys/param.h sys/ptms.h libintl.h libgen.h \
|
|
- util/debug.h util/msg18n.h frame.h sys/acl.h \
|
|
+ util/debug.h util/msg18n.h frame.h \
|
|
sys/access.h sys/sysinfo.h wchar.h wctype.h)
|
|
|
|
dnl sys/ptem.h depends on sys/stream.h on Solaris
|
|
@@ -3974,6 +3974,7 @@ AC_ARG_ENABLE(acl,
|
|
, [enable_acl="yes"])
|
|
if test "$enable_acl" = "yes"; then
|
|
AC_MSG_RESULT(no)
|
|
+ AC_CHECK_HEADERS(sys/acl.h)
|
|
AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"],
|
|
AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl"
|
|
AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),)
|