1 |
commit: 83d6d09cb4e95233dd64ac35c65a42d47074fc2e |
2 |
Author: Vaibhav Rustagi <vaibhavrustagi <AT> google <DOT> com> |
3 |
AuthorDate: Thu Nov 3 06:09:36 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 3 06:32:00 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d6d09c |
7 |
|
8 |
app-editors/vim-core: version bump to v9.0.0828. |
9 |
|
10 |
This is needed to resolve CVE-2022-3705. |
11 |
|
12 |
Bug: https://bugs.gentoo.org/879257 |
13 |
Signed-off-by: Vaibhav Rustagi <vaibhavrustagi <AT> google.com> |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
app-editors/vim-core/Manifest | 1 + |
17 |
app-editors/vim-core/vim-core-9.0.0828.ebuild | 230 ++++++++++++++++++++++++++ |
18 |
2 files changed, 231 insertions(+) |
19 |
|
20 |
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest |
21 |
index 851bdd1c8721..7ce52533f482 100644 |
22 |
--- a/app-editors/vim-core/Manifest |
23 |
+++ b/app-editors/vim-core/Manifest |
24 |
@@ -1,4 +1,5 @@ |
25 |
DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498 |
26 |
DIST vim-9.0.0399.tar.gz 16833387 BLAKE2B f9d6588920b49ef32b82d012e1c4f8a34dc505267b67027a3b4302dd99d7987645c29a91fdb234fffa873b342488b4d9c85d05d3fe7a332042781881a61bea5e SHA512 6b261bf3aaa355e7a42de1785b134bccc51086495578730b9bc3b8e048679caa3a901e576a360cba5f1aa4d164c7f162a3f916e945b3f5f71e893ea30e0ca826 |
27 |
DIST vim-9.0.0655.tar.gz 16804127 BLAKE2B e021ff4dd370cdd9b39fb9df0a12309215abd780ec297760b92b6caf924882465b28f9ba65d94ad75a229eb01c8f393f24a29a11919a96d78bb6fb45ef2971e3 SHA512 aa267941e835eecbeeffa7989fb525bdf4269f84d9c88d135a26d74ab7d025487863405b6e0f1391023c30193a122ed3e85a7a71bd4dc48058f3fe3377798f38 |
28 |
+DIST vim-9.0.0828.tar.gz 16782339 BLAKE2B 6b997c1c828338d64a8b204a1e232676ec075834b1b7e74c2fc671e315f9bf6026b0c419ebb3c31e7ce58dbca23828ca11d866b2bfcb73f8a86fb31fa0d51b00 SHA512 03f93515039a2f275a8fe6b84bbac5875ffff17768ab3201e111eba4897a2485fe4ccfe238151f393334c7a6ea77eddd8898f0b816e26dbdb884f4e6bcbd2943 |
29 |
DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942 |
30 |
|
31 |
diff --git a/app-editors/vim-core/vim-core-9.0.0828.ebuild b/app-editors/vim-core/vim-core-9.0.0828.ebuild |
32 |
new file mode 100644 |
33 |
index 000000000000..9412ba51653d |
34 |
--- /dev/null |
35 |
+++ b/app-editors/vim-core/vim-core-9.0.0828.ebuild |
36 |
@@ -0,0 +1,230 @@ |
37 |
+# Copyright 1999-2022 Gentoo Authors |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+ |
40 |
+EAPI=8 |
41 |
+ |
42 |
+# Please bump with app-editors/vim and app-editors/gvim |
43 |
+ |
44 |
+VIM_VERSION="9.0" |
45 |
+inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils |
46 |
+ |
47 |
+if [[ ${PV} == 9999* ]] ; then |
48 |
+ inherit git-r3 |
49 |
+ EGIT_REPO_URI="https://github.com/vim/vim.git" |
50 |
+ EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} |
51 |
+else |
52 |
+ SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz |
53 |
+ https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz" |
54 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
55 |
+fi |
56 |
+S="${WORKDIR}/vim-${PV}" |
57 |
+ |
58 |
+DESCRIPTION="vim and gvim shared files" |
59 |
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" |
60 |
+ |
61 |
+LICENSE="vim" |
62 |
+SLOT="0" |
63 |
+IUSE="nls acl minimal" |
64 |
+ |
65 |
+# ncurses is only needed by ./configure, so no subslot operator required |
66 |
+DEPEND=">=sys-libs/ncurses-5.2-r2:0" |
67 |
+BDEPEND="sys-devel/autoconf" |
68 |
+ |
69 |
+pkg_setup() { |
70 |
+ # people with broken alphabets run into trouble. bug #82186. |
71 |
+ unset LANG LC_ALL |
72 |
+ export LC_COLLATE="C" |
73 |
+} |
74 |
+ |
75 |
+src_prepare() { |
76 |
+ if [[ ${PV} != 9999* ]] ; then |
77 |
+ # Gentoo patches to fix runtime issues, cross-compile errors, etc |
78 |
+ eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches |
79 |
+ fi |
80 |
+ |
81 |
+ # Fixup a script to use awk instead of nawk |
82 |
+ sed -i \ |
83 |
+ -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ |
84 |
+ "${S}"/runtime/tools/mve.awk || die "sed failed" |
85 |
+ |
86 |
+ # See bug #77841. We remove this file after the tarball extraction. |
87 |
+ rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" |
88 |
+ |
89 |
+ # Read vimrc and gvimrc from /etc/vim |
90 |
+ echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die |
91 |
+ echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die |
92 |
+ |
93 |
+ # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. |
94 |
+ # Hopefully this pattern won't break for a while at least. |
95 |
+ # This fixes bug #29398 (27 Sep 2003 agriffis) |
96 |
+ sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ |
97 |
+ "${S}"/runtime/doc/syntax.txt \ |
98 |
+ "${S}"/runtime/doc/tagsrch.txt \ |
99 |
+ "${S}"/runtime/doc/usr_29.txt \ |
100 |
+ "${S}"/runtime/menu.vim \ |
101 |
+ "${S}"/src/configure.ac || die 'sed failed' |
102 |
+ |
103 |
+ # Don't be fooled by /usr/include/libc.h. When found, vim thinks |
104 |
+ # this is NeXT, but it's actually just a file in dev-libs/9libs |
105 |
+ # This fixes bug #43885 (20 Mar 2004 agriffis) |
106 |
+ sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' |
107 |
+ |
108 |
+ # gcc on sparc32 has this, uhm, interesting problem with detecting EOF |
109 |
+ # correctly. To avoid some really entertaining error messages about stuff |
110 |
+ # which isn't even in the source file being invalid, we'll do some trickery |
111 |
+ # to make the error never occur. bug 66162 (02 October 2004 ciaranm) |
112 |
+ find "${S}" -name '*.c' | while read c; do |
113 |
+ echo >> "$c" || die "echo failed" |
114 |
+ done |
115 |
+ |
116 |
+ # Try to avoid sandbox problems. Bug #114475. |
117 |
+ if [[ -d "${S}"/src/po ]]; then |
118 |
+ sed -i -e \ |
119 |
+ '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ |
120 |
+ "${S}"/src/po/Makefile || die "sed failed" |
121 |
+ fi |
122 |
+ |
123 |
+ cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" |
124 |
+ |
125 |
+ # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 |
126 |
+ sed -i -e \ |
127 |
+ "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ |
128 |
+ "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' |
129 |
+ |
130 |
+ # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for |
131 |
+ # everyone since previous flag filtering bugs have turned out to affect |
132 |
+ # multiple archs... |
133 |
+ replace-flags -O3 -O2 |
134 |
+ |
135 |
+ # Fix bug #18245: Prevent "make" from the following chain: |
136 |
+ # (1) Notice configure.ac is newer than auto/configure |
137 |
+ # (2) Rebuild auto/configure |
138 |
+ # (3) Notice auto/configure is newer than auto/config.mk |
139 |
+ # (4) Run ./configure (with wrong args) to remake auto/config.mk |
140 |
+ sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" |
141 |
+ |
142 |
+ # Remove src/auto/configure file. |
143 |
+ rm -v src/auto/configure || die "rm configure failed" |
144 |
+ |
145 |
+ eapply_user |
146 |
+} |
147 |
+ |
148 |
+src_configure() { |
149 |
+ # Fix bug #37354: Disallow -funroll-all-loops on amd64 |
150 |
+ # Bug 57859 suggests that we want to do this for all archs |
151 |
+ filter-flags -funroll-all-loops |
152 |
+ |
153 |
+ emake -j1 -C src autoconf |
154 |
+ |
155 |
+ # This should fix a sandbox violation (see bug 24447). The hvc |
156 |
+ # things are for ppc64, see bug 86433. |
157 |
+ for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do |
158 |
+ if [[ -e "${file}" ]]; then |
159 |
+ addwrite ${file} |
160 |
+ fi |
161 |
+ done |
162 |
+ |
163 |
+ # Let Portage do the stripping. Some people like that. |
164 |
+ export ac_cv_prog_STRIP="$(type -P true ) faking strip" |
165 |
+ |
166 |
+ local myconf=( |
167 |
+ --with-modified-by=Gentoo-${PVR} |
168 |
+ --enable-gui=no |
169 |
+ --without-x |
170 |
+ --disable-darwin |
171 |
+ --disable-perlinterp |
172 |
+ --disable-pythoninterp |
173 |
+ --disable-rubyinterp |
174 |
+ --disable-gpm |
175 |
+ --disable-selinux |
176 |
+ $(use_enable nls) |
177 |
+ $(use_enable acl) |
178 |
+ ) |
179 |
+ |
180 |
+ # Keep Gentoo Prefix env contained within the EPREFIX |
181 |
+ use prefix && myconf+=( --without-local-dir ) |
182 |
+ |
183 |
+ if tc-is-cross-compiler ; then |
184 |
+ export vim_cv_getcwd_broken=no \ |
185 |
+ vim_cv_memmove_handles_overlap=yes \ |
186 |
+ vim_cv_stat_ignores_slash=yes \ |
187 |
+ vim_cv_terminfo=yes \ |
188 |
+ vim_cv_toupper_broken=no |
189 |
+ fi |
190 |
+ |
191 |
+ econf "${myconf[@]}" |
192 |
+} |
193 |
+ |
194 |
+src_compile() { |
195 |
+ emake -j1 -C src auto/osdef.h objects |
196 |
+ emake tools |
197 |
+} |
198 |
+ |
199 |
+src_test() { :; } |
200 |
+ |
201 |
+src_install() { |
202 |
+ local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} |
203 |
+ |
204 |
+ dodir /usr/{bin,share/{man/man1,vim}} |
205 |
+ emake -C src \ |
206 |
+ installruntime \ |
207 |
+ installmanlinks \ |
208 |
+ installmacros \ |
209 |
+ installtutor \ |
210 |
+ installtutorbin \ |
211 |
+ installtools \ |
212 |
+ install-languages \ |
213 |
+ DESTDIR="${D}" \ |
214 |
+ BINDIR="${EPREFIX}"/usr/bin \ |
215 |
+ MANDIR="${EPREFIX}"/usr/share/man \ |
216 |
+ DATADIR="${EPREFIX}"/usr/share |
217 |
+ |
218 |
+ keepdir ${vimfiles}/keymap |
219 |
+ |
220 |
+ # default vimrc is installed by vim-core since it applies to |
221 |
+ # both vim and gvim |
222 |
+ insinto /etc/vim/ |
223 |
+ newins "${FILESDIR}"/vimrc-r6 vimrc |
224 |
+ eprefixify "${ED}"/etc/vim/vimrc |
225 |
+ |
226 |
+ if use minimal; then |
227 |
+ # To save space, install only a subset of the files. |
228 |
+ # Helps minimalize the livecd, bug 65144. |
229 |
+ rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die |
230 |
+ rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die |
231 |
+ rm -v "${ED}"/usr/bin/vimtutor || die |
232 |
+ |
233 |
+ for f in "${ED}${vimfiles}"/colors/*.vim; do |
234 |
+ if [[ ${f} != */@(default).vim ]] ; then |
235 |
+ printf '%s\0' "${f}" |
236 |
+ fi |
237 |
+ done | xargs -0 rm -f || die |
238 |
+ |
239 |
+ for f in "${ED}${vimfiles}"/syntax/*.vim; do |
240 |
+ if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then |
241 |
+ printf '%s\0' "${f}" |
242 |
+ fi |
243 |
+ done | xargs -0 rm -f || die |
244 |
+ fi |
245 |
+ |
246 |
+ newbashcomp "${FILESDIR}"/xxd-completion xxd |
247 |
+ |
248 |
+ # install gvim icon since both vim/gvim desktop files reference it |
249 |
+ doicon -s scalable "${FILESDIR}"/gvim.svg |
250 |
+} |
251 |
+ |
252 |
+pkg_postinst() { |
253 |
+ # update documentation tags (from vim-doc.eclass) |
254 |
+ update_vim_helptags |
255 |
+ |
256 |
+ # update icon cache |
257 |
+ xdg_icon_cache_update |
258 |
+} |
259 |
+ |
260 |
+pkg_postrm() { |
261 |
+ # Update documentation tags (from vim-doc.eclass) |
262 |
+ update_vim_helptags |
263 |
+ |
264 |
+ # update icon cache |
265 |
+ xdg_icon_cache_update |
266 |
+} |