vim, vim-core: upgraded packages to upstream
Upgraded app-editors/vim to version 8.2.4586 on amd64, arm64
Upgraded app-editors/vim-core to version 8.2.4586 on amd64, arm64
Used command:
```
cros_portage_upgrade --upgrade --unstable-ok --board=lakitu:lakitu-arm64 app-editors/vim app-editors/vim-core
```
Modifications done after running the above command:
- The above command installs python-utils-r1 in portage-stable/eclass which differs from python-utils-r1 we use from eclass-overlay/eclass. Therefore, removed the eclass from portage-stable.
- Updated the PYTHON_COMPAT in the ebuild to {6..9} from {7..10}
BUG=b/222355416,b/222355360,b/222355527,b/222355474,b/222355358,b/222355337,b/222453220,b/222453216,b/221015286,b/221015471,b/221564247,b/221564245
TEST=presubmit
RELEASE_NOTE=Updates app-editors/vim and app-editors/vim-core to
v8.2.4586. This resoloves CVE-2022-0714, CVE-2022-0696, CVE-2022-0685, CVE-2022-0729, CVE-2022-0572 and CVE-2022-0629.
Change-Id: Id2a15b0998deb81024f7f8e60a719efff2b9258e
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/portage-stable/+/31026
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 30ebf26..ed4d924 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -8,3 +8,4 @@
DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B e713895f847194845c1a794fc796e97678b11686f51f9a33898d92cf1d3927c6d49cd24024b6c5cbbad82b45ab8293f6d4663f14e66a56cc8b361a5fabdbb0b0 SHA512 d9176f74a1b753fb9118362350b3da16f176c7bc5cc57b41dab1f470c1e80830e4a6f4851d5a090d6efdb272186bd8f6a8a5e08e5da5ae0474560cb32dd626be
DIST vim-8.2.4285.tar.gz 15962343 BLAKE2B ba0971cbea3d3fe1761961f66a24281c06f0a509f1aac7c32e26f07b5d9d122b72da68646874b1f20879372d26e1b5a72f020913a31c1c0aa26f8e6bff074516 SHA512 760180b89c285b92f3ec40041c784e756a93d7c6d75386c1c737762b9041babfaa17fd0b9e47e3e4298b24b8f5c7300e6a1ab2addbbcda94e46c973a97d578ec
DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651
+DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
diff --git a/app-editors/vim-core/vim-core-8.2.4328.ebuild b/app-editors/vim-core/vim-core-8.2.4586.ebuild
similarity index 97%
rename from app-editors/vim-core/vim-core-8.2.4328.ebuild
rename to app-editors/vim-core/vim-core-8.2.4586.ebuild
index b28647d..2e6436f 100644
--- a/app-editors/vim-core/vim-core-8.2.4328.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.4586.ebuild
@@ -28,7 +28,8 @@
BDEPEND="sys-devel/autoconf"
# Avoid icon file collision, bug #673880
-RDEPEND="!!<app-editors/gvim-8.1.0648"
+RDEPEND="!!<app-editors/gvim-8.1.0648
+ !<app-editors/vim-8.2.4328-r1"
PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
pkg_setup() {
@@ -193,9 +194,6 @@
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
- # Delete defaults.vim to avoid conflicts with one from vim[minimal]
- rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
-
local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 30ebf26..ed4d924 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -8,3 +8,4 @@
DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B e713895f847194845c1a794fc796e97678b11686f51f9a33898d92cf1d3927c6d49cd24024b6c5cbbad82b45ab8293f6d4663f14e66a56cc8b361a5fabdbb0b0 SHA512 d9176f74a1b753fb9118362350b3da16f176c7bc5cc57b41dab1f470c1e80830e4a6f4851d5a090d6efdb272186bd8f6a8a5e08e5da5ae0474560cb32dd626be
DIST vim-8.2.4285.tar.gz 15962343 BLAKE2B ba0971cbea3d3fe1761961f66a24281c06f0a509f1aac7c32e26f07b5d9d122b72da68646874b1f20879372d26e1b5a72f020913a31c1c0aa26f8e6bff074516 SHA512 760180b89c285b92f3ec40041c784e756a93d7c6d75386c1c737762b9041babfaa17fd0b9e47e3e4298b24b8f5c7300e6a1ab2addbbcda94e46c973a97d578ec
DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651
+DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
diff --git a/app-editors/vim/vim-8.2.4328.ebuild b/app-editors/vim/vim-8.2.4586.ebuild
similarity index 97%
rename from app-editors/vim/vim-8.2.4328.ebuild
rename to app-editors/vim/vim-8.2.4586.ebuild
index 70e75db..da7ebaa 100644
--- a/app-editors/vim/vim-8.2.4328.ebuild
+++ b/app-editors/vim/vim-8.2.4586.ebuild
@@ -45,7 +45,8 @@
lua? ( ${LUA_DEPS}
$(lua_gen_impl_dep 'deprecated' lua5-1)
)
- !minimal? ( ~app-editors/vim-core-${PV} )
+ ~app-editors/vim-core-${PV}
+ !<app-editors/vim-core-8.2.4328-r1
vim-pager? ( app-editors/vim-core[-minimal] )
perl? ( dev-lang/perl:= )
python? ( ${PYTHON_DEPS} )
@@ -318,12 +319,6 @@
fperms a+x ${vimfiles}/macros/manpager.sh
fi
- # Fix an issue of missing defaults.vim when USE=minimal.
- if use minimal ; then
- insinto ${vimfiles}
- doins runtime/defaults.vim
- fi
-
domenu runtime/vim.desktop
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
diff --git a/metadata/md5-cache/app-editors/vim-8.2.4328 b/metadata/md5-cache/app-editors/vim-8.2.4328
deleted file mode 100644
index c9b9180..0000000
--- a/metadata/md5-cache/app-editors/vim-8.2.4328
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/autoconf lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) nls? ( sys-devel/gettext )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.2.4328 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
-DESCRIPTION=Vim, an improved vi-style text editor
-EAPI=7
-HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=*
-LICENSE=vim
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.2.4328 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) vim-pager? ( !minimal )
-SLOT=0
-SRC_URI=https://github.com/vim/vim/archive/v8.2.4328.tar.gz -> vim-8.2.4328.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 lua-single ba92a0c9d413e015c6625cdb0b9aaf99 lua-utils 7b7cd623ac8b9dd4a7a6ee27219cada6 multilib 2477ebe553d3e4d2c606191fe6c33602 python-single-r1 674c48c926cbb44e91b656e0399d8f54 python-utils-r1 157a6a7a3e99c7dbdf81acc9dd4f57cd ruby-single e6530f43a549f120f9396ccb852288f5 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs f783d68a26b62d6b19e070e6bcada5e6 vim-doc 6bd5bb2529af326fe3359e975a3439d0 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb85cb0acff00f0d0ad7515cb1f36a44
diff --git a/metadata/md5-cache/app-editors/vim-8.2.4586 b/metadata/md5-cache/app-editors/vim-8.2.4586
new file mode 100644
index 0000000..010d974
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-8.2.4586
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/autoconf lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-8.2.4586 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=7
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=*
+LICENSE=vim
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-8.2.4586 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.2.4586.tar.gz -> vim-8.2.4586.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
+_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 lua-single ba92a0c9d413e015c6625cdb0b9aaf99 lua-utils 7b7cd623ac8b9dd4a7a6ee27219cada6 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing c3cf317581e5bd068a4b851f03dd8cba python-single-r1 674c48c926cbb44e91b656e0399d8f54 python-utils-r1 d3d7da5aff94a677154819e0cb95ee36 ruby-single e6530f43a549f120f9396ccb852288f5 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs f783d68a26b62d6b19e070e6bcada5e6 vim-doc 6bd5bb2529af326fe3359e975a3439d0 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=557b389fac09b48770ede2d23c9c872b
diff --git a/metadata/md5-cache/app-editors/vim-core-8.2.4328 b/metadata/md5-cache/app-editors/vim-core-8.2.4586
similarity index 77%
rename from metadata/md5-cache/app-editors/vim-core-8.2.4328
rename to metadata/md5-cache/app-editors/vim-core-8.2.4586
index b9b6e83..987af5c 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.2.4328
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.4586
@@ -7,8 +7,8 @@
KEYWORDS=*
LICENSE=vim
PDEPEND=!minimal? ( app-vim/gentoo-syntax )
-RDEPEND=!!<app-editors/gvim-8.1.0648
+RDEPEND=!!<app-editors/gvim-8.1.0648 !<app-editors/vim-8.2.4328-r1
SLOT=0
-SRC_URI=https://github.com/vim/vim/archive/v8.2.4328.tar.gz -> vim-8.2.4328.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
+SRC_URI=https://github.com/vim/vim/archive/v8.2.4586.tar.gz -> vim-8.2.4586.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 multilib 2477ebe553d3e4d2c606191fe6c33602 prefix e51c7882b7b721e54e684f7eb143cbfe toolchain-funcs f783d68a26b62d6b19e070e6bcada5e6 vim-doc 6bd5bb2529af326fe3359e975a3439d0 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=2f69cef730f733ddc501bdb1a5cfb3e4
+_md5_=804436385ebaaf8ff0b56316cc6f7fc6
