[vim] 02/03: Update to v8.0.0095 and refresh patches
James McCoy
jamessan at debian.org
Tue Nov 22 18:57:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch debian/sid
in repository vim.
commit f0c5b35c86cc6cf70ec7e2263d6b7596570e4bdb
Author: James McCoy <jamessan at debian.org>
Date: Tue Nov 22 12:10:38 2016 -0500
Update to v8.0.0095 and refresh patches
Drop Fix-widget-sizing-on-current-Gtk-3.22-branch.patch and
Further-fix-widget-sizing.patch, since an official fix was merged.
Signed-off-by: James McCoy <jamessan at debian.org>
---
debian/changelog | 10 +++++
debian/changelog.upstream | 46 ++++++++++++++++++++++
...of-more-LaTeX-commands-for-tex-filetype-d.patch | 4 +-
...ng-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch | 8 ++--
debian/patches/series | 2 -
...-widget-sizing-on-current-Gtk-3.22-branch.patch | 38 ------------------
.../upstream/Further-fix-widget-sizing.patch | 25 ------------
...ing-compilation-date-in-SOURCE_DATE_EPOCH.patch | 14 +++----
8 files changed, 69 insertions(+), 78 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d006ae9..c1bcc6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+vim (2:8.0.0095-1) UNRELEASED; urgency=high
+
+ * Merge upstream tag v8.0.0095
+ + 8.0.0056: Only allow valid characters in 'filetype', 'syntax' and
+ 'keymap'. (CVE-2016-1248)
+ + 8.0.0089: Fix problems with Gtk 3.22.2. This replaces the proposed
+ patches applied earlier. (#842070)
+
+ -- James McCoy <jamessan at debian.org> Tue, 22 Nov 2016 11:54:01 -0500
+
vim (2:8.0.0049-1) unstable; urgency=medium
* Merge upstream tag v8.0.0049
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
index 96e28d6..c0fa999 100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@ -73,3 +73,49 @@ Individual patches for Vim 8.0:
1719 8.0.0047 crash when using the preview window from an unnamed buffer
5148 8.0.0048 on Windows job_stop() stops cmd.exe, not processes it runs
2839 8.0.0049 concealing and match highlighting interfere
+ 12736 8.0.0050 an exiting job is detected with a large latency
+ 4939 8.0.0051 (after 8.0.0048) job_stop() change breaks tests
+ 1701 8.0.0052 (after 8.0.0049) conceal test passes even without the bug fix
+ 2684 8.0.0053 (after 8.0.0047) no test for what 8.0.0047 fixes
+ 3649 8.0.0054 (after 8.0.0051) Windows: job_stop() does not stop processes
+ 3450 8.0.0055 minor comment and style deficiencies
+ 4920 8.0.0056 when setting 'filetype' there is no check for a valid name
+ 2356 8.0.0057 (after 8.0.0056) tests fail without the 'keymap' features
+ 4871 8.0.0058 positioning of the popup menu is not good
+ 20700 8.0.0059 Vim does not build on VMS systems
+ 3176 8.0.0060 when 'keywordprg' is an Ex command it is shell-escaped
+ 1437 8.0.0061 (after 8.0.0058) compiler warning for unused variable
+ 2433 8.0.0062 no digraph for HORIZONTAL ELLIPSIS
+ 1681 8.0.0063 compiler warning for comparing with unsigned
+ 1771 8.0.0064 (after 8.0.0060) normal test fails on MS-Windows
+ 1727 8.0.0065 (after 8.0.0056) compiler warning for unused function
+ 4158 8.0.0066 calling an operator function without 'linebreak' set
+ 2184 8.0.0067 VMS has a problem with infinity
+ 5802 8.0.0068 checking did_throw after executing autocommands is wrong
+ 8650 8.0.0069 compiler warning for self-comparison
+ 1843 8.0.0070 tests referred in Makefile that no longer exist
+ 3054 8.0.0071 exit value from a shell command is wrong
+ 1600 8.0.0072 MS-Windows: Crash with long font name
+ 7228 8.0.0073 (after 8.0.0069) more comparisons between firstwin & lastwin
+ 36284 8.0.0074 cannot make Vim fail on an internal error
+ 5460 8.0.0075 using number for exception type lacks type checking
+ 1906 8.0.0076 channel log has double parens ()()
+ 1683 8.0.0077 GUI is not tested on Travis CI
+ 2550 8.0.0078 accessing freed memory in quickfix
+ 30894 8.0.0079 accessing freed memory in quickfix
+ 1740 8.0.0080 Travis CI fails for OS X
+ 16764 8.0.0081 inconsistent function names
+309315 8.0.0082 extension for configure should be ".ac"
+ 2446 8.0.0083 using freed memory with win_getid()
+ 3153 8.0.0084 using freed memory when adding to a quickfix list
+ 3977 8.0.0085 using freed memory with recursive function call
+ 7394 8.0.0086 cannot add a comment after ":hide"
+ 14140 8.0.0087 channel callback may get job info after it was deleted
+ 2355 8.0.0088 when a test fails in Setup/Teardown problem is not reported
+ 13532 8.0.0089 various problems with GTK 3.22.2
+ 17957 8.0.0090 cursor moved after last character when using 'breakindent'
+ 6000 8.0.0091 test_help_complete sometimes fails in MS-Windows console
+ 3075 8.0.0092 C indent does not support nested namespaces that C++ 17 has
+ 1842 8.0.0093 not using multiprocess build feature
+ 2397 8.0.0094 if vimrun.exe not found error message is not properly encoded
+ 3684 8.0.0095 problems with GTK 3.22.2 fixed in 3.22.4
diff --git a/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch b/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
index 18c668d..356dafc 100644
--- a/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
+++ b/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
@@ -13,10 +13,10 @@ Signed-off-by: James McCoy <jamessan at debian.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
-index 482ec17..96302f7 100644
+index df8f7fd..17db842 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
-@@ -2221,7 +2221,7 @@ func! s:FTtex()
+@@ -2224,7 +2224,7 @@ func! s:FTtex()
call cursor(1,1)
let firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
if firstNC " Check the next thousand lines for a LaTeX or ConTeXt keyword.
diff --git a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
index f3a71f5..6654548 100644
--- a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
+++ b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
@@ -56,10 +56,10 @@ index acc51f1..3c47df2 100644
{
/* When no .vimrc file was found: source defaults.vim. */
diff --git a/src/os_unix.h b/src/os_unix.h
-index 1070746..0020c58 100644
+index d28aa4d..3a00e05 100644
--- a/src/os_unix.h
+++ b/src/os_unix.h
-@@ -217,6 +217,9 @@ typedef struct dsc$descriptor DESC;
+@@ -213,6 +213,9 @@ typedef struct dsc$descriptor DESC;
/*
* Unix system-dependent file names
*/
@@ -70,10 +70,10 @@ index 1070746..0020c58 100644
# define SYS_VIMRC_FILE "$VIM/vimrc"
#endif
diff --git a/src/structs.h b/src/structs.h
-index bb0fc3a..187b476 100644
+index c749a36..ce8632d 100644
--- a/src/structs.h
+++ b/src/structs.h
-@@ -3251,6 +3251,9 @@ typedef struct
+@@ -3257,6 +3257,9 @@ typedef struct
#ifdef FEAT_DIFF
int diff_mode; /* start with 'diff' set */
#endif
diff --git a/debian/patches/series b/debian/patches/series
index 55502ce..4eab357 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,3 @@ debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
upstream/Add-Zesty-Zapus-to-deb-changelog-sources-syntax-files.patch
-upstream/Fix-widget-sizing-on-current-Gtk-3.22-branch.patch
-upstream/Further-fix-widget-sizing.patch
diff --git a/debian/patches/upstream/Fix-widget-sizing-on-current-Gtk-3.22-branch.patch b/debian/patches/upstream/Fix-widget-sizing-on-current-Gtk-3.22-branch.patch
deleted file mode 100644
index df6d88b..0000000
--- a/debian/patches/upstream/Fix-widget-sizing-on-current-Gtk-3.22-branch.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sun, 23 Oct 2016 21:12:15 +0200
-Subject: Fix widget sizing on current Gtk+ 3.22 branch
-
-Gtk recently started emitting configure events when repositioning child
-windows[1]. Events for the form's child windows bubble up the widget
-hierarchy, get caught by our configure event handler, and treated as if
-they were reporting the size of the form window. As a result, the shell
-was sized using far too small dimensions[2][3]. This change will be part
-of Gtk+ 3.22.2.
-
-Solve this by checking whether the configure event we get is really for
-the form widget.
-
-[1]: https://git.gnome.org/browse/gtk+/commit/?h=gtk-3-22&id=12579fe71b3b8f79eb9c1b80e429443bcc437dd0
-[2]: https://bugs.archlinux.org/task/51509
-[3]: https://bugzilla.gnome.org/show_bug.cgi?id=773387
----
- src/gui_gtk_x11.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
-index 3884642..64edfd4 100644
---- a/src/gui_gtk_x11.c
-+++ b/src/gui_gtk_x11.c
-@@ -4429,6 +4429,12 @@ form_configure_event(GtkWidget *widget UNUSED,
- {
- int usable_height = event->height;
-
-+#if GTK_CHECK_VERSION(3,0,0)
-+ if (!gtk_check_version(3, 22, 2) &&
-+ event->window != gtk_widget_get_window(gui.formwin))
-+ return TRUE;
-+#endif
-+
- /* When in a GtkPlug, we can't guarantee valid heights (as a round
- * no. of char-heights), so we have to manually sanitise them.
- * Widths seem to sort themselves out, don't ask me why.
diff --git a/debian/patches/upstream/Further-fix-widget-sizing.patch b/debian/patches/upstream/Further-fix-widget-sizing.patch
deleted file mode 100644
index dbf33ba..0000000
--- a/debian/patches/upstream/Further-fix-widget-sizing.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Mon, 24 Oct 2016 19:26:36 +0200
-Subject: Further fix widget sizing
-
-Follow-up by ofourdan in order to fix resizing on maximization. This
-makes the drawing area ignore configure events that weren't explicitly
-sent (such as from GtkForm).
----
- src/gui_gtk_x11.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
-index 64edfd4..eda6dc2 100644
---- a/src/gui_gtk_x11.c
-+++ b/src/gui_gtk_x11.c
-@@ -3099,6 +3099,9 @@ drawarea_configure_event_cb(GtkWidget *widget,
- if (event->width == cur_width && event->height == cur_height)
- return TRUE;
-
-+ if (!gtk_check_version(3, 22, 2) && event->send_event == FALSE)
-+ return TRUE;
-+
- cur_width = event->width;
- cur_height = event->height;
-
diff --git a/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch b/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
index 4b9b322..77bc221 100644
--- a/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
+++ b/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
@@ -18,12 +18,12 @@ preprocessor's __DATE__/__TIME__ symbols will be used.
[1]: https://reproducible-builds.org/specs/source-date-epoch/
---
src/config.h.in | 3 +++
- src/configure.in | 10 ++++++++++
+ src/configure.ac | 10 ++++++++++
src/version.c | 6 ++++++
3 files changed, 19 insertions(+)
diff --git a/src/config.h.in b/src/config.h.in
-index 62427e2..2bbf548 100644
+index 5baac7d..59b6c0b 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -30,6 +30,9 @@
@@ -36,10 +36,10 @@ index 62427e2..2bbf548 100644
/* Define when __attribute__((unused)) can be used */
#undef HAVE_ATTRIBUTE_UNUSED
-diff --git a/src/configure.in b/src/configure.in
-index 43bf9ad..503ca02 100644
---- a/src/configure.in
-+++ b/src/configure.in
+diff --git a/src/configure.ac b/src/configure.ac
+index f6a4469..17a4a48 100644
+--- a/src/configure.ac
++++ b/src/configure.ac
@@ -29,6 +29,16 @@ dnl in autoconf needs it, where it uses STDC_HEADERS.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
@@ -58,7 +58,7 @@ index 43bf9ad..503ca02 100644
AC_MSG_CHECKING(--enable-fail-if-missing argument)
diff --git a/src/version.c b/src/version.c
-index 6fdf9f4..f8397d3 100644
+index 731a685..0253dc4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -44,11 +44,17 @@ make_version(void)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git
More information about the pkg-vim-maintainers
mailing list