[dunfell,7/8] vim: Upgrade 4269 -> 4134

Message ID	f27f15977085dbdf7da28ed8ed60c02ffa009db8.1645465376.git.steve@sakoman.com
State	Accepted, archived
Commit	f27f15977085dbdf7da28ed8ed60c02ffa009db8
Headers	show Return-Path: <steve@sakoman.com> ip: 209.85.210.177, mailfrom: steve@sakoman.com) From: Steve Sakoman <steve@sakoman.com> To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 7/8] vim: Upgrade 4269 -> 4134 Date: Mon, 21 Feb 2022 09:34:28 -1000 Message-Id: <f27f15977085dbdf7da28ed8ed60c02ffa009db8.1645465376.git.steve@sakoman.com> In-Reply-To: <cover.1645465376.git.steve@sakoman.com> References: <cover.1645465376.git.steve@sakoman.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[dunfell,1/8] Revert "vim: fix CVE-2021-4069" \| expand [dunfell,1/8] Revert "vim: fix CVE-2021-4069" [dunfell,2/8] vim: set PACKAGECONFIG idiomatically [dunfell,3/8] vim: upgrade to 8.2 patch 3752 [dunfell,4/8] vim: do not report upstream version check as broken [dunfell,5/8] vim: update to include latest CVE fixes [dunfell,6/8] vim: upgrade to patch 4269 [dunfell,7/8] vim: Upgrade 4269 -> 4134 [dunfell,8/8] vim: Upgrade 8.2.4314 -> 8.2.4424

Message ID

f27f15977085dbdf7da28ed8ed60c02ffa009db8.1645465376.git.steve@sakoman.com

State

Accepted, archived

Commit

f27f15977085dbdf7da28ed8ed60c02ffa009db8

Headers

From: Steve Sakoman <steve@sakoman.com>
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][dunfell 7/8] vim: Upgrade 4269 -> 4134
Date: Mon, 21 Feb 2022 09:34:28 -1000
Message-Id: 
 <f27f15977085dbdf7da28ed8ed60c02ffa009db8.1645465376.git.steve@sakoman.com>
In-Reply-To: <cover.1645465376.git.steve@sakoman.com>
References: <cover.1645465376.git.steve@sakoman.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[dunfell,1/8] Revert "vim: fix CVE-2021-4069" | expand

Commit Message

Steve Sakoman Feb. 21, 2022, 7:34 p.m. UTC

From: Richard Purdie <richard.purdie@linuxfoundation.org>

License text underwent changes on how to submit Uganda donations, switch from http
to https urls and an update date change but the license itself is unchanged.

Also, add an entry for the top level license file. This is also the vim license
so LICENSE is unchanged but we should monitor it too.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d195005e415b0b2d7c8b0b65c0aef888d4d6fc8e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-support/vim/vim.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index 3d0d83caeb..ff1090bb14 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -10,7 +10,8 @@  DEPENDS = "ncurses gettext-native"
 RSUGGESTS_${PN} = "diffutils"
 
 LICENSE = "vim"
-LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=909f1394892b7e0f9c2a95306c0c552b"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99 \
+                    file://runtime/doc/uganda.txt;md5=600a38dc53e8931fdfb1238276ee09b0"
 
 SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
            file://disable_acl_header_check.patch \
@@ -20,8 +21,8 @@  SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
            file://racefix.patch \
            "
 
-PV .= ".4269"
-SRCREV = "48a604845e33399893d6bf293e71bcd2a412800d"
+PV .= ".4314"
+SRCREV = "8cbf2499179db39a46e700ab04d0b36e22bcc1bb"
 
 # Remove when 8.3 is out
 UPSTREAM_VERSION_UNKNOWN = "1"

[dunfell,7/8] vim: Upgrade 4269 -> 4134

Commit Message

Patch