portage-stable -> vim-core: Updated to v9.0.0467
BUG=b/246740025, b/246068717, b/245910192, b/244706847, b/244706686, b/244077367, b/244077640, b/243913837, b/243914070, b/243227420, b/243227206, b/243227463, b/243227075, b/243227250, b/242840026, b/242840244, b/242839812, b/241632952, b/241632932, b/241632546, b/241632835
TEST=presubmit
RELEASE_NOTE=Updated vim-core to v9.0.0467. This resolves CVE-2022-3153,CVE-2022-3134,CVE-2022-3099,CVE-2022-3037,CVE-2022-3016,CVE-2022-2982,CVE-2022-2980,CVE-2022-2946,CVE-2022-2923,CVE-2022-2889,CVE-2022-2874,CVE-2022-2862,CVE-2022-2849,CVE-2022-2845,CVE-2022-2819,CVE-2022-2817,CVE-2022-2816,CVE-2022-2598,CVE-2022-2581,CVE-2022-2580,CVE-2022-2571
Change-Id: I0d335085f4d6354c8f4632532e2097619c6d8059
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/portage-stable/+/37067
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Dexter Rivera <riverade@google.com>
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 43b52c4..7d5d522 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,4 +1,2 @@
-DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
-DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
-DIST vim-core-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
+DIST vim-core-9.0.0467.tar.gz 16849498 BLAKE2B d0523db11d3fcb50bf719b001e8870f8dc2a2eede77cdeef1d74aa7238d8cf7ef2d5bd47a8915775aa1e6bbd33d5c023cbb432aa247e82c7b195438cd931019f SHA512 b481ab487072210c6cf5945e3af8305d059f2a3a70b3ba68925521539ef90450bc576f6ed9f39f305e67866671b8f5f9b4b5dc3e0da5ddbe84abdc0c83b83fab
DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
diff --git a/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch b/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch
deleted file mode 100644
index 6d8e459..0000000
--- a/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bba26c9ed9d4ddc82afd0343f145dc9e14b91498 Mon Sep 17 00:00:00 2001
-From: Varsha Teratipally <teratipally@google.com>
-Date: Tue, 2 Aug 2022 22:18:29 +0000
-Subject: [PATCH] Configure check for timer_create may give wrong error.
-Give a warning instead of an error
-
-Partial solution from github.com/vim/vim/commit/5f6cae8b8a49c435556e32f84d067cd0b4d28e4c
-
----
- src/configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/configure.ac b/src/configure.ac
-index e8522ec05..41f41dee3 100644
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -3850,7 +3850,7 @@ static void set_flag(union sigval sv) {}
- ])],
- vim_cv_timer_create=yes,
- vim_cv_timer_create=no),
-- AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create')
-+ AC_MSG_WARN(cross-compiling: please set 'vim_cv_timer_create')
- )]
- )
-
---
-
-
diff --git a/app-editors/vim-core/vim-core-8.2.5066.ebuild b/app-editors/vim-core/vim-core-8.2.5066.ebuild
deleted file mode 100644
index 5c8d39a..0000000
--- a/app-editors/vim-core/vim-core-8.2.5066.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with app-editors/vim and app-editors/gvim
-
-VIM_VERSION="8.2"
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
-
-if [[ ${PV} == 9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/vim/vim.git"
- EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
- SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
- https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
- KEYWORDS="*"
-fi
-S="${WORKDIR}"/vim-${PV}
-
-DESCRIPTION="vim and gvim shared files"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-LICENSE="vim"
-SLOT="0"
-IUSE="nls acl minimal"
-
-BDEPEND="sys-devel/autoconf"
-# Avoid icon file collision, bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648
- !<app-editors/vim-8.2.4328-r1"
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
-
-pkg_setup() {
- # people with broken alphabets run into trouble. bug #82186.
- unset LANG LC_ALL
- export LC_COLLATE="C"
-
- # Gnome sandbox silliness. bug #114475.
- mkdir -p "${T}"/home || die "mkdir -p failed"
- export HOME="${T}"/home
-}
-
-src_prepare() {
- if [[ ${PV} != 9999* ]] ; then
- rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die
- # We replace the crosscompile patch above with the patch below.
- # This can be removed once the Gentoo integrates this patch to their patches.
- # This can be tracked with the bug https://bugs.gentoo.org/854909
- cp "${FILESDIR}"/006-vim-8.0.5066-crosscompile.patch "${WORKDIR}"/patches/
-
- # Gentoo patches to fix runtime issues, cross-compile errors, etc
- eapply "${WORKDIR}"/patches
- fi
-
- # Fixup a script to use awk instead of nawk
- sed -i \
- -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
- "${S}"/runtime/tools/mve.awk || die "sed failed"
-
- # See bug #77841. We remove this file after the tarball extraction.
- rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
-
- # Read vimrc and gvimrc from /etc/vim
- echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
- echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
- # Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
- # Hopefully this pattern won't break for a while at least.
- # This fixes bug #29398 (27 Sep 2003 agriffis)
- sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
- "${S}"/runtime/doc/syntax.txt \
- "${S}"/runtime/doc/tagsrch.txt \
- "${S}"/runtime/doc/usr_29.txt \
- "${S}"/runtime/menu.vim \
- "${S}"/src/configure.ac || die 'sed failed'
-
- # Don't be fooled by /usr/include/libc.h. When found, vim thinks
- # this is NeXT, but it's actually just a file in dev-libs/9libs
- # This fixes bug #43885 (20 Mar 2004 agriffis)
- sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
- # gcc on sparc32 has this, uhm, interesting problem with detecting EOF
- # correctly. To avoid some really entertaining error messages about stuff
- # which isn't even in the source file being invalid, we'll do some trickery
- # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
- find "${S}" -name '*.c' | while read c; do
- echo >> "$c" || die "echo failed"
- done
-
- # Try to avoid sandbox problems. Bug #114475.
- if [[ -d "${S}"/src/po ]]; then
- sed -i -e \
- '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
- "${S}"/src/po/Makefile || die "sed failed"
- fi
-
- cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
- # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
- sed -i -e \
- "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
- "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
- eapply_user
-}
-
-src_configure() {
- local myconf
-
- # Fix bug #37354: Disallow -funroll-all-loops on amd64
- # Bug 57859 suggests that we want to do this for all archs
- filter-flags -funroll-all-loops
-
- # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for
- # everyone since previous flag filtering bugs have turned out to affect
- # multiple archs...
- replace-flags -O3 -O2
-
- # Fix bug #18245: Prevent "make" from the following chain:
- # (1) Notice configure.ac is newer than auto/configure
- # (2) Rebuild auto/configure
- # (3) Notice auto/configure is newer than auto/config.mk
- # (4) Run ./configure (with wrong args) to remake auto/config.mk
- sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-
- # Remove src/auto/configure file.
- rm -v src/auto/configure || die "rm configure failed"
-
- emake -j1 -C src autoconf
-
- # This should fix a sandbox violation (see bug 24447). The hvc
- # things are for ppc64, see bug 86433.
- for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
- if [[ -e "${file}" ]]; then
- addwrite ${file}
- fi
- done
-
- # Let Portage do the stripping. Some people like that.
- export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
- # Keep Gentoo Prefix env contained within the EPREFIX
- use prefix && myconf+=" --without-local-dir"
-
- econf \
- --with-modified-by=Gentoo-${PVR} \
- --enable-gui=no \
- --without-x \
- --disable-darwin \
- --disable-perlinterp \
- --disable-pythoninterp \
- --disable-rubyinterp \
- --disable-gpm \
- --disable-selinux \
- $(use_enable nls) \
- $(use_enable acl) \
- ${myconf}
-}
-
-src_compile() {
- emake -j1 -C src auto/osdef.h objects
- emake tools
-}
-
-src_test() { :; }
-
-src_install() {
- local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
- dodir /usr/{bin,share/{man/man1,vim}}
- emake -C src \
- installruntime \
- installmanlinks \
- installmacros \
- installtutor \
- installtutorbin \
- installtools \
- install-languages \
- DESTDIR="${D}" \
- BINDIR="${EPREFIX}"/usr/bin \
- MANDIR="${EPREFIX}"/usr/share/man \
- DATADIR="${EPREFIX}"/usr/share
-
- keepdir ${vimfiles}/keymap
-
- # default vimrc is installed by vim-core since it applies to
- # both vim and gvim
- insinto /etc/vim/
- newins "${FILESDIR}"/vimrc-r5 vimrc
- eprefixify "${ED}"/etc/vim/vimrc
-
- if use minimal; then
- # To save space, install only a subset of the files.
- # Helps minimalize the livecd, bug 65144.
- eshopts_push -s extglob
-
- rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
- rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
- rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
-
- local keep_colors="default"
- ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
-
- local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
- # tinkering with the next line might make bad things happen ...
- keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
- ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
-
- # Delete skip_defaults_vim config not supported by vim[minimal]
- sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
-
- eshopts_pop
- fi
-
- newbashcomp "${FILESDIR}"/xxd-completion xxd
-
- # install gvim icon since both vim/gvim desktop files reference it
- doicon -s scalable "${FILESDIR}"/gvim.svg
-}
-
-pkg_postinst() {
- # update documentation tags (from vim-doc.eclass)
- update_vim_helptags
-
- # update icon cache
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- # Update documentation tags (from vim-doc.eclass)
- update_vim_helptags
-
- # update icon cache
- xdg_icon_cache_update
-}
diff --git a/app-editors/vim-core/vim-core-9.0.0099.ebuild b/app-editors/vim-core/vim-core-9.0.0467.ebuild
similarity index 98%
rename from app-editors/vim-core/vim-core-9.0.0099.ebuild
rename to app-editors/vim-core/vim-core-9.0.0467.ebuild
index 8ae6565..86bca02 100644
--- a/app-editors/vim-core/vim-core-9.0.0099.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.0467.ebuild
@@ -43,7 +43,6 @@
if [[ ${PV} != 9999* ]] ; then
# Gentoo patches to fix runtime issues, cross-compile errors, etc
eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches"
- eapply "${FILESDIR}/vim-9.0-fix-create-timer-for-cros-compiling.patch"
fi
# Fixup a script to use awk instead of nawk
