subtree updates

poky: 883341e9ca..e0ab08bb6a:
  Alexander Kanavin (1):
        libusb1: correct SRC_URI

  Anuj Mittal (1):
        poky.conf: bump version for 3.4.2 release

  Bruce Ashfield (5):
        linux-yocto/5.10: amdgpu: updates for CVE-2021-42327
        linux-yocto/5.10: update to v5.10.91
        kernel: introduce python3-dtschema-wrapper
        linux-yocto/5.10: update to v5.10.92
        linux-yocto/5.10: update to v5.10.93

  Carlos Rafael Giani (1):
        libxml2: Backport python3-lxml workaround patch

  Changqing Li (1):
        pigz: fix one failure of command "unpigz -l"

  Kai Kang (1):
        speex: fix CVE-2020-23903

  Kory Maincent (1):
        icu: fix make_icudata dependencies

  Marek Vasut (1):
        bootchart2: Add missing python3-math dependency

  Mingli Yu (1):
        socat: update SRC_URI

  Peter Kjellerstedt (2):
        sstate: A third fix for for touching files inside pseudo
        insane.bbclass: Correct package_qa_check_empty_dirs()

  Pgowda (2):
        glibc : Fix CVE-2021-3998
        glibc : Fix CVE-2021-3999

  Richard Purdie (3):
        expat: Upgrade 2.4.2 -> 2.4.3
        sstate: Improve failure to obtain archive message/handling
        build-appliance-image: Update to honister head revision

  Ross Burton (8):
        vim: upgrade to 8.2 patch 3752
        vim: update to include latest CVE fixes
        lighttpd: backport a fix for CVE-2022-22707
        tiff: backport fix for CVE-2022-22844
        yocto-check-layer: add debug output for the layers that were found
        expat: upgrade to 2.4.4
        vim: upgrade to patch 4269
        core-image-sato-sdk: allocate more memory when in qemu

  Rudolf J Streif (1):
        linux-firmware: Add CLM blob to linux-firmware-bcm4373 package

  Sundeep KOKKONDA (2):
        glibc : Fix CVE-2022-23218
        glibc : Fix CVE-2022-23219

  wangmy (1):
        expat: upgrade 2.4.1 -> 2.4.2

meta-openembedded: 4647e3ea37..c05ae80ba6:
  Jan Luebbe (1):
        snappy: use main branch to fix fetch failure

  Khem Raj (1):
        python3-prctl: Use https protocol for git fetcher

  Leif Middelschulte (1):
        dbus-daemon-proxy: add missing `return` statement

  Mingli Yu (1):
        plymouth: switch to KillMode=mixed

  Tim Orling (2):
        cmocka: use https protocol for fetching
        tiptop: update download URL and HOMEPAGE

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I6da7a831e4806bb83e7ed1b0d570b2fd1957cd12

1 files changed, 4 insertions, 14 deletions

diff --git a/poky/meta/recipes-support/vim/vim.inc b/poky/meta/recipes-support/vim/vim.inc
index 6cdf157cb6..6c70bb7529 100644
--- a/poky/meta/recipes-support/vim/vim.inc
+++ b/poky/meta/recipes-support/vim/vim.inc
@@ -8,8 +8,9 @@ BUGTRACKER = "https://github.com/vim/vim/issues"
 DEPENDS = "ncurses gettext-native"
 # vimdiff doesn't like busybox diff
 RSUGGESTS:${PN} = "diffutils"
+
 LICENSE = "vim"
-LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=a19edd7ec70d573a005d9e509375a99a"
+LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=909f1394892b7e0f9c2a95306c0c552b"
 
 SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
            file://disable_acl_header_check.patch \
@@ -17,25 +18,14 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
            file://0001-src-Makefile-improve-reproducibility.patch \
            file://no-path-adjust.patch \
            file://racefix.patch \
-           file://b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch \
-           file://CVE-2021-3778.patch \
-           file://0002-patch-8.2.3428-using-freed-memory-when-replacing.patch \
-           file://0003-patch-8.2.3487-illegal-memory-access-if-buffer-name-.patch \
-           file://0004-patch-8.2.3489-ml_get-error-after-search-with-range.patch \
-           file://0005-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch \
-           file://0001-patch-8.2.3581-reading-character-past-end-of-line.patch \
-           file://0002-patch-8.2.3582-reading-uninitialized-memory-when-giv.patch \
-           file://0002-patch-8.2.3611-crash-when-using-CTRL-W-f-without-fin.patch \
            "
 
-SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44"
+PV .= ".4269"
+SRCREV = "48a604845e33399893d6bf293e71bcd2a412800d"
 
 # Do not consider .z in x.y.z, as that is updated with every commit
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0"
 
-# CVE-2021-3968 is related to an issue which was introduced after 8.2, this can be removed after 8.3.
-CVE_CHECK_WHITELIST += "CVE-2021-3968"
-
 S = "${WORKDIR}/git"
 
 VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}"