Browse code

Updated vim to version 8.0.0533.

Change-Id: Id7235959d4543e32ca02d3f815d3d5d1e4b2a30d
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2436
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Priyesh Padmavilasom <ppadmavilasom@vmware.com>

xiaolin-vmware authored on 2017/04/15 06:04:27
Showing 4 changed files
1 1
deleted file mode 100644
... ...
@@ -1,13 +0,0 @@
1
-diff -rup vim74/src/spell.c vim74-new/src/spell.c
2
-+++ vim74-new/src/spell.c	2017-02-23 12:18:03.096797651 -0800
3
-@@ -4043,6 +4043,9 @@ spell_read_tree(fd, bytsp, idxsp, prefix
4
-     len = get4c(fd);
5
-     if (len < 0)
6
- 	return SP_TRUNCERROR;
7
-+    if (len >= 0x3fffffff)
8
-+        /* Invalid length, multiply with sizeof(int) would overflow. */
9
-+        return SP_FORMERROR;    
10
-     if (len > 0)
11
-     {
12
- 	/* Allocate the byte array. */
13 1
deleted file mode 100644
... ...
@@ -1,52 +0,0 @@
1
-diff -rup vim74/src/undo.c vim74-new/src/undo.c
2
-+++ vim74-new/src/undo.c	2017-03-02 11:04:53.051564315 -0800
3
-@@ -1151,7 +1151,7 @@ unserialize_uep(fp, error, file_name)
4
- {
5
-     int		i;
6
-     u_entry_T	*uep;
7
--    char_u	**array;
8
-+    char_u	**array = NULL;
9
-     char_u	*line;
10
-     int		line_len;
11
- 
12
-@@ -1168,7 +1168,8 @@ unserialize_uep(fp, error, file_name)
13
-     uep->ue_size = get4c(fp);
14
-     if (uep->ue_size > 0)
15
-     {
16
--	array = (char_u **)U_ALLOC_LINE(sizeof(char_u *) * uep->ue_size);
17
-+	if (uep->ue_size < LONG_MAX / (int)sizeof(char_u *))
18
-+	    array = (char_u **)U_ALLOC_LINE(sizeof(char_u *) * uep->ue_size);
19
- 	if (array == NULL)
20
- 	{
21
- 	    *error = TRUE;
22
-@@ -1176,8 +1177,6 @@ unserialize_uep(fp, error, file_name)
23
- 	}
24
- 	vim_memset(array, 0, sizeof(char_u *) * uep->ue_size);
25
-     }
26
--    else
27
--	array = NULL;
28
-     uep->ue_array = array;
29
- 
30
-     for (i = 0; i < uep->ue_size; ++i)
31
-@@ -1572,7 +1571,7 @@ u_read_undo(name, hash, orig_name)
32
-     linenr_T	line_lnum;
33
-     colnr_T	line_colnr;
34
-     linenr_T	line_count;
35
--    int		num_head = 0;
36
-+    long	num_head = 0;
37
-     long	old_header_seq, new_header_seq, cur_header_seq;
38
-     long	seq_last, seq_cur;
39
-     long	last_save_nr = 0;
40
-@@ -1745,8 +1744,9 @@ u_read_undo(name, hash, orig_name)
41
-      * When there are no headers uhp_table is NULL. */
42
-     if (num_head > 0)
43
-     {
44
--	uhp_table = (u_header_T **)U_ALLOC_LINE(
45
--					     num_head * sizeof(u_header_T *));
46
-+	if (num_head < LONG_MAX / (long)sizeof(u_header_T *))
47
-+	    uhp_table = (u_header_T **)U_ALLOC_LINE(	
48
-+				     num_head * sizeof(u_header_T *));
49
- 	if (uhp_table == NULL)
50
- 	    goto error;
51
-     }
52 1
deleted file mode 100644
... ...
@@ -1,62 +0,0 @@
1
-diff -rup vim74/src/option.c vim74-new/src/option.c
2
-+++ vim74-new/src/option.c	2016-11-28 16:59:31.763889780 -0800
3
-@@ -5653,6 +5653,21 @@ set_string_option(opt_idx, value, opt_fl
4
- }
5
- 
6
- /*
7
-+ * Return TRUE if "val" is a valid 'filetype' name.
8
-+ * Also used for 'syntax' and 'keymap'.
9
-+ */
10
-+    static int
11
-+valid_filetype(char_u *val)
12
-+{
13
-+    char_u *s;
14
-+
15
-+    for (s = val; *s != NUL; ++s)
16
-+	if (!ASCII_ISALNUM(*s) && vim_strchr((char_u *)".-_", *s) == NULL)
17
-+	    return FALSE;
18
-+    return TRUE;
19
-+}
20
-+
21
-+/*
22
-  * Handle string options that need some action to perform when changed.
23
-  * Returns NULL for success, or an error message for an error.
24
-  */
25
-@@ -6043,8 +6058,11 @@ did_set_string_option(opt_idx, varp, new
26
- #ifdef FEAT_KEYMAP
27
-     else if (varp == &curbuf->b_p_keymap)
28
-     {
29
--	/* load or unload key mapping tables */
30
--	errmsg = keymap_init();
31
-+	if (!valid_filetype(*varp))
32
-+	    errmsg = e_invarg;
33
-+	else
34
-+	    /* load or unload key mapping tables */
35
-+	    errmsg = keymap_init();
36
- 
37
- 	if (errmsg == NULL)
38
- 	{
39
-@@ -6990,6 +7008,22 @@ did_set_string_option(opt_idx, varp, new
40
-     }
41
- #endif
42
- 
43
-+#ifdef FEAT_AUTOCMD
44
-+    else if (gvarp == &p_ft)
45
-+    {
46
-+	if (!valid_filetype(*varp))
47
-+	    errmsg = e_invarg;
48
-+    }
49
-+#endif
50
-+
51
-+#ifdef FEAT_SYN_HL
52
-+    else if (gvarp == &p_syn)
53
-+    {
54
-+	if (!valid_filetype(*varp))
55
-+	    errmsg = e_invarg;
56
-+    }
57
-+#endif
58
-+
59
-     /* Options that are a list of flags. */
60
-     else
61
-     {
... ...
@@ -1,21 +1,18 @@
1 1
 %define debug_package %{nil}
2 2
 
3
-Summary:    Text editor
4
-Name:       vim
5
-Version:    7.4
6
-Release:    10%{?dist}
7
-License:    Charityware
8
-URL:        http://www.vim.org
9
-Group:      Applications/Editors
10
-Vendor:     VMware, Inc.
3
+Summary:        Text editor
4
+Name:           vim
5
+Version:        8.0.0533
6
+Release:        1%{?dist}
7
+License:        Charityware
8
+URL:            http://www.vim.org
9
+Group:          Applications/Editors
10
+Vendor:         VMware, Inc.
11 11
 Distribution:   Photon
12
-Source0:    %{name}-%{version}.tar.bz2
13
-%define sha1 vim=601abf7cc2b5ab186f40d8790e542f86afca86b7
14
-Patch0:         vim-CVE-2016-1248.patch
15
-Patch1:         vim-7.4-CVE-2017-5953.patch
16
-Patch2:         vim-7.4-CVE-2017-6349_CVE-2017-6350.patch
12
+Source0:        %{name}-%{version}.tar.gz
13
+%define sha1    vim=6169cece15cb139db3ceff9c9ba2bf74013b1e02
17 14
 BuildRequires:  ncurses-devel
18
-Requires:   tcsh
15
+Requires:       tcsh
19 16
 
20 17
 %description
21 18
 The Vim package contains a powerful text editor.
... ...
@@ -29,10 +26,7 @@ Requires:   tcsh
29 29
 The vim extra package contains a extra files for powerful text editor.
30 30
 
31 31
 %prep
32
-%setup -q -n %{name}74
33
-%patch0 -p1
34
-%patch1 -p1
35
-%patch2 -p1
32
+%setup -q
36 33
 echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
37 34
 %build
38 35
 ./configure \
... ...
@@ -40,7 +34,7 @@ echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
40 40
     --enable-multibyte
41 41
 make VERBOSE=1 %{?_smp_mflags}
42 42
 %install
43
-cd %{_builddir}/%{name}74
43
+#cd %{_builddir}/%{name}74
44 44
 make DESTDIR=%{buildroot} install
45 45
 ln -sv vim %{buildroot}%{_bindir}/vi
46 46
 install -vdm 755 %{buildroot}/etc
... ...
@@ -75,83 +69,93 @@ make test
75 75
 %{_bindir}/vimtutor
76 76
 %{_bindir}/xxd
77 77
 %{_mandir}/*/*
78
-%doc %{_datarootdir}/vim/vim74/doc/*
79
-%{_datarootdir}/vim/vim74/autoload/*
80
-%{_datarootdir}/vim/vim74/bugreport.vim
81
-%{_datarootdir}/vim/vim74/colors/*
82
-%exclude %{_datarootdir}/vim/vim74/colors/desert.vim
83
-%{_datarootdir}/vim/vim74/compiler/*
84
-%{_datarootdir}/vim/vim74/delmenu.vim
85
-%{_datarootdir}/vim/vim74/evim.vim
86
-%{_datarootdir}/vim/vim74/filetype.vim
87
-%{_datarootdir}/vim/vim74/ftoff.vim
88
-%{_datarootdir}/vim/vim74/ftplugin.vim
89
-%{_datarootdir}/vim/vim74/ftplugin/*
90
-%{_datarootdir}/vim/vim74/ftplugof.vim
91
-%{_datarootdir}/vim/vim74/gvimrc_example.vim
92
-%{_datarootdir}/vim/vim74/indent.vim
93
-%{_datarootdir}/vim/vim74/indent/*
94
-%{_datarootdir}/vim/vim74/indoff.vim
95
-%{_datarootdir}/vim/vim74/keymap/*
96
-%{_datarootdir}/vim/vim74/macros/*
97
-%{_datarootdir}/vim/vim74/menu.vim
98
-%{_datarootdir}/vim/vim74/mswin.vim
99
-%{_datarootdir}/vim/vim74/optwin.vim
100
-%{_datarootdir}/vim/vim74/plugin/*
101
-%{_datarootdir}/vim/vim74/synmenu.vim
102
-%{_datarootdir}/vim/vim74/vimrc_example.vim
103
-%{_datarootdir}/vim/vim74/print/*
104
-%{_datarootdir}/vim/vim74/scripts.vim
105
-%{_datarootdir}/vim/vim74/spell/*
106
-%{_datarootdir}/vim/vim74/syntax/*
107
-%exclude %{_datarootdir}/vim/vim74/syntax/syntax.vim
108
-%{_datarootdir}/vim/vim74/tools/*
109
-%{_datarootdir}/vim/vim74/tutor/*
110
-%{_datarootdir}/vim/vim74/lang/*.vim
111
-%doc %{_datarootdir}/vim/vim74/lang/*.txt
112
-%lang(af) %{_datarootdir}/vim/vim74/lang/af/LC_MESSAGES/vim.mo
113
-%lang(ca) %{_datarootdir}/vim/vim74/lang/ca/LC_MESSAGES/vim.mo
114
-%lang(cs) %{_datarootdir}/vim/vim74/lang/cs/LC_MESSAGES/vim.mo
115
-%lang(de) %{_datarootdir}/vim/vim74/lang/de/LC_MESSAGES/vim.mo
116
-%lang(eb_GB) %{_datarootdir}/vim/vim74/lang/en_GB/LC_MESSAGES/vim.mo
117
-%lang(eo) %{_datarootdir}/vim/vim74/lang/eo/LC_MESSAGES/vim.mo
118
-%lang(es) %{_datarootdir}/vim/vim74/lang/es/LC_MESSAGES/vim.mo
119
-%lang(fi) %{_datarootdir}/vim/vim74/lang/fi/LC_MESSAGES/vim.mo
120
-%lang(fr) %{_datarootdir}/vim/vim74/lang/fr/LC_MESSAGES/vim.mo
121
-%lang(ga) %{_datarootdir}/vim/vim74/lang/ga/LC_MESSAGES/vim.mo
122
-%lang(it) %{_datarootdir}/vim/vim74/lang/it/LC_MESSAGES/vim.mo
123
-%lang(ja) %{_datarootdir}/vim/vim74/lang/ja/LC_MESSAGES/vim.mo
124
-%lang(ko.UTF-8) %{_datarootdir}/vim/vim74/lang/ko.UTF-8/LC_MESSAGES/vim.mo
125
-%lang(ko) %{_datarootdir}/vim/vim74/lang/ko/LC_MESSAGES/vim.mo
126
-%lang(nb) %{_datarootdir}/vim/vim74/lang/nb/LC_MESSAGES/vim.mo
127
-%lang(no) %{_datarootdir}/vim/vim74/lang/no/LC_MESSAGES/vim.mo
128
-%lang(pl) %{_datarootdir}/vim/vim74/lang/pl/LC_MESSAGES/vim.mo
129
-%lang(pt_BR) %{_datarootdir}/vim/vim74/lang/pt_BR/LC_MESSAGES/vim.mo
130
-%lang(ru) %{_datarootdir}/vim/vim74/lang/ru/LC_MESSAGES/vim.mo
131
-%lang(sk) %{_datarootdir}/vim/vim74/lang/sk/LC_MESSAGES/vim.mo
132
-%lang(sv) %{_datarootdir}/vim/vim74/lang/sv/LC_MESSAGES/vim.mo
133
-%lang(uk) %{_datarootdir}/vim/vim74/lang/uk/LC_MESSAGES/vim.mo
134
-%lang(vi) %{_datarootdir}/vim/vim74/lang/vi/LC_MESSAGES/vim.mo
135
-%lang(zh_CN.UTF-8) %{_datarootdir}/vim/vim74/lang/zh_CN.UTF-8/LC_MESSAGES/vim.mo
136
-%lang(zh_CN) %{_datarootdir}/vim/vim74/lang/zh_CN/LC_MESSAGES/vim.mo
137
-%lang(zh_TW.UTF-8) %{_datarootdir}/vim/vim74/lang/zh_TW.UTF-8/LC_MESSAGES/vim.mo
138
-%lang(zh_TW) %{_datarootdir}/vim/vim74/lang/zh_TW/LC_MESSAGES/vim.mo
139
-%lang(cs.cp1250)  %{_datarootdir}/vim/vim74/lang/cs.cp1250/LC_MESSAGES/vim.mo
140
-%lang(ja.euc-jp)  %{_datarootdir}/vim/vim74/lang/ja.euc-jp/LC_MESSAGES/vim.mo
141
-%lang(ja.sjis)    %{_datarootdir}/vim/vim74/lang/ja.sjis/LC_MESSAGES/vim.mo
142
-%lang(nl)     %{_datarootdir}/vim/vim74/lang/nl/LC_MESSAGES/vim.mo
143
-%lang(pl.UTF-8)   %{_datarootdir}/vim/vim74/lang/pl.UTF-8/LC_MESSAGES/vim.mo
144
-%lang(pl.cp1250)  %{_datarootdir}/vim/vim74/lang/pl.cp1250/LC_MESSAGES/vim.mo
145
-%lang(ru.cp1251)  %{_datarootdir}/vim/vim74/lang/ru.cp1251/LC_MESSAGES/vim.mo
146
-%lang(sk.cp1250)  %{_datarootdir}/vim/vim74/lang/sk.cp1250/LC_MESSAGES/vim.mo
147
-%lang(uk.cp1251)  %{_datarootdir}/vim/vim74/lang/uk.cp1251/LC_MESSAGES/vim.mo
148
-%lang(zh_CN.cp936) %{_datarootdir}/vim/vim74/lang/zh_CN.cp936/LC_MESSAGES/vim.mo
78
+%doc %{_datarootdir}/vim/vim80/doc/*
79
+%{_datarootdir}/vim/vim80/autoload/*
80
+%{_datarootdir}/vim/vim80/bugreport.vim
81
+%{_datarootdir}/vim/vim80/colors/*
82
+%exclude %{_datarootdir}/vim/vim80/colors/desert.vim
83
+%{_datarootdir}/applications/gvim.desktop
84
+%{_datarootdir}/applications/vim.desktop
85
+%{_datarootdir}/icons/hicolor/48x48/apps/gvim.png
86
+%{_datarootdir}/icons/locolor/16x16/apps/gvim.png
87
+%{_datarootdir}/icons/locolor/32x32/apps/gvim.png
88
+%{_datarootdir}/vim/vim80/defaults.vim
89
+%{_datarootdir}/vim/vim80/pack/dist/opt/*
90
+
91
+%{_datarootdir}/vim/vim80/compiler/*
92
+%{_datarootdir}/vim/vim80/delmenu.vim
93
+%{_datarootdir}/vim/vim80/evim.vim
94
+%{_datarootdir}/vim/vim80/filetype.vim
95
+%{_datarootdir}/vim/vim80/ftoff.vim
96
+%{_datarootdir}/vim/vim80/ftplugin.vim
97
+%{_datarootdir}/vim/vim80/ftplugin/*
98
+%{_datarootdir}/vim/vim80/ftplugof.vim
99
+%{_datarootdir}/vim/vim80/gvimrc_example.vim
100
+%{_datarootdir}/vim/vim80/indent.vim
101
+%{_datarootdir}/vim/vim80/indent/*
102
+%{_datarootdir}/vim/vim80/indoff.vim
103
+%{_datarootdir}/vim/vim80/keymap/*
104
+%{_datarootdir}/vim/vim80/macros/*
105
+%{_datarootdir}/vim/vim80/menu.vim
106
+%{_datarootdir}/vim/vim80/mswin.vim
107
+%{_datarootdir}/vim/vim80/optwin.vim
108
+%{_datarootdir}/vim/vim80/plugin/*
109
+%{_datarootdir}/vim/vim80/synmenu.vim
110
+%{_datarootdir}/vim/vim80/vimrc_example.vim
111
+%{_datarootdir}/vim/vim80/print/*
112
+%{_datarootdir}/vim/vim80/scripts.vim
113
+%{_datarootdir}/vim/vim80/spell/*
114
+%{_datarootdir}/vim/vim80/syntax/*
115
+%exclude %{_datarootdir}/vim/vim80/syntax/syntax.vim
116
+%{_datarootdir}/vim/vim80/tools/*
117
+%{_datarootdir}/vim/vim80/tutor/*
118
+%{_datarootdir}/vim/vim80/lang/*.vim
119
+%doc %{_datarootdir}/vim/vim80/lang/*.txt
120
+%lang(af) %{_datarootdir}/vim/vim80/lang/af/LC_MESSAGES/vim.mo
121
+%lang(ca) %{_datarootdir}/vim/vim80/lang/ca/LC_MESSAGES/vim.mo
122
+%lang(cs) %{_datarootdir}/vim/vim80/lang/cs/LC_MESSAGES/vim.mo
123
+%lang(de) %{_datarootdir}/vim/vim80/lang/de/LC_MESSAGES/vim.mo
124
+%lang(eb_GB) %{_datarootdir}/vim/vim80/lang/en_GB/LC_MESSAGES/vim.mo
125
+%lang(eo) %{_datarootdir}/vim/vim80/lang/eo/LC_MESSAGES/vim.mo
126
+%lang(es) %{_datarootdir}/vim/vim80/lang/es/LC_MESSAGES/vim.mo
127
+%lang(fi) %{_datarootdir}/vim/vim80/lang/fi/LC_MESSAGES/vim.mo
128
+%lang(fr) %{_datarootdir}/vim/vim80/lang/fr/LC_MESSAGES/vim.mo
129
+%lang(ga) %{_datarootdir}/vim/vim80/lang/ga/LC_MESSAGES/vim.mo
130
+%lang(it) %{_datarootdir}/vim/vim80/lang/it/LC_MESSAGES/vim.mo
131
+%lang(ja) %{_datarootdir}/vim/vim80/lang/ja/LC_MESSAGES/vim.mo
132
+%lang(ko.UTF-8) %{_datarootdir}/vim/vim80/lang/ko.UTF-8/LC_MESSAGES/vim.mo
133
+%lang(ko) %{_datarootdir}/vim/vim80/lang/ko/LC_MESSAGES/vim.mo
134
+%lang(nb) %{_datarootdir}/vim/vim80/lang/nb/LC_MESSAGES/vim.mo
135
+%lang(no) %{_datarootdir}/vim/vim80/lang/no/LC_MESSAGES/vim.mo
136
+%lang(pl) %{_datarootdir}/vim/vim80/lang/pl/LC_MESSAGES/vim.mo
137
+%lang(pt_BR) %{_datarootdir}/vim/vim80/lang/pt_BR/LC_MESSAGES/vim.mo
138
+%lang(ru) %{_datarootdir}/vim/vim80/lang/ru/LC_MESSAGES/vim.mo
139
+%lang(sk) %{_datarootdir}/vim/vim80/lang/sk/LC_MESSAGES/vim.mo
140
+%lang(sv) %{_datarootdir}/vim/vim80/lang/sv/LC_MESSAGES/vim.mo
141
+%lang(uk) %{_datarootdir}/vim/vim80/lang/uk/LC_MESSAGES/vim.mo
142
+%lang(vi) %{_datarootdir}/vim/vim80/lang/vi/LC_MESSAGES/vim.mo
143
+%lang(zh_CN.UTF-8) %{_datarootdir}/vim/vim80/lang/zh_CN.UTF-8/LC_MESSAGES/vim.mo
144
+%lang(zh_CN) %{_datarootdir}/vim/vim80/lang/zh_CN/LC_MESSAGES/vim.mo
145
+%lang(zh_TW.UTF-8) %{_datarootdir}/vim/vim80/lang/zh_TW.UTF-8/LC_MESSAGES/vim.mo
146
+%lang(zh_TW) %{_datarootdir}/vim/vim80/lang/zh_TW/LC_MESSAGES/vim.mo
147
+%lang(cs.cp1250)  %{_datarootdir}/vim/vim80/lang/cs.cp1250/LC_MESSAGES/vim.mo
148
+%lang(ja.euc-jp)  %{_datarootdir}/vim/vim80/lang/ja.euc-jp/LC_MESSAGES/vim.mo
149
+%lang(ja.sjis)    %{_datarootdir}/vim/vim80/lang/ja.sjis/LC_MESSAGES/vim.mo
150
+%lang(nl)     %{_datarootdir}/vim/vim80/lang/nl/LC_MESSAGES/vim.mo
151
+%lang(pl.UTF-8)   %{_datarootdir}/vim/vim80/lang/pl.UTF-8/LC_MESSAGES/vim.mo
152
+%lang(pl.cp1250)  %{_datarootdir}/vim/vim80/lang/pl.cp1250/LC_MESSAGES/vim.mo
153
+%lang(ru.cp1251)  %{_datarootdir}/vim/vim80/lang/ru.cp1251/LC_MESSAGES/vim.mo
154
+%lang(sk.cp1250)  %{_datarootdir}/vim/vim80/lang/sk.cp1250/LC_MESSAGES/vim.mo
155
+%lang(uk.cp1251)  %{_datarootdir}/vim/vim80/lang/uk.cp1251/LC_MESSAGES/vim.mo
156
+%lang(zh_CN.cp936) %{_datarootdir}/vim/vim80/lang/zh_CN.cp936/LC_MESSAGES/vim.mo
149 157
 
150 158
 %files
151 159
 %defattr(-,root,root)
152 160
 %config(noreplace) /etc/vimrc
153
-%{_datarootdir}/vim/vim74/colors/desert.vim
154
-%{_datarootdir}/vim/vim74/syntax/syntax.vim
161
+%{_datarootdir}/vim/vim80/colors/desert.vim
162
+%{_datarootdir}/vim/vim80/syntax/syntax.vim
163
+%{_datarootdir}/vim/vim80/rgb.txt
164
+
155 165
 %{_bindir}/ex
156 166
 %{_bindir}/vi
157 167
 %{_bindir}/view
... ...
@@ -161,6 +165,8 @@ make test
161 161
 %{_bindir}/vimdiff
162 162
 
163 163
 %changelog
164
+*   Fri Apr 14 2017 Xiaolin Li <xiaolinl@vmware.com> 8.0.0533-1
165
+-   Updated to version 8.0.0533.
164 166
 *   Tue Feb 28 2017 Anish Swaminathan <anishs@vmware.com>  7.4-10
165 167
 -   Fix for CVE-2017-6349 and CVE-2017-6350
166 168
 *   Fri Feb 17 2017 Anish Swaminathan <anishs@vmware.com>  7.4-9