debian/0000755000000000000000000000000012034702074007165 5ustar debian/changelog0000644000000000000000000014342212034702063011043 0ustar vte (1:0.28.2-5ubuntu1) quantal; urgency=low * Resynchronise with Debian (libexecdir fix closes LP: #864609). Remaining changes: - debian/patches/91_keep_fds.patch: - vte does not support G_SPAWN_LEAVE_DESCRIPTORS_OPEN when calling vte_terminal_fork_command_full(). - debian/patches/93_add_alt_screen_scroll_toggle.patch: - Handle scrolling differently when using alternate screen or scrolling is restricted. - debian/patches/lp246701_scroll_region_updates.patch: - Fix update glitch related to scroll regions. - debian/patches/backscroll-stream-mem.patch: - Provide a memory-based scrollback stream backend to avoid hitting disk with terminal contents. * Add version for vte_terminal_set_alternate_screen_scroll to libvte9.symbols (probably a bit too tight, but due to changelog truncation this is the best I could readily manage). -- Colin Watson Tue, 09 Oct 2012 02:55:15 +0100 vte (1:0.28.2-5) unstable; urgency=medium * Update repository URL. * 03_CVE-2012-2738.patch, 04_CVE-2012-2738.patch: backport upstream patches to fix a memory exhaustion vulnerability. Closes: #677717. -- Josselin Mouette Sat, 23 Jun 2012 16:02:46 +0200 vte (1:0.28.2-4) unstable; urgency=low * debian/control.in: - Remove obsolete Conflicts and Replaces. * debian/rules: - Correctly pass libexecdir to configure so libvte has the correct path to gnome-pty-helper. Closes: #645104 * Add symbols file for libvte9 for improved shlibs dependencies and bump shlibs accordingly. Closes: #633798 -- Michael Biebl Sun, 11 Dec 2011 23:04:54 +0100 vte (1:0.28.2-3ubuntu2) precise; urgency=low * Add debian/patches/backscroll-stream-mem.patch: provide a memory-based scrollback stream backend to avoid hitting disk with terminal contents (LP: #778872). -- Kees Cook Wed, 21 Mar 2012 13:36:14 -0700 vte (1:0.28.2-3ubuntu1) precise; urgency=low * Merged from Debian unstable, remaining changes: - debian/patches/91_keep_fds.patch: - vte does not support G_SPAWN_LEAVE_DESCRIPTORS_OPEN when calling vte_terminal_fork_command_full(). - debian/patches/93_add_alt_screen_scroll_toggle.patch: - Handle scrolling differently when using alternate screen or scrolling is restricted. - debian/patches/lp246701_scroll_region_updates.patch: - Fix update glitch related to scroll regions. * debian/patches/gtk32-meta-map.patch: - Dropped, Debian uses a better patch * debian/patches/fix_gtk3_accessibility.patch: - Dropped, package no longer builds gtk3 version -- Michael Terry Sun, 11 Dec 2011 12:16:43 -0500 vte (1:0.28.2-3) unstable; urgency=low * 02_meta.patch: workaround for Meta key being broken since the GTK+ 2.24.8 upgrade. Closes: #648760. -- Josselin Mouette Sat, 19 Nov 2011 14:06:11 +0100 vte (1:0.28.2-2) experimental; urgency=low * Drop all GTK+3 packages and dependencies. This version will remain for GTK+2 support until no packages use it anymore. * Keep gobject-introspection build-dependency for the macro used by dh_autoreconf. * Disable glade catalogue and libgladeui requirement. -- Josselin Mouette Sat, 12 Nov 2011 15:46:30 +0100 vte (1:0.28.2-1) unstable; urgency=low * New upstream release. * debian/watch: - Track .xz tarballs. * Refresh debian/patches/25_optional-ncurses.patch. * debian/control.in: - Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer. - Add Vcs-* fields. - Bump Standards-Version to 3.9.2. No further changes. * Switch to dh_python2. -- Michael Biebl Wed, 19 Oct 2011 03:41:29 +0200 vte (1:0.28.2-0ubuntu3) precise; urgency=low * debian/patches/gtk32-meta-map.patch: Patch from upstream bugzilla to deal with the new meta mapping in GTK 3.2.2+ (LP: #890555) -- Luke Yelavich Wed, 16 Nov 2011 21:38:44 +1100 vte (1:0.28.2-0ubuntu2) oneiric; urgency=low * debian/patches/fix_gtk3_accessibility.patch: Slightly backported and tweaked patch from upstream bug #654630 to fix GTK3 accessibility post GTK/gail refactor, the original patch plus some suggested tweaks in the bug was used to preserve GTK2 support, can be dropped once we move to vte 0.29 -- Luke Yelavich Fri, 09 Sep 2011 10:31:22 +1000 vte (1:0.28.2-0ubuntu1) oneiric; urgency=low * New upstream release. Do not upgrade to 0.29 yet, as this drops GTK2 support, and we still have a ton of rdepends of libvte9. -- Martin Pitt Wed, 07 Sep 2011 10:06:44 +0200 vte (1:0.28.1-2) unstable; urgency=low * libvte-doc.links: dropped. Closes: #631881. * libvte-common.postinst: do the symlink dance for /usr/share/vte/termcap. Closes: #611826, #631824, #631801. -- Josselin Mouette Tue, 28 Jun 2011 18:52:26 +0200 vte (1:0.28.1-1ubuntu2) oneiric; urgency=low * Switch to dh_python2. (LP: #788514) -- Barry Warsaw Thu, 11 Aug 2011 14:18:14 -0400 vte (1:0.28.1-1ubuntu1) oneiric; urgency=low * Merge from debian unstable. Remaining changes: - Add 93_add_alt_screen_scroll_toggle.patch: Handle scrolling differently when using alternate screen or scrolling is restricted. - Add lp246701_scroll_region_updates.patch: Bug fix. (LP #246701) - 91_keep_fds.patch: vte-2.90 does not yet support G_SPAWN_LEAVE_DESCRIPTORS_OPEN when calling vte_terminal_fork_command_full() until that is fixed we need to keep this patch -- Michael Vogt Thu, 16 Jun 2011 17:59:49 +0200 vte (1:0.28.1-1) unstable; urgency=low * Tighten dependencies on libvte-common. * New upstream release. + CVE-2011-2198: fix memory exhaustion by using special character sequences. Closes: #629688. * Drop check-dist include. -- Josselin Mouette Wed, 15 Jun 2011 21:47:56 +0200 vte (1:0.28.0-2) experimental; urgency=low * Fix long description, thanks Teemu Ikonen. Closes: #623219. * Drop useless libvte-dev dependency on python-vte. Closes: #549015. * libvte-common Breaks libvte9 < 1:0.28. Closes: #616394, #611826. * python-vte Breaks python-apt << 0.8.0~exp2. Closes: #621483. * Fix udeb sourcedir, thanks Colin Watson. Closes: #627555. * 01_scroll_notebook.patch: new patch. Allow to switch tabs with Alt+wheel with the latest gtk+3.0. -- Josselin Mouette Sun, 05 Jun 2011 02:06:40 +0200 vte (1:0.28.0-1ubuntu3) oneiric; urgency=low * readd 91_keep_fds.patch for now. gdebi-gtk needs it until its ported to gtk3/vte3 where the required functionatlity is exposed via GI -- Michael Vogt Wed, 25 May 2011 17:42:27 +0200 vte (1:0.28.0-1ubuntu2) oneiric; urgency=low * Use DEB_DH_INSTALL_ARGS_$(udeb) rather than DEB_DH_INSTALL_SOURCEDIR_$(udeb), so that we actually use the udeb build pass again. -- Colin Watson Sat, 21 May 2011 23:14:42 +0100 vte (1:0.28.0-1ubuntu1) oneiric; urgency=low * Drop gir1.2-vte-0.0. We just have two reverse dependencies which will be moved to GTK3 and gir1.2-vte-2.90. * Drop 91_keep_fds.patch. The vte_terminal_forkpty API is deprecated, was closed upstream as "wontfix". * Drop lp621927_set_default_term.patch, fixed upstream in a different way. * Merge with Debian experimental. Remaining Ubuntu changes: - Add 93_add_alt_screen_scroll_toggle.patch: Handle scrolling differently when using alternate screen or scrolling is restricted. - Add lp246701_scroll_region_updates.patch: Bug fix. (LP #246701) -- Martin Pitt Tue, 17 May 2011 13:08:32 +0200 vte (1:0.28.0-1) experimental; urgency=low * Team upload. * New upstream release. * Add build-depends to libgladeui-dev, the GTK3 version now requires it. * Move autoreconf.mk before debhelper.mk to avoid debhelper.log leftovers. * Drop unneeded Sections fields duplicating the default value. * Add lintian overrides for package-name-doesnt-match-sonames and setgid-binary. -- Raphaël Hertzog Thu, 14 Apr 2011 20:27:53 +0000 vte (1:0.27.90-2) experimental; urgency=low * Drop unneeded dependency on libvte-common from gir1.2-vte-2.90. -- Jordi Mallach Wed, 06 Apr 2011 11:31:01 +0200 vte (1:0.27.90-1) experimental; urgency=low * Make the -dev package depend on the gir package. * Force the upgrade of libvte-common for the new termcap definitions. * New upstream pre-release. * Use dh-autoreconf; drop 90_autoreconf.patch. * Pass PYTHON= as configure argument instead of environment, so that it doesn’t get lost when dh-autoreconf goes mad. * Bump shlibs version. * There’s no longer gsettings stuff to isntall. * Update symbols file. * Make the -dev packages recommend the -doc package. -- Josselin Mouette Thu, 31 Mar 2011 10:34:47 +0530 vte (1:0.27.5-1) experimental; urgency=low * debian/control.in: + Drop obsolete dpkg-dev build dependency. + Bump the libgtk2.0-dev dependency on the -dev package. * New upstream release. + debian/control.in: - Update build dependencies. - Update for the new gtk+ 3 package names. + debian/patches/90_autoreconf.patch: - Updated. -- Emilio Pozuelo Monfort Sat, 19 Feb 2011 14:23:13 +0000 vte (1:0.27.4-1) experimental; urgency=low * Switch to CDBS' flavors system. * Bump debhelper compatibility to 8. * New upstream release, based on a patch by Michael Terry. Closes: #604846. * Include check-dist.mk to prevent accidental uploads to unstable. -- Emilio Pozuelo Monfort Wed, 12 Jan 2011 22:45:34 +0000 vte (1:0.24.3-2) unstable; urgency=low [ Emilio Pozuelo Monfort ] * debian/patches/12_python_reaper.patch: - Removed, upstream said WONTFIX, so remove that API. * debian/control.in: - Break gdebi (<< 0.6.1) since that's the first version not requiring the above patch. -- Josselin Mouette Sat, 06 Nov 2010 12:48:02 +0100 vte (1:0.24.3-1) unstable; urgency=low * New upstream bugfix release: + debian/patches/90_autoreconf.patch: - Regenerated for the new version. -- Sebastian Dröge Thu, 15 Jul 2010 20:30:04 +0200 vte (1:0.24.1-1) unstable; urgency=low * New upstream bugfix release: + debian/patches/01_transparent_crash.patch: - Dropped, fixed upstream. + debian/patches/25_optional-ncurses.patch: - Updated to apply cleanly again. + debian/patches/90_autoreconf.patch: - Regenerated for the new version. + debian/control.in: - Update build dependencies and dependencies of the -dev package. -- Sebastian Dröge Mon, 03 May 2010 20:11:29 +0200 vte (1:0.24.0-3) unstable; urgency=low * debian/python-vte.install: - Also install bindings for python2.6 (don't hardcode site-packages). * debian/control.in, debian/rules, debian/source/format, - Switch to source format 3.0 (quilt). * debian/patches/25_optional-ncurses.patch: - Updated to apply cleanly. * debian/control.in: - Bump Standards-Version to 3.8.4, no changes needed. -- Emilio Pozuelo Monfort Wed, 21 Apr 2010 14:18:44 +0200 vte (1:0.24.0-2) unstable; urgency=low * 01_transparent_crash.patch: patch by Tetralet to fix a crash when the background file is missing, or when the transparent background has no root window. Closes: #576624. -- Josselin Mouette Fri, 09 Apr 2010 18:23:02 +0200 vte (1:0.24.0-1) unstable; urgency=low * New upstream stable release: + debian/rules: - Update shlibs version because of new API. - Remove X_DISPLAY_MISSING from udeb CFLAGS. + debian/patches/90_autoreconf.patch: - Updated for the new version. -- Sebastian Dröge Wed, 31 Mar 2010 11:11:22 +0200 vte (1:0.23.5-4) experimental; urgency=low [ Cyril Brulebois ] * Switch udeb from DirectFB to Xlib to prepare the move to an X11-based graphical installer - Drop the B-D on libgtk-directfb-2.0-dev. - Bump the B-D on libgtk2.0-dev to make sure the udeb gets its dependency on the (recently-added) udeb rather than on the library. [ Emilio Pozuelo Monfort ] * debian/rules: - Remove hack that was needed to build the udeb against the DirectFB GTK+ library, since the default one was the X11. We build against the X11 one now. * debian/patches/12_python_reaper.patch: - Mention that this is WONTFIX upstream and that we should eventually remove it. -- Emilio Pozuelo Monfort Tue, 16 Mar 2010 22:20:16 +0100 vte (1:0.23.5-3) experimental; urgency=low * debian/rules: + Update shlibs version to >= 0.23.5. -- Sebastian Dröge Thu, 14 Jan 2010 09:02:23 +0100 vte (1:0.23.5-2) experimental; urgency=low * New upstream development release: + debian/patches/90_autoreconf.patch: - Refreshed. + debian/rules: - Include check-dist.mk to prevent accidental uploads to unstable. + debian/control.in: - Build depend on GLib >= 2.22.0. -- Sebastian Dröge Thu, 14 Jan 2010 08:17:53 +0100 vte (1:0.22.5-1) unstable; urgency=low * New upstream release. - debian/patches/90_autoreconf.patch: + Refreshed. -- Sebastian Dröge Wed, 18 Nov 2009 07:40:57 +0100 vte (1:0.22.4-1) unstable; urgency=low * New upstream release. - debian/patches/90_autoreconf.patch: + Refreshed. -- Emilio Pozuelo Monfort Sun, 08 Nov 2009 21:44:54 +0100 vte (1:0.22.3-1) unstable; urgency=low * New upstream bugfix release: + debian/patches/70_python_env.patch: - Dropped, merged upstream. - debian/patches/90_autoreconf.patch: + Refreshed. -- Sebastian Dröge Tue, 27 Oct 2009 09:35:46 +0100 vte (1:0.22.2-2) unstable; urgency=low * debian/patches/70_python_env.patch: - Fix Python environment passing, GNOME #587894. -- Luca Falavigna Sat, 10 Oct 2009 13:43:27 +0200 vte (1:0.22.2-1) unstable; urgency=low * New upstream bugfix release. - debian/patches/01_vte_sequence_handler_cd_crash.patch: + Removed, applied upstream. - debian/patches/90_autoreconf.patch: + Refreshed. * debian/watch: Don't uupdate. -- Emilio Pozuelo Monfort Tue, 29 Sep 2009 14:06:41 +0200 vte (1:0.22.1-2) unstable; urgency=low * debian/patches/01_vte_sequence_handler_cd_crash.patch: - Patch from Matijs van Zuijlen to fix a crash. Closes: #548388. -- Emilio Pozuelo Monfort Sun, 27 Sep 2009 00:45:48 +0200 vte (1:0.22.1-1) unstable; urgency=low * New upstream bugfix release. - Fix crash on terminal reset. Closes: #548319. * debian/patches/01_background_ncurses.patch: - Removed, the fix is in the new version. * debian/patches/25_optional-ncurses.patch, debian/patches/90_autoreconf.patch: - Refreshed. -- Emilio Pozuelo Monfort Sat, 26 Sep 2009 00:01:19 +0200 vte (1:0.22.0-2) unstable; urgency=low * 01_background_ncurses.patch: stolen upstream. Fix background color in ncurses applications. Closes: #548241. -- Josselin Mouette Thu, 24 Sep 2009 22:49:17 +0200 vte (1:0.22.0-1) unstable; urgency=low [ Emilio Pozuelo Monfort ] * debian/patches/01_bashisms.patch: forwarded, add header. [ Sebastian Dröge ] * New upstream stable release. -- Sebastian Dröge Tue, 22 Sep 2009 13:34:21 +0200 vte (1:0.20.5-1) unstable; urgency=low * New upstream bugfix release, undoing the unintended soname bump (Closes: #532552): + debian/control.in, debian/*.install: - Undo package rename. + debian/patches/90_autoreconf.patch: - Updated for the new version. -- Sebastian Dröge Wed, 10 Jun 2009 07:07:43 +0200 vte (1:0.20.4-1) unstable; urgency=low [ Josselin Mouette ] * Add libglib2.0-doc, libgtk2.0-doc and libatk1.0-doc to b-d-i to ensure proper xrefs. * 01_bashisms.patch: fix bashims in provided scripts. Closes: #530123. [ Sebastian Dröge ] * New upstream bugfix releases: + debian/rules: - Update shlibs version to >= 0.20.4 for API additions. + debian/control.in, debian/*.install: - Update for the new soname. + debian/patches/90_autoreconf.patch: - Regenerated for the new version. -- Sebastian Dröge Tue, 02 Jun 2009 07:01:29 +0200 vte (1:0.20.1-1) unstable; urgency=low [ Luca Bruno ] * New upstream release. * debian/patches/20_make_ft2_optional.patch: - Removed as ft2 files have been removed upstream. * debian/patches/12_python_reaper.patch, debian/patches/25_optional-ncurses.patch, debian/patches/90_autoreconf.patch: - Updated to apply cleanly. * debian/patches/30_fix_build_no_pty_helper.patch, debian/patches/04_dsp_non_alias.patch, debian/patches/92_full_bold_fonts.patch: - Removed as applied upstream. * debian/control.in: - General dependencies changes: + Removed libxt, libxft, libfontconfig1, libxrenderer and libfreetype6 as they are no more referenced in the upstream code since using pangocairo. + Bump libglib2.0-dev to 2.18.0. + Bump libgtk2.0-dev to 2.14.0. + Specify libpango1.0-dev version needed is 1.22.0. - Build-Depends: + Added libgladeui-1-dev. - libvte-dev Depends: + Removed libatk1.0-dev, libsm-dev, libice-dev, zlib1g-dev and libx11-dev. - Update Standards-Version to 3.8.1, no additional changes needed. * debian/rules: - Removed xft2, ft, pangox, glX and x configure options. - Add -DX_DISPLAY_MISSING to udeb CFLAGS. - Add --enable-glade-catalogue to DEB_CONFIGURE_EXTRA_FLAGS to install gladeui files. * debian/libvte-common.install: - Install gladeui files under /usr/share/glade3. [ Josselin Mouette ] * New upstream release. * Install the Python development files in libvte-dev and make this package provide python-vte-dev, just in case. * Fix dh_pysupport invocation. * Bump shlibs to version 1:0.19.4. * Remove libvte-dev dependency on ncurses. * Remove incorrect Provides: in python-vte. * Switch to quilt to manage patches. * 90_autoreconf.patch: updated for the new version. -- Josselin Mouette Thu, 23 Apr 2009 00:41:20 +0200 vte (1:0.17.4-2) unstable; urgency=low * Upload to unstable. -- Josselin Mouette Wed, 04 Mar 2009 13:55:08 +0100 vte (1:0.17.4-1) experimental; urgency=low * New upstream release: + debian/control.in: - Update build-depends. - Update Standards-Version to 3.8.0, no additional changes needed. + debian/rules: - Update shlibs version to reflect API additions. + debian/patches/29_add_am_prog_cc_c_o_for_buffer_c.patch, debian/patches/01_anjuta_hang.patch: - Dropped, merged upstream. + debian/patches/20_make_ft2_optional.patch, debian/patches/90_autoreconf.patch: - Updated to apply cleanly again. + debian/patches/92_full_bold_fonts.patch: - Patch from the Ubuntu package to first check if a bold variant of a font exists before using "pseudo-bolding". + debian/python-vte.examples: - Add some more examples, taken from the Ubuntu package. * debian/watch: + Updated for new versions. -- Sebastian Dröge Mon, 24 Nov 2008 10:15:11 +0100 vte (1:0.16.14-4) unstable; urgency=low [ Josselin Mouette ] * libvte-doc.links: add a link in /usr/share/doc to the documentation. Closes: #495356. [ Loic Minier ] * Don't overwrite DEB_FIXPERMS_EXCLUDE and DEB_DH_MAKESHLIBS_ARGS_ALL. [ Josselin Mouette ] * 01_anjuta_hang.patch: new patch, stolen from upstream. Fix hangs in Geany and Anjuta. Closes: #498295. -- Josselin Mouette Fri, 24 Oct 2008 18:53:48 +0200 vte (1:0.16.14-3) unstable; urgency=low * Fix 1:0.16.14-2 changelog entry. * Upload to unstable. -- Loic Minier Mon, 04 Aug 2008 12:21:58 +0200 vte (1:0.16.14-2) experimental; urgency=low [ Loic Minier ] * Properly anchor libvteN regexp. * Misc cleanups of the below changelog and patches. [ Jérémy Bobbio ] * New patch, 20_make_ft2_optional, make Freetype2 bdep/dep optional; GNOME #542560. * New patch, 29_add_am_prog_cc_c_o_for_buffer_c, add the AM_PROG_CC_C_O macro which automake claim is required and was added in upstream SVN already. * New patch, 30_fix_build_no_pty_helper, fix missing header issue when building without gnome-pty-helper; GNOME #542561. * New patch, 25_optional_ncurses, allows not linking against ncurses but using the builtin termcap support instead. * New patch, 90_autoreconf, run autoreconf for 20_make_ft2_optional, 29_add_am_prog_cc_c_o_for_buffer_c, and 25_optional_ncurses. * Re-enable libvte9-udeb build. - Drop libvte-common dep in the udeb. - Configure the udeb without pangox and ft2 and with a static ncurses. * New patch, 60_termcap-home-end, defines home/end in the builtin termcap support file. [ Loic Minier ] * Drop dup --disable-maintainer-mode flag. * Override CFLAGS for udeb during configure. -- Loic Minier Thu, 26 Jun 2008 20:44:36 +0200 vte (1:0.16.14-1) unstable; urgency=low * New upstream bugfix release. -- Sebastian Dröge Thu, 05 Jun 2008 12:21:06 +0200 vte (1:0.16.13-1) unstable; urgency=low [ Emilio Pozuelo Monfort ] * debian/control.in: - Fix libvte-doc short description, which was refering to development files instead of documentation. [ Loic Minier ] * Drop head -n1 from libvteN computation. [ Sebastian Dröge ] * New upstream bugfix release. -- Sebastian Dröge Mon, 10 Mar 2008 21:51:56 +0100 vte (1:0.16.12-1) unstable; urgency=low * New upstream bugfix release. * debian/control.in: + Update Standards-Version to 3.7.3, no additional changes needed. -- Sebastian Dröge Wed, 09 Jan 2008 19:42:18 +0100 vte (1:0.16.11-1) unstable; urgency=low [ Loic Minier ] * Tighten libvte package name extraction. [ Sebastian Dröge ] * New upstream bugfix release. -- Sebastian Dröge Mon, 17 Dec 2007 21:52:05 +0100 vte (1:0.16.10-1) unstable; urgency=low * New upstream bugfix release. -- Sebastian Dröge Tue, 04 Dec 2007 12:13:11 +0100 vte (1:0.16.9-1) unstable; urgency=low * New upstream release, with API additions: + debian/rules: - Bump shlibs to >= 0.16.9 for the API additions. -- Sebastian Dröge Tue, 18 Sep 2007 10:28:08 +0200 vte (1:0.16.8-1) unstable; urgency=low [ Alan Baghumian ] * New upstream release: - Dropped 60_fix-ctrl-dash.patch and 62_alt-arrows.patch, merged upstream - Fixes rendering of line-drawing characters; closes: #418699. [ Loic Minier ] * New upstream stable release; no API change. -- Loic Minier Mon, 30 Jul 2007 20:25:31 +0200 vte (1:0.16.6-3) unstable; urgency=low * Cleanup changelog. * Drop patch 61_ctrl-and-shift-arrows as it breaks up/down history; closes: #434558, #434560, #434577, #434560. -- Loic Minier Wed, 25 Jul 2007 09:43:04 +0200 vte (1:0.16.6-2) unstable; urgency=low * Drop patch 41_from_upstream_fix_nvi_scrolling; fixed differently upstream since 0.16.2; see GNOME #417652. * Add xrefs to patches. * New patches, 61_ctrl-and-shift-arrows and 62_alt-arrows, should fix handling of Ctrl-, Shift-, and Alt- + arrow keys by using xterm's sequences; GNOME #310305 and #337252; closes: #421734. -- Loic Minier Tue, 24 Jul 2007 09:06:47 +0200 vte (1:0.16.6-1) unstable; urgency=low * Pass proper configure flags to the udeb. * Generate proper shlibs for the udeb. * Build against the diretcfb Gtk flavor. * Disable udeb for now since it's unlikely to get useful soon. * New upstream stable release; no API change. - Fixes 24 colors support; GNOME #332606, #372743; closes: #320114. * New patch, 60_fix-ctrl-dash, fixes mapping for Ctrl + dash; thanks Andrey Melnikov; GNOME #448259; closes: #429260. -- Loic Minier Tue, 19 Jun 2007 11:08:11 +0200 vte (1:0.16.5-2) experimental; urgency=low * Add a new libvte9-udeb package. -- Loic Minier Mon, 18 Jun 2007 23:10:47 +0200 vte (1:0.16.5-1) unstable; urgency=low * New upstream release * Dropped 20_fix_strange_lines.patch, merged upstream -- Alan Baghumian Wed, 06 Jun 2007 11:05:11 +0330 vte (1:0.16.4-1) unstable; urgency=low * New upstream release + fix ctrl-key combinations yielding just key. Closes: #425879, #421734. + fix scrollback corruption. Closes: #421092. * Added 20_fix_strange_lines.patch, fixed strange lines above the screen; from SVN r1904. -- Alan Baghumian Sun, 03 Jun 2007 17:25:27 +0330 vte (1:0.16.3-1) unstable; urgency=low * New upstream release; no API change. -- Loic Minier Fri, 27 Apr 2007 23:29:59 +0200 vte (1:0.16.2-1) unstable; urgency=low * Upload to unstable; drop check-dist include. * Wrap build-deps and deps. * New upstream stable release; no API change. -- Loic Minier Tue, 24 Apr 2007 14:55:49 +0200 vte (1:0.16.1-1) experimental; urgency=low * New upstream release; no API change. - Fixes output of incorrect colours; closes: #416125. - Drop patch 40_fix_transparency_bug, fixed differently upstream. - Drop patch -and-delayed-redraws-race, merged upstream. * Drop debian/pyversions and set XB and XS-Python-Version. -- Loic Minier Tue, 10 Apr 2007 17:31:28 +0200 vte (1:0.16.0-2) experimental; urgency=low * New patch, 50_expose-and-delayed-redraws-race, fixes a race between expose and delayed redraws; GNOME #419116; closes: #415730. -- Loic Minier Wed, 21 Mar 2007 17:44:46 +0100 vte (1:0.16.0-1) experimental; urgency=low * New upstream major stable release; API additions. - Build-depend on libpango1.0-dev and libxft-dev. - Bump shlibs to >= 1:0.16.0. - Drop patch 30_pkg-config-private-field-for-freetype, merged upstream. * New patch, 40_fix_transparency_bug, workarounds a bug with transparency; by Nicolas Bruguier and Chris Wilson; Launchpad #91985; found in the Ubuntu package. * New patch, 41_from_upstream_fix_nvi_scrolling, fixes scrolling in nvi; patch from Chris Wilson; Launchpad: #91017; found in the Ubuntu package. -- Loic Minier Sun, 18 Mar 2007 11:08:13 +0100 vte (1:0.14.2-1) experimental; urgency=low * Add a get-orig-source target to retrieve the upstream tarball. * Include the new check-dist Makefile to prevent accidental uploads to unstable; bump build-dep on gnome-pkg-tools to >= 0.10. * Drop version in the dependency on libvte-common to permit installing two libvte shared library packages at the same time; the files in libvte-common are translations and a termcap file which didn't change since 2002 which is supposedly eternally backward compatible, hence this should only result in some untranslated text. * Merge 1:0.12.2-5 / SVN revs 7195:8677. * New upstream release; no API change. - Drop patch 20_gtk-style-attach-crash, merged upstream. -- Loic Minier Thu, 1 Mar 2007 11:30:40 +0100 vte (1:0.14.1-1) experimental; urgency=low * New upstream release. -- Josselin Mouette Tue, 21 Nov 2006 20:37:02 +0100 vte (1:0.14.0-1) experimental; urgency=low * New upstream release; no API change. * Preemptively fix the 12_python_reaper patch to work with newer codegen, thanks Daniel Holbach and Michael Vogt for all the fish. * Merge 1:0.12.2-4. -- Loic Minier Tue, 5 Sep 2006 16:43:37 +0200 vte (1:0.13.7-1) experimental; urgency=low * New upstream development release; no API change. -- Loic Minier Fri, 25 Aug 2006 20:20:03 +0200 vte (1:0.13.6-1) experimental; urgency=low * New upstream development release; no API change. * Merge 1:0.12.2-3. -- Loic Minier Wed, 23 Aug 2006 15:56:50 +0200 vte (1:0.13.5-1) experimental; urgency=low * New upstream development releases, with API changes. - Target at experimental. - Rename livte4 to libvte9 for the new SONAME. - Bump shlibs to >= 1:0.13.3. - Drop 08_set_backspace_to_utf8 patch, merged upstream. - Drop 09_multiscreen_safe, fixed upstream. - Drop 70_relibtoolize, I'm too lazy to update it for dev releases. - Bump up libglib2.0-dev build-dep to > 2.9.0. -- Loic Minier Wed, 9 Aug 2006 22:45:15 +0200 vte (1:0.12.2-5) unstable; urgency=medium * Add a get-orig-source target to retrieve the upstream tarball. * New patch, 20_gtk-style-attach-crash, fixes crash in gtk_style_attach when changing icon theme; backported from GNOME #399282 / vte 0.14.2; see also GNOME #353498. * Stop shipping *.a and *.la files for Python modules. -- Loic Minier Mon, 26 Feb 2007 14:15:57 +0100 vte (1:0.12.2-4) unstable; urgency=medium * Remove references to the forgotten hardcoded python2.3 and python2.4 version from the python-vte.install file, thanks Daniel Holbach. * Urgency medium since this will cause FTBFS in the future. -- Loic Minier Tue, 5 Sep 2006 16:36:09 +0200 vte (1:0.12.2-3) unstable; urgency=medium * Drop useless DEB_PYTHON_SYSTEM=pysupport. * Rework package build completely to follow pyversions --requested. * Set pyversions to "2.3-". * Urgency medium since this fixes a FTBFS. -- Loic Minier Wed, 23 Aug 2006 15:44:03 +0200 vte (1:0.12.2-2) unstable; urgency=low [ Loic Minier ] * Remove versions in Conflicts/Replaces with python2.X-vte. [ Josselin Mouette ] * 12_python_reaper.patch: patch from Michael Vogt to add a python binding for the reaper object (closes: #364383, #381143). [ Loic Minier ] * Add ${misc:Depends}. -- Loic Minier Wed, 9 Aug 2006 22:15:22 +0200 vte (1:0.12.2-1) unstable; urgency=low [ Loic Minier ] * New upstream release. - Relibtoolize. [debian/patches/70_relibtoolize.patch] * Fix watch file. [ Gustavo Franco ] * Python New Policy Transition. (Closes: #373405) - debian/control: - python-vte now provides Python 2.3 and 2.4 vte Python bindings. - Add python-support as Build-Depends. - Fix python-vte package description. - debian/rules: - Add DEB_PYTHON_SYSTEM variable and set to pysupport. - Make the needed changes to provide Python 2.3 and 2.4 vte Python bindings in the same binary package (python-vte). - Remove dh_python call since it's no more needed. - Add dh_pysupport call in binary-install/python-vte target. - Remove debian/python{2.3,2.4}-vte.install - Add debian/python-vte.install * Set debhelper compatibility to 5. -- Gustavo Franco Tue, 11 Jul 2006 01:06:36 -0300 vte (1:0.12.1-1) unstable; urgency=low [ Josselin Mouette ] * Set fatalerror as the primary maintainer. * Make the package binNMU-safe. + Build-depend on dpkg-dev 1.13.19. + Use ${source:Version} and ${binary:Version}. [ Loic Minier ] * Stop shipping /usr/lib/*.la files in libvte-dev. [debian/libvte-dev.install] * New upstream release, with API additions. - Bump up libgtk2.0-dev build-dep to >= 2.6.0. [debian/control, debian/control.in] - Add a libglib2.0-dev build-dep (> 2.6.0). [debian/control, debian/control.in] - Bump shlibs to >= 1:0.12.1. [debian/rules] - Drop restricted region adjustment patch as upstream merged it and also fixed a couple of issues it had. [debian/patches/20_restricted_region_readjustment.patch] - Relibtoolize. [debian/patches/70_relibtoolize.patch] * Fix clenaup of /debian/tmp-2.3 instead of debian/tmp-2.3 introduced with Python 2.4 support. [debian/rules] * Bump up Standards-Version to 3.7.2. [debian/control, debian/control.in] -- Loic Minier Fri, 12 May 2006 16:11:16 +0200 vte (1:0.12.0-2) unstable; urgency=low * Drop references to libXcursor.la -- Guilherme de S. Pastore Fri, 21 Apr 2006 12:49:11 -0300 vte (1:0.12.0-1) unstable; urgency=low * New upstream release. * debian/patches/20_restricted_region_readjustment.patch: - patch from upstream CVS to fix the famous Blue Screen of Death with irssi running inside screen. * debian/copyright: - updated list of upstream authors - updated to use http://download.gnome.org/ * debian/watch: - updated to use http://download.gnome.org/ -- Guilherme de S. Pastore Sun, 2 Apr 2006 12:15:57 -0300 vte (1:0.11.20-3) unstable; urgency=low * Fix Python build-deps, thanks Jan Lübbe. [debian/control, debian/control.in] -- Loic Minier Mon, 27 Feb 2006 09:55:30 +0100 vte (1:0.11.20-2) unstable; urgency=low * Merge nice patch from Jan Lübbe to build vte's python bindings for python 2.3 and 2.4. (Closes: #353434) [debian/control, debian/control.in, debian/python-vte.install, debian/python2.3-vte.install, debian/python2.4-vte.install, debian/rules] * Tune up the descriptions slightly. [debian/control, debian/control.in] * Let python2.3-vte replace previous versions of python-vte. [debian/control, debian/control.in] -- Loic Minier Sun, 26 Feb 2006 21:34:54 +0100 vte (1:0.11.20-1) unstable; urgency=low * New upstream release. -- Loic Minier Sun, 26 Feb 2006 11:28:15 +0100 vte (1:0.11.19-1) unstable; urgency=low * New upstream release. - Shift+Insert pasting works as in the past. (Closes: #354275) -- Loic Minier Sat, 25 Feb 2006 17:45:13 +0100 vte (1:0.11.18-1) unstable; urgency=low * New upstream release. - Drop double free() fix (merged upstream). [debian/patches/07_remove_doublefree.patch] -- Loic Minier Sun, 12 Feb 2006 20:55:57 +0100 vte (1:0.11.17-1) unstable; urgency=low * New upstream release. - This release backs out all changes made to the .pc file in debian/patches/30_pkg-config-private-fields.patch, and hence reopens #340406, but should include proper -I flags. (Closes: #346039) - New patch to move only the libfreetype link flags to Libs.private. [debian/patches/30_pkg-config-private-field-for-freetype.patch] (Closes: #340406) - Drop patch adding console sequesnces to save/restore cursor position (merged upstream). [debian/patches/05_cursor_position.patch] - Drop relibtoolizing patch as the person bootstrapping vte for GNOME was visibly running Debian. :) [debian/patches/70_relibtoolize.patch] -- Loic Minier Sun, 29 Jan 2006 18:35:39 +0100 vte (1:0.11.16-1) unstable; urgency=low * New upstream release. - Drop patch to use .private pkg-config pseudo-headers (included upstream). [debian/patches/30_pkg-config-private-fields.patch] - No need to "rm python/vte.c", this is not distributed upstream anymore. [debian/rules] - Drop patch to fix gdk warnings (included upstream). [debian/patches/20_gdk-warning.patch] - Relibtoolize. [debian/patches/70_relibtoolize.patch] -- Loic Minier Mon, 23 Jan 2006 22:15:53 +0100 vte (1:0.11.15-4) unstable; urgency=low * Build-depend on libfreetype6-dev (>= 2.0.2) to match the checks in configure.in. (Closes: #340412) [debian/control, debian/control.in] * Use pkg-config's Libs.private and Requires.private field for libraries and packages needed only for static linking instead of the Libs / Requires fields; you need to build-depend on pkg-config (>= 0.18) to use these fields. Based on a patch by Steve Langasek. (Closes: #340406) [debian/patches/30_pkg-config-private-fields.patch] -- Loic Minier Wed, 23 Nov 2005 15:23:11 +0100 vte (1:0.11.15-3) unstable; urgency=high * Force regeneration of the python bindings by removing python/vte.c. (Closes: #334001, #334668, #338090) [debian/rules] -- Loic Minier Tue, 8 Nov 2005 22:38:50 +0100 vte (1:0.11.15-2) unstable; urgency=high * Urgency high for RC bug fix. * Add libsm-dev, libice-dev, zlib1g-dev, libncurses5-dev | libncurses-dev, libx11-dev, and libfontconfig1-dev deps to vte-dev, according to its .pc file. (Closes: #259671) [debian/control, debian/control.in] -- Loic Minier Sun, 16 Oct 2005 22:21:33 +0200 vte (1:0.11.15-1) unstable; urgency=low [ Sebastien Bacher ] * debian/control.in: - use ${python:Depends}. * debian/python-vte.install: - don't use a specific python version. * debian/rules: - use dh_python. [ Loic Minier ] * New upstream releases. - Fix confusion between py_palette and item in _wrap_vte_terminal_set_colors(), doesn't segfault anymore in vte.Terminal.set_colors(). (Closes: #319987) * Add CDBS' utils. * Drop obsolete patches. [debian/patches/02_path_xtra.patch, debian/patches/03_path_xtra-2.patch, debian/patches/11_hide_pageup_behavior.patch] * Temporarily add libxt-dev build-dependency to let AC_PATH_X/AC_PATH_XTRA autodetect X development files, see . * Update FSF address. [debian/copyright] -- Loic Minier Sun, 11 Sep 2005 16:03:32 +0200 vte (1:0.11.13-4) unstable; urgency=high * Urgency high for testing targetted RC bugfix. * Add dependencies to libvte-dev on libxft-dev, libfreetype6-dev, libatk1.0-dev, libpango1.0-dev, libglib2.0-dev to conform with libvte.la's dependency_libs. [debian/control, debian/control.in] (Closes: #259671) -- Loic Minier Sun, 31 Jul 2005 16:01:15 +0200 vte (1:0.11.13-3) unstable; urgency=low * Fix Gdk warnings with a patch from upstream. (Closes: #316940, #318549) [debian/patches/20_gdk-warning.patch] * Bump up Standards Version to 3.6.2. -- Loic Minier Thu, 21 Jul 2005 20:01:23 +0200 vte (1:0.11.13-2) unstable; urgency=low * Rebuild on an unstable box to avoid dependencies in experimental. -- Josselin Mouette Sat, 30 Apr 2005 19:07:20 +0200 vte (1:0.11.13-1) unstable; urgency=low * New upstream version * Added a new package that contains the documentation (Closes: #300742) * debian/patches: - 01_vtemodule.patch: applied -- Arnaud Patard Tue, 19 Apr 2005 23:05:02 +0200 vte (1:0.11.12-1) unstable; urgency=low * New upstream version. Lots of patches in Gnome's bugzilla have been applied. * debian/patches : - Merged patches : 05_performance_boost.patch 10_redraw_vte_screen.patch 12_fix_display_corrption_in_utf8.patch - Splitted 02_path_xtra.patch into to patches : 02_path_xtra.patch contains the configure.in patch 03_path_xtra-2.patch contains the configure patch - Updated 07_remove_doublefree.patch as it's partially applied -- Arnaud Patard Thu, 3 Mar 2005 23:54:07 +0100 vte (1:0.11.11-6) unstable; urgency=low * Added patches from Emil Soleyman-Zomalan . * debian/patches: - Balanced performance improvement (Closes: #197797) 05_performance_boost.patch http://bugs.gnome.org/show_bug.cgi?id=143914 - Resolve double free problem 07_remove_doublefree.patch http://bugs.gnome.org/show_bug.cgi?id=161337 - Set backspace behavior to utf8 (depends on utf8 locale) 08_set_backspace_to_utf8.patch http://bugs.gnome.org/show_bug.cgi?id=158200 - Make vte multi-screen safe 09_multiscreen_safe.patch http://bugs.gnome.org/show_bug.cgi?id=160782 - Redraw vte screen with correct background color 10_redraw_vte_screen.patch http://bugs.gnome.org/show_bug.cgi?id=125364 - Hide manifestation of PageUp behavior with less (Closes: #285143) 11_hide_pageup_behavior.patch http://bugzilla.gnome.org/show_bug.cgi?id=115149 - Fix utf8 display cooruption (Closes: #276316) 12_fix_display_corrption_in_utf8.patch http://bugzilla.gnome.org/show_bug.cgi?id=154896 -- Arnaud Patard Wed, 22 Dec 2004 01:32:58 +0100 vte (1:0.11.11-5) unstable; urgency=low * debian/patches: - Relibtoolized 02_path_xtra.patch (Closes: #259671) - Added an updated patch from http://bugs.gnome.org/show_bug.cgi?id=142640 to display correctly fonts (Closes: #251355) -- Arnaud Patard Thu, 12 Aug 2004 14:00:51 +0200 vte (1:0.11.11-4) unstable; urgency=low * GNOME team upload. * debian/rules: add epoch to shlib declaration (closes: #253120). -- Jordi Mallach Sun, 20 Jun 2004 17:24:12 +0200 vte (1:0.11.11-3) unstable; urgency=low * Gnome Team Upload. * debian/rules: + shlibs version = 0.11.11. -- Sebastien Bacher Tue, 8 Jun 2004 00:55:25 +0200 vte (1:0.11.11-2) unstable; urgency=low * GNOME Team Upload. * Upload in unstable. -- Sebastien Bacher Thu, 27 May 2004 00:15:35 +0200 vte (1:0.11.11-1) experimental; urgency=low * New upstream version - Removes all former patches, as they're no more needed - Add a patch for correcting init_vte typos. - This version add more documentation in python-vte module (Closes: #225296) - New build dependency on gtk-doc-tools * Added a patch for using AC_PATH_XTRA with Debian's enhancements. * Added a patch for supporting some save/restore cursor position console sequences (Closes: 248896) -- Arnaud Patard Sun, 2 May 2004 22:37:25 +0200 vte (1:0.11.10-8) unstable; urgency=low * debian/patches: - Added a patch to support the vte_terminal_fork_pty call coming from upstream cvs (Closes: #241485) -- Arnaud Patard Sun, 18 Apr 2004 14:18:56 +0200 vte (1:0.11.10-7) unstable; urgency=low * The gnome-pty-helper didn't have the right permissions, so it couldn't update the utmp files. (Closes: #240279) -- Arnaud Patard Tue, 30 Mar 2004 01:15:47 +0200 vte (1:0.11.10-6) unstable; urgency=low * Fixed build-dependencies (Closes: #238470) -- Arnaud Patard Wed, 17 Mar 2004 19:25:26 +0100 vte (1:0.11.10-5) unstable; urgency=low * New maintainer (Closes: #234970) * Switched from debhelper to cdbs for the packaging -- Arnaud Patard Sun, 29 Feb 2004 19:41:29 +0100 vte (1:0.11.10-4) unstable; urgency=low * This package suck more and more, slow, broken and upstream don't care, thus orpahned. -- Christian Marillat Thu, 26 Feb 2004 21:48:39 +0100 vte (1:0.11.10-3) unstable; urgency=low * New patch 02_link.dpatch to fix broken linkage (Closes: #220108) -- Christian Marillat Sun, 30 Nov 2003 17:21:07 +0100 vte (1:0.11.10-2) unstable; urgency=low * Add patch for less artifacts (Closes: #218399) * NMU aren't walcome when I've tagged this bug pending two days ago. Don't touch my packages. -- Christian Marillat Mon, 3 Nov 2003 19:13:10 +0100 vte (1:0.11.10-1) unstable; urgency=low * New upstream release. -- Christian Marillat Sun, 19 Oct 2003 11:32:07 +0200 vte (1:0.10.29-6) unstable; urgency=low * Re-apply cursor blinking patch (Closes: #186764, #211818) -- Christian Marillat Tue, 30 Sep 2003 22:50:18 +0200 vte (1:0.10.29-5) unstable; urgency=low * Add libxrender-dev in Builde-Depends and Depends for the -dev package (Closes: #208533) -- Christian Marillat Wed, 3 Sep 2003 18:19:51 +0200 vte (1:0.10.29-4) unstable; urgency=low * Fix python dependencies in python-vte (Closes: #206285) * New patch to fix a bug with the blinking (Closes: #186764) -- Christian Marillat Wed, 20 Aug 2003 16:29:34 +0200 vte (1:0.10.29-3) unstable; urgency=low * debian/control Add python-gtk2-dev in build-depends * python package need to depends on a versioned python-gtk2 (>= 1.99.17-2) * Revert bug introduced in 0.10.28 about scrolling page (Closes: #190651, #203049) -- Christian Marillat Tue, 19 Aug 2003 20:43:43 +0200 vte (1:0.10.29-2) unstable; urgency=low * debian/rules remove an old CC=gcc-3.2 (Closes: #196911) -- Christian Marillat Tue, 10 Jun 2003 20:33:06 +0200 vte (1:0.10.29-1) unstable; urgency=low * New upstream release. -- Christian Marillat Mon, 9 Jun 2003 22:26:53 +0200 vte (1:0.10.28-1) unstable; urgency=low * New upstream release. -- Christian Marillat Tue, 13 May 2003 09:07:26 +0200 vte (1:0.10.27-1) unstable; urgency=low * New upstream release. * Fix fonts size (Closes: #186705) -- Christian Marillat Mon, 5 May 2003 13:13:52 +0200 vte (0.11.0-2) unstable; urgency=low * Update section * Fix crash on exit (Closes: #186593) -- Christian Marillat Fri, 4 Apr 2003 12:49:57 +0200 vte (0.11.0-1) unstable; urgency=low * New upstream release. -- Christian Marillat Wed, 26 Mar 2003 21:26:39 +0100 vte (0.10.26-1) unstable; urgency=low * New upstream release. * Fix text wrapping (Closes: #183337) -- Christian Marillat Tue, 4 Mar 2003 21:09:31 +0100 vte (0.10.25-1) unstable; urgency=low * new upstream release. -- Christian Marillat Tue, 25 Feb 2003 01:39:37 +0100 vte (0.10.23-1) unstable; urgency=low * New upstream release. -- Christian Marillat Fri, 21 Feb 2003 20:56:58 +0100 vte (0.10.22-1) unstable; urgency=low * New upstream release. * Fix tab focus (Closes: #180370) -- Christian Marillat Thu, 20 Feb 2003 10:17:29 +0100 vte (0.10.20-1) unstable; urgency=low * New upstream release. -- Christian Marillat Sat, 15 Feb 2003 02:00:29 +0100 vte (0.10.19-1) unstable; urgency=low * New upstream release. -- Christian Marillat Thu, 13 Feb 2003 10:42:34 +0100 vte (0.10.17-1) unstable; urgency=low * New upstream release. -- Christian Marillat Mon, 3 Feb 2003 15:56:24 +0100 vte (0.10.16-1) unstable; urgency=low * New upstream release. -- Christian Marillat Fri, 31 Jan 2003 18:06:35 +0100 vte (0.10.15-1) unstable; urgency=low * New upstream release. * Fix vim and scroll mouse (Closes: #176952) -- Christian Marillat Tue, 28 Jan 2003 10:47:06 +0100 vte (0.10.14-1) unstable; urgency=low * New upstream release. * Workaround to fix undocumented xttitle escape sequence (Closes: #178066) * Fix shift+arrows keys (Closes: #177745) * Fix DEC graphics characters (Closes: #177977) -- Christian Marillat Fri, 24 Jan 2003 12:24:18 +0100 vte (0.10.12-1) unstable; urgency=low * New upstream release. -- Christian Marillat Mon, 20 Jan 2003 22:54:23 +0100 vte (0.10.11-1) unstable; urgency=low * New upstream release. -- Christian Marillat Sat, 18 Jan 2003 15:57:33 +0100 vte (0.10.10-2) unstable; urgency=low * -dev package should depends on libncurses5-dev (Closes: #176684) -- Christian Marillat Tue, 14 Jan 2003 16:52:06 +0100 vte (0.10.10-1) unstable; urgency=low * New upstream release. -- Christian Marillat Tue, 14 Jan 2003 12:13:00 +0100 vte (0.10.8-1) unstable; urgency=low * New upstream release. * Build against libxft2-dev * Remove gcc-3.2 build-dependency * Bump Standards-Version to 3.5.8 -- Christian Marillat Wed, 8 Jan 2003 16:18:25 +0100 vte (0.10.7-1) unstable; urgency=low * new upstream release. -- Christian Marillat Thu, 12 Dec 2002 15:43:33 +0100 vte (0.10.5-1) unstable; urgency=low * New upstream release. -- Christian Marillat Wed, 4 Dec 2002 13:19:25 +0100 vte (0.10.4-1) unstable; urgency=low * New upstream release. -- Christian Marillat Tue, 12 Nov 2002 17:11:26 +0100 vte (0.10.3-1) unstable; urgency=low * New upstream release. -- Christian Marillat Mon, 11 Nov 2002 18:48:53 +0100 vte (0.10.2-1) unstable; urgency=low * New upstream release. -- Christian Marillat Thu, 7 Nov 2002 16:09:09 +0100 vte (0.10.1-1) unstable; urgency=low * New upstream release. -- Christian Marillat Tue, 5 Nov 2002 16:39:09 +0100 vte (0.10-1) unstable; urgency=low * New upstream release. * Bump the libray package to 4 -- Christian Marillat Thu, 31 Oct 2002 19:58:18 +0100 vte (0.9.2-1) unstable; urgency=low * New upstream release. * Fix build with the python module (Closes: #164440) -- Christian Marillat Tue, 22 Oct 2002 16:15:17 +0200 vte (0.9.0-2) unstable; urgency=low * Should build-depends on gettext (Closes: #163611) -- Christian Marillat Mon, 7 Oct 2002 09:13:35 +0200 vte (0.9.0-1) unstable; urgency=low * New upstream releae. * Add build-dependency to python-gtk2 and python-dev * Add a python-vte package (Closes: #158588) * Bump the libray package to 3 * Move I18N file in the -common package -- Christian Marillat Sat, 5 Oct 2002 10:38:12 +0200 vte (0.5.1-2) unstable; urgency=low * Build with gcc-3.2 * Update to standards version 3.5.7 -- Christian Marillat Fri, 13 Sep 2002 21:38:02 +0200 vte (0.5.1-1) unstable; urgency=low * Initial Release (Closes: #153740) -- Christian Marillat Sun, 21 Jul 2002 16:30:57 +0200 debian/python-vte.examples0000644000000000000000000000006512034702063013041 0ustar python/cat.py python/unrealize.py python/vte-demo.py debian/rules0000755000000000000000000000245512034702063010251 0ustar #!/usr/bin/make -f libvteN := $(shell sed -rn 's/^Package:[[:space:]]*(libvte[0-9]+)[[:space:]]*$$/\1/p' debian/control) udeb := $(libvteN)-udeb PY_VERSIONS = $(shell pyversions --requested debian/control) DEB_BUILDDIR = debian/build DEB_MAKE_FLAVORS = main udeb $(PY_VERSIONS) include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk DEB_CONFIGURE_LIBEXECDIR := \$${prefix}/lib/$(libvteN) DEB_FIXPERMS_EXCLUDE += gnome-pty-helper DEB_DH_MAKESHLIBS_ARGS_$(libvteN) += -V '$(libvteN) (>= 1:0.28.0)' --add-udeb=$(udeb) DEB_CONFIGURE_EXTRA_FLAGS += PYTHON="/usr/bin/$(cdbs_make_curflavor)" DEB_CONFIGURE_FLAGS_main += \ --disable-python DEB_CONFIGURE_FLAGS_udeb += \ --disable-python \ --disable-gnome-pty-helper \ --disable-gtk-doc \ --without-ncurses DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp DEB_MAKE_DESTDIRSKEL_udeb = $(CURDIR)/debian/tmp/udeb DEB_DH_INSTALL_ARGS_$(udeb) += --sourcedir=debian/tmp/udeb # FIXME: not honoured #CFLAGS_udeb += $(CFLAGS) -Os CFLAGS += $(if $(findstring udeb,$(cdbs_make_curflavor)),-Os) binary-install/python-vte:: dh_python2 -ppython-vte debian/libvte9.symbols0000644000000000000000000001326212034702063012157 0ustar libvte.so.9 libvte9 #MINVER# _vte_debug_flags@Base 1:0.24.0 _vte_debug_init@Base 1:0.24.0 _vte_pty_close@Base 1:0.24.0 _vte_pty_get_size@Base 1:0.24.0 _vte_pty_open@Base 1:0.24.0 _vte_pty_set_size@Base 1:0.24.0 _vte_pty_set_utf8@Base 1:0.24.0 vte_get_user_shell@Base 1:0.28.0 vte_pty_child_setup@Base 1:0.28.0 vte_pty_close@Base 1:0.28.0 vte_pty_error_get_type@Base 1:0.28.0 vte_pty_error_quark@Base 1:0.28.0 vte_pty_flags_get_type@Base 1:0.28.0 vte_pty_get_fd@Base 1:0.28.0 vte_pty_get_size@Base 1:0.28.0 vte_pty_get_type@Base 1:0.28.0 vte_pty_new@Base 1:0.28.0 vte_pty_new_foreign@Base 1:0.28.0 vte_pty_set_size@Base 1:0.28.0 vte_pty_set_term@Base 1:0.28.0 vte_pty_set_utf8@Base 1:0.28.0 vte_reaper_add_child@Base 1:0.24.0 vte_reaper_get@Base 1:0.24.0 vte_reaper_get_type@Base 1:0.24.0 vte_terminal_accessible_factory_get_type@Base 1:0.24.0 vte_terminal_accessible_factory_new@Base 1:0.24.0 vte_terminal_accessible_get_type@Base 1:0.24.0 vte_terminal_accessible_new@Base 1:0.24.0 vte_terminal_anti_alias_get_type@Base 1:0.24.0 vte_terminal_copy_clipboard@Base 1:0.24.0 vte_terminal_copy_primary@Base 1:0.24.0 vte_terminal_cursor_blink_mode_get_type@Base 1:0.24.0 vte_terminal_cursor_shape_get_type@Base 1:0.24.0 vte_terminal_erase_binding_get_type@Base 1:0.24.0 vte_terminal_feed@Base 1:0.24.0 vte_terminal_feed_child@Base 1:0.24.0 vte_terminal_feed_child_binary@Base 1:0.24.0 vte_terminal_fork_command@Base 1:0.24.0 vte_terminal_fork_command_full@Base 1:0.28.0 vte_terminal_forkpty@Base 1:0.24.0 vte_terminal_get_adjustment@Base 1:0.24.0 vte_terminal_get_allow_bold@Base 1:0.24.0 vte_terminal_get_audible_bell@Base 1:0.24.0 vte_terminal_get_char_ascent@Base 1:0.24.0 vte_terminal_get_char_descent@Base 1:0.24.0 vte_terminal_get_char_height@Base 1:0.24.0 vte_terminal_get_char_width@Base 1:0.24.0 vte_terminal_get_child_exit_status@Base 1:0.24.0 vte_terminal_get_column_count@Base 1:0.24.0 vte_terminal_get_cursor_blink_mode@Base 1:0.24.0 vte_terminal_get_cursor_position@Base 1:0.24.0 vte_terminal_get_cursor_shape@Base 1:0.24.0 vte_terminal_get_default_emulation@Base 1:0.24.0 vte_terminal_get_emulation@Base 1:0.24.0 vte_terminal_get_encoding@Base 1:0.24.0 vte_terminal_get_font@Base 1:0.24.0 vte_terminal_get_has_selection@Base 1:0.24.0 vte_terminal_get_icon_title@Base 1:0.24.0 vte_terminal_get_mouse_autohide@Base 1:0.24.0 vte_terminal_get_padding@Base 1:0.24.0 vte_terminal_get_pty@Base 1:0.24.0 vte_terminal_get_pty_object@Base 1:0.28.0 vte_terminal_get_row_count@Base 1:0.24.0 vte_terminal_get_status_line@Base 1:0.24.0 vte_terminal_get_text@Base 1:0.24.0 vte_terminal_get_text_include_trailing_spaces@Base 1:0.24.0 vte_terminal_get_text_range@Base 1:0.24.0 vte_terminal_get_type@Base 1:0.24.0 vte_terminal_get_using_xft@Base 1:0.24.0 vte_terminal_get_visible_bell@Base 1:0.24.0 vte_terminal_get_window_title@Base 1:0.24.0 vte_terminal_im_append_menuitems@Base 1:0.24.0 vte_terminal_is_word_char@Base 1:0.24.0 vte_terminal_match_add@Base 1:0.24.0 vte_terminal_match_add_gregex@Base 1:0.24.0 vte_terminal_match_check@Base 1:0.24.0 vte_terminal_match_clear_all@Base 1:0.24.0 vte_terminal_match_remove@Base 1:0.24.0 vte_terminal_match_set_cursor@Base 1:0.24.0 vte_terminal_match_set_cursor_name@Base 1:0.24.0 vte_terminal_match_set_cursor_type@Base 1:0.24.0 vte_terminal_new@Base 1:0.24.0 vte_terminal_paste_clipboard@Base 1:0.24.0 vte_terminal_paste_primary@Base 1:0.24.0 vte_terminal_pty_new@Base 1:0.28.0 vte_terminal_reset@Base 1:0.24.0 vte_terminal_search_find_next@Base 1:0.28.0 vte_terminal_search_find_previous@Base 1:0.28.0 vte_terminal_search_get_gregex@Base 1:0.28.0 vte_terminal_search_get_wrap_around@Base 1:0.28.0 vte_terminal_search_set_gregex@Base 1:0.28.0 vte_terminal_search_set_wrap_around@Base 1:0.28.0 vte_terminal_select_all@Base 1:0.24.0 vte_terminal_select_none@Base 1:0.24.0 vte_terminal_set_allow_bold@Base 1:0.24.0 vte_terminal_set_alternate_screen_scroll@Base 1:0.28.0-1ubuntu1~ vte_terminal_set_audible_bell@Base 1:0.24.0 vte_terminal_set_background_image@Base 1:0.24.0 vte_terminal_set_background_image_file@Base 1:0.24.0 vte_terminal_set_background_saturation@Base 1:0.24.0 vte_terminal_set_background_tint_color@Base 1:0.24.0 vte_terminal_set_background_transparent@Base 1:0.24.0 vte_terminal_set_backspace_binding@Base 1:0.24.0 vte_terminal_set_color_background@Base 1:0.24.0 vte_terminal_set_color_bold@Base 1:0.24.0 vte_terminal_set_color_cursor@Base 1:0.24.0 vte_terminal_set_color_dim@Base 1:0.24.0 vte_terminal_set_color_foreground@Base 1:0.24.0 vte_terminal_set_color_highlight@Base 1:0.24.0 vte_terminal_set_colors@Base 1:0.24.0 vte_terminal_set_cursor_blink_mode@Base 1:0.24.0 vte_terminal_set_cursor_blinks@Base 1:0.24.0 vte_terminal_set_cursor_shape@Base 1:0.24.0 vte_terminal_set_default_colors@Base 1:0.24.0 vte_terminal_set_delete_binding@Base 1:0.24.0 vte_terminal_set_emulation@Base 1:0.24.0 vte_terminal_set_encoding@Base 1:0.24.0 vte_terminal_set_font@Base 1:0.24.0 vte_terminal_set_font_from_string@Base 1:0.24.0 vte_terminal_set_font_from_string_full@Base 1:0.24.0 vte_terminal_set_font_full@Base 1:0.24.0 vte_terminal_set_mouse_autohide@Base 1:0.24.0 vte_terminal_set_opacity@Base 1:0.24.0 vte_terminal_set_pty@Base 1:0.24.0 vte_terminal_set_pty_object@Base 1:0.28.0 vte_terminal_set_scroll_background@Base 1:0.24.0 vte_terminal_set_scroll_on_keystroke@Base 1:0.24.0 vte_terminal_set_scroll_on_output@Base 1:0.24.0 vte_terminal_set_scrollback_lines@Base 1:0.24.0 vte_terminal_set_size@Base 1:0.24.0 vte_terminal_set_visible_bell@Base 1:0.24.0 vte_terminal_set_word_chars@Base 1:0.24.0 vte_terminal_watch_child@Base 1:0.28.0 vte_terminal_write_contents@Base 1:0.24.0 vte_terminal_write_flags_get_type@Base 1:0.24.0 debian/libvte-common.postinst0000644000000000000000000000024612034702063013545 0ustar #! /bin/sh set -e TERMDIR=/usr/share/vte/termcap if [ -d $TERMDIR -a ! -L $TERMDIR ]; then rmdir $TERMDIR && ln -s termcap-0.0 $TERMDIR || true fi #DEBHELPER# debian/watch0000644000000000000000000000012612034702063010213 0ustar version=3 http://ftp.gnome.org/pub/GNOME/sources/vte/([\d\.]+[\d])/ vte-(.*)\.tar\.xz debian/libvte-doc.install0000644000000000000000000000002212034702063012575 0ustar usr/share/gtk-doc debian/compat0000644000000000000000000000000212034702063010361 0ustar 8 debian/libvte9.lintian-overrides0000644000000000000000000000016212034702063014120 0ustar # Setgid on purpose to write the utmp file libvte9: setgid-binary usr/lib/libvte9/gnome-pty-helper 2755 root/utmp debian/source/0000755000000000000000000000000012034702063010463 5ustar debian/source/format0000644000000000000000000000001412034702063011671 0ustar 3.0 (quilt) debian/control0000644000000000000000000001152412034702074010573 0ustar # This file is autogenerated. DO NOT EDIT! # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: vte Section: libs Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Debian GNOME Maintainers , Josselin Mouette , Michael Biebl Standards-Version: 3.9.2 X-Python-Version: >= 2.3 Build-Depends: cdbs (>= 0.4.90), debhelper (>= 8), gnome-pkg-tools (>= 0.10), dh-autoreconf, libglib2.0-dev (>= 2.26.0), libcairo2-dev, libx11-dev, libgtk2.0-dev (>= 2.20.0), gobject-introspection (>= 0.9.12-4~), gettext, python-gtk2-dev, python-all-dev (>= 2.6.6-3~), libncurses5-dev, gtk-doc-tools, libpango1.0-dev (>= 1.22.0), intltool (>= 0.35) Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc, libatk1.0-doc Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/vte/ubuntu Package: libvte9 Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libvte-common (= ${source:Version}) Description: Terminal emulator widget for GTK+ 2.0 - runtime files The VTE library provides a terminal emulator widget VteTerminal for applications using the GTK+ toolkit. It also provides the VtePTY object containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . This package contains the runtime library, needed by programs using the VTE widget with GTK+ 2.0. Package: libvte9-udeb XC-Package-Type: udeb Section: debian-installer Priority: extra Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: Terminal emulator widget for GTK+ 2.0 - minimal runtime The VTE library provides a terminal emulator widget VteTerminal for applications using the GTK+ toolkit. It also provides the VtePTY object containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . This package contains the minimal runtime library for GTK+ 2.0 needed by the Debian installer. Package: libvte-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, libvte9 (= ${binary:Version}), libcairo2-dev, libx11-dev, libgtk2.0-dev (>= 2.20.0), libpango1.0-dev (>= 1.22.0), libglib2.0-dev (>= 2.26.0), libvte-common Recommends: libvte-doc Provides: python-vte-dev Description: Terminal emulator widget for GTK+ 2.0 - development files The VTE library provides a terminal emulator widget VteTerminal for applications using the GTK+ toolkit. It also provides the VtePTY object containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . This package contains development files for the VTE library and its Python bindings. It is needed to develop and build programs using the VTE widget with GTK+ 2.0. Package: libvte-common Architecture: all Depends: ${misc:Depends} Breaks: libvte9 (<< 1:0.28) Description: Terminal emulator widget for GTK+ 2.x - common files The VTE library provides a terminal emulator widget VteTerminal for applications using the GTK+ toolkit. It also provides the VtePTY object containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . This package contains internationalization files for the VTE library and common files for the GTK+ 2.x version. Package: python-vte Architecture: any Section: python Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-gtk2, libvte-common (= ${source:Version}) Breaks: gdebi (<< 0.6.1), python-apt (<< 0.8.0~exp2) Description: Python bindings for the VTE widget set The VTE library provides a terminal emulator widget VteTerminal for applications using the GTK+ toolkit. It also provides the VtePTY object containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . This package contains the Python bindings to the VTE library for GTK+ 2.x. Package: libvte-doc Architecture: all Section: doc Depends: ${misc:Depends} Description: Terminal emulator widget for GTK+ 2.x - documentation The VTE library provides a terminal emulator widget VteTerminal for applications using the GTK+ toolkit. It also provides the VtePTY object containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . This package contains documentation files for the VTE library for GTK+ 2.x. debian/patches/0000755000000000000000000000000012034702063010612 5ustar debian/patches/60_termcap-home-end.patch0000644000000000000000000000055012034702063015265 0ustar --- vte-0.16.14.orig/termcaps/xterm +++ vte-0.16.14/termcaps/xterm @@ -15,6 +15,7 @@ :cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:ec=\E[%dX:\ :ei=\E[4l:ho=\E[H:im=\E[4h:is=\E[!p\E[?3;4l\E[4l\E>:\ :kD=\177:\ + :kh=\EOH:@7=\EOF:\ :kb=^H:ke=\E[?1l\E>:\ :ks=\E[?1h\E=:le=^H:mb=\E[5m:md=\E[1m:\ :me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:\ debian/patches/03_CVE-2012-2738.patch0000644000000000000000000000270512034702063013541 0ustar From feeee4b5832b17641e505b7083e0d299fdae318e Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sat, 19 May 2012 17:36:09 +0000 Subject: emulation: Limit integer arguments to 65535 To guard against malicious sequences containing excessively big numbers, limit all parsed numbers to 16 bit range. Doing this here in the parsing routine is a catch-all guard; this doesn't preclude enforcing more stringent limits in the handlers themselves. https://bugzilla.gnome.org/show_bug.cgi?id=676090 --- diff --git a/src/table.c b/src/table.c index 140e8c8..85cf631 100644 --- a/src/table.c +++ b/src/table.c @@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array, if (G_UNLIKELY (*array == NULL)) { *array = g_value_array_new(1); } - g_value_set_long(&value, total); + g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT)); g_value_array_append(*array, &value); } while (i++ < arginfo->length); g_value_unset(&value); diff --git a/src/vteseq.c b/src/vteseq.c index 457c06a..46def5b 100644 --- a/src/vteseq.c +++ b/src/vteseq.c @@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal, GValueArray *params, VteTerminalSequenceHandler handler) { - vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG); + vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT); } static void -- cgit v0.9.0.2 debian/patches/93_add_alt_screen_scroll_toggle.patch0000644000000000000000000000620412034702063020016 0ustar Ubuntu: https://bugs.launchpad.net/bugs/106995 Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=518405 Description: Handle scrolling differently when using alternate screen or scrolling is restricted. Index: vte-0.28.0/python/vte.defs =================================================================== --- vte-0.28.0.orig/python/vte.defs 2009-04-17 18:51:43.000000000 +0200 +++ vte-0.28.0/python/vte.defs 2011-05-17 12:18:16.656757671 +0200 @@ -202,6 +202,15 @@ (return-type "gboolean") ) +(define-method set_alternate_screen_scroll + (of-object "VteTerminal") + (c-name "vte_terminal_set_alternate_screen_scroll") + (return-type "none") + (parameters + '("gboolean" "scroll") + ) +) + (define-method set_scroll_background (of-object "VteTerminal") (c-name "vte_terminal_set_scroll_background") Index: vte-0.28.0/src/vte.c =================================================================== --- vte-0.28.0.orig/src/vte.c 2011-02-16 20:42:09.000000000 +0100 +++ vte-0.28.0/src/vte.c 2011-05-17 12:18:16.676757671 +0200 @@ -11409,8 +11409,9 @@ return FALSE; } - if (terminal->pvt->screen == &terminal->pvt->alternate_screen || - terminal->pvt->normal_screen.scrolling_restricted) { + if (terminal->pvt->alternate_screen_scroll && + (terminal->pvt->screen == &terminal->pvt->alternate_screen || + terminal->pvt->normal_screen.scrolling_restricted)) { char *normal; gssize normal_length; const gchar *special; @@ -13063,6 +13064,22 @@ g_object_notify (G_OBJECT (terminal), "scroll-on-keystroke"); } +/** + * vte_terminal_set_alternate_screen_scroll: + * @terminal: a #VteTerminal + * @scroll: %TRUE if the terminal should send keystrokes for scrolling when using alternate screen + * + * Controls whether or not the terminal will send keystrokes for scrolling + * when using alternate screen or scrolling is restricted. + * + */ +void +vte_terminal_set_alternate_screen_scroll(VteTerminal *terminal, gboolean scroll) +{ + g_return_if_fail(VTE_IS_TERMINAL(terminal)); + terminal->pvt->alternate_screen_scroll = scroll; +} + static void vte_terminal_real_copy_clipboard(VteTerminal *terminal) { Index: vte-0.28.0/src/vte.h =================================================================== --- vte-0.28.0.orig/src/vte.h 2011-02-16 20:27:16.000000000 +0100 +++ vte-0.28.0/src/vte.h 2011-05-17 12:18:16.676757671 +0200 @@ -310,6 +310,8 @@ void vte_terminal_set_scroll_on_output(VteTerminal *terminal, gboolean scroll); void vte_terminal_set_scroll_on_keystroke(VteTerminal *terminal, gboolean scroll); +void vte_terminal_set_alternate_screen_scroll(VteTerminal *terminal, + gboolean scroll); /* Set the color scheme. */ void vte_terminal_set_color_dim(VteTerminal *terminal, Index: vte-0.28.0/src/vte-private.h =================================================================== --- vte-0.28.0.orig/src/vte-private.h 2011-02-03 20:29:32.000000000 +0100 +++ vte-0.28.0/src/vte-private.h 2011-05-17 12:18:16.676757671 +0200 @@ -280,6 +280,7 @@ gboolean scroll_on_output; gboolean scroll_on_keystroke; long scrollback_lines; + gboolean alternate_screen_scroll; /* Cursor shape */ VteTerminalCursorShape cursor_shape; debian/patches/02_meta.patch0000644000000000000000000000467212034702063013073 0ustar From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Tue, 15 Nov 2011 03:06:40 -0500 Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2 compatibility Also, since VTE_META_MASK is now a mask with multiple bits set, code that compares gdk key modifiers to VTE_META_MASK by numerical equality is no longer guaranteed to work. Therefore, for such comparisons a new function, vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits matching matching VTE_META_MASK are set, then all are set. https://bugzilla.gnome.org/show_bug.cgi?id=663779 --- src/keymap.c | 15 +++++++++++++-- src/keymap.h | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/keymap.c b/src/keymap.c index 9a21669..95b4c5b 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -990,6 +990,17 @@ static const struct _vte_keymap_group { {GDK_KEY (F35), _vte_keymap_GDK_F35}, }; +/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK, + * despite being a compound mask, is treated as indivisible. */ +GdkModifierType +_vte_keymap_fixup_modifiers(GdkModifierType modifiers, + GdkModifierType mask) +{ + if (modifiers & VTE_META_MASK) + modifiers |= VTE_META_MASK; + return modifiers & mask; +} + /* Map the specified keyval/modifier setup, dependent on the mode, to either * a literal string or a capability name. */ void @@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval, } else { fkey_mode = fkey_default; } - modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK); + modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK); /* Search for the conditions. */ for (i = 0; entries[i].normal_length || entries[i].special[0]; i++) @@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval, return; } - switch (modifiers & significant_modifiers) { + switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) { case 0: modifier = 0; break; diff --git a/src/keymap.h b/src/keymap.h index 243e22e..21d9b8e 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -27,7 +27,7 @@ G_BEGIN_DECLS -#define VTE_META_MASK GDK_META_MASK +#define VTE_META_MASK (GDK_META_MASK | GDK_MOD1_MASK) #define VTE_NUMLOCK_MASK GDK_MOD2_MASK /* Map the specified keyval/modifier setup, dependent on the mode, to either -- 1.7.8.rc3 debian/patches/25_optional-ncurses.patch0000644000000000000000000001254612034702063015456 0ustar Index: vte-0.28.2/configure.in =================================================================== --- vte-0.28.2.orig/configure.in 2011-08-28 23:32:53.000000000 +0200 +++ vte-0.28.2/configure.in 2011-10-19 03:44:01.248817625 +0200 @@ -368,45 +368,52 @@ AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"])) AC_CHECK_FUNCS([ceil floor]) -# Look for tgetent +AC_ARG_WITH(ncurses, + [AS_HELP_STRING([--without-ncurses], + [don't use ncurses library]) + ], with_ncurses=$withval, with_ncurses=yes) -AC_CHECK_FUNC([tgetent],[vte_cv_termcap_lib=libc], - [AC_CHECK_LIB([ncurses],[tgetent],[vte_cv_termcap_lib=libncurses], - [AC_CHECK_LIB([tinfo],[tgetent],[vte_cv_termcap_lib=libtinfo], - [AC_CHECK_LIB([curses],[tgetent],[vte_cv_termcap_lib=libcurses], - [AC_CHECK_LIB([termcap],[tgetent],[vte_cv_termcap_lib=libtermcap], - [vte_cv_termcap_lib=])])])])]) - -case "$vte_cv_termcap_lib" in - libc) # FIXME: which headers to include here? - ;; - libncurses) # We need ncurses.h and term.h, or ncurses/curses.h and ncurses/term.h - AC_CHECK_HEADERS([ncurses.h term.h],[], - [AC_CHECK_HEADERS([ncurses/curses.h ncurses/term.h],[], - [AC_MSG_ERROR([ncurses headers not found])])]) - LIBS="-lncurses $LIBS" - ;; - libtinfo) # Need ncurses/curses.h and ncurses/term.h - AC_CHECK_HEADERS([ncurses.h term.h],[], - [AC_CHECK_HEADERS([ncurses/curses.h ncurses/term.h],[], - [AC_MSG_ERROR([ncurses headers not found])])]) - LIBS="-ltinfo $LIBS" - ;; - libcurses) # Need curses.h and term.h - AC_CHECK_HEADERS([curses.h term.h],[], - [AC_MSG_ERROR([curses headers not found])], - [[#ifdef HAVE_CURSES_H - #include - #endif]]) - LIBS="-lcurses $LIBS" - ;; - libtermcap) # Need termcap.h - AC_CHECK_HEADERS([termcap.h],[], - [AC_MSG_ERROR([termcap headers not found])]) - LIBS="-ltermcap $LIBS" - ;; - *) AC_MSG_ERROR([tgetent not found in any library]) ;; -esac +if test x$with_ncurses = xyes ; then + # Look for tgetent + + AC_CHECK_FUNC([tgetent],[vte_cv_termcap_lib=libc], + [AC_CHECK_LIB([ncurses],[tgetent],[vte_cv_termcap_lib=libncurses], + [AC_CHECK_LIB([tinfo],[tgetent],[vte_cv_termcap_lib=libtinfo], + [AC_CHECK_LIB([curses],[tgetent],[vte_cv_termcap_lib=libcurses], + [AC_CHECK_LIB([termcap],[tgetent],[vte_cv_termcap_lib=libtermcap], + [vte_cv_termcap_lib=])])])])]) + + case "$vte_cv_termcap_lib" in + libc) # FIXME: which headers to include here? + ;; + libncurses) # We need ncurses.h and term.h, or ncurses/curses.h and ncurses/term.h + AC_CHECK_HEADERS([ncurses.h term.h],[], + [AC_CHECK_HEADERS([ncurses/curses.h ncurses/term.h],[], + [AC_MSG_ERROR([ncurses headers not found])])]) + LIBS="-lncurses $LIBS" + ;; + libtinfo) # Need ncurses/curses.h and ncurses/term.h + AC_CHECK_HEADERS([ncurses.h term.h],[], + [AC_CHECK_HEADERS([ncurses/curses.h ncurses/term.h],[], + [AC_MSG_ERROR([ncurses headers not found])])]) + LIBS="-ltinfo $LIBS" + ;; + libcurses) # Need curses.h and term.h + AC_CHECK_HEADERS([curses.h term.h],[], + [AC_MSG_ERROR([curses headers not found])], + [[#ifdef HAVE_CURSES_H + #include + #endif]]) + LIBS="-lcurses $LIBS" + ;; + libtermcap) # Need termcap.h + AC_CHECK_HEADERS([termcap.h],[], + [AC_MSG_ERROR([termcap headers not found])]) + LIBS="-ltermcap $LIBS" + ;; + *) AC_MSG_ERROR([tgetent not found in any library]) ;; + esac +fi # Search for the required modules. Index: vte-0.28.2/src/keymap.c =================================================================== --- vte-0.28.2.orig/src/keymap.c 2011-08-16 23:52:48.000000000 +0200 +++ vte-0.28.2/src/keymap.c 2011-10-19 03:44:01.252817574 +0200 @@ -50,7 +50,7 @@ #include #define VTE_TERMCAP_NAME "termcap" #else -#error No termcap?? +#undef VTE_TERMCAP_NAME #endif #ifdef VTE_DEBUG @@ -1014,8 +1014,10 @@ enum _vte_fkey_mode fkey_mode; char *cap, *tmp; const char *termcap_special = NULL; +#ifdef VTE_TERMCAP_NAME char ncurses_buffer[4096]; char ncurses_area[512]; +#endif g_return_if_fail(normal != NULL); g_return_if_fail(normal_length != NULL); @@ -1169,6 +1171,7 @@ } } } +#ifdef VTE_TERMCAP_NAME if (termcap_special != NULL) { tmp = g_strdup(terminal); cap = NULL; @@ -1209,6 +1212,7 @@ return; } } +#endif _vte_debug_print(VTE_DEBUG_KEYBOARD, " (ignoring, no match for modifier state).\n"); Index: vte-0.28.2/src/ssfe.c =================================================================== --- vte-0.28.2.orig/src/ssfe.c 2011-06-19 22:59:30.000000000 +0200 +++ vte-0.28.2/src/ssfe.c 2011-10-19 03:44:01.256817523 +0200 @@ -38,7 +38,7 @@ #include #define VTE_TERMCAP_NAME "termcap" #else -#error No termcap?? +#undef VTE_TERMCAP_NAME #endif #include debian/patches/01_scroll_notebook.patch0000644000000000000000000000165612034702063015341 0ustar With the addition of 043_notebook_scroll.patch in gtk+3.0, it is possible to switch tabs with Alt+mouse wheel from anywhere on the notebook. This patch prevents vte from interecepting the signal. Corresponding GTK+ bug: GNOME #145244 Index: vte-0.28.0/src/vte.c =================================================================== --- vte-0.28.0.orig/src/vte.c 2011-06-05 01:48:33.224480856 +0200 +++ vte-0.28.0/src/vte.c 2011-06-05 01:59:00.267546314 +0200 @@ -11361,6 +11361,13 @@ vte_terminal_scroll(GtkWidget *widget, G vte_terminal_read_modifiers (terminal, (GdkEvent*) event); +#if GTK_CHECK_VERSION (2, 90, 8) + /* Do not intercept Alt+scroll, let the GtkNotebook handle it to switch tabs. + Requires a fixed GTK+, see https://bugzilla.gnome.org/show_bug.cgi?id=145244 */ + if (event->state & GDK_MOD1_MASK) + return FALSE; +#endif + _VTE_DEBUG_IF(VTE_DEBUG_EVENTS) switch (event->direction) { case GDK_SCROLL_UP: debian/patches/backscroll-stream-mem.patch0000644000000000000000000003316512034702063016027 0ustar Description: use memory-based circular buffer "stream" for the non-infinite scrollback state. This delays stream initialization so that the true size of the desired scrollback state can be discovered. This also means that changing the scrollback size in the middle of using a stream means you won't change the backend stream type. Author: Kees Cook Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/vte/+bug/778872 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=664611 Index: vte-0.28.2/src/vtestream-mem.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ vte-0.28.2/src/vtestream-mem.h 2012-03-07 14:47:42.822382527 -0800 @@ -0,0 +1,321 @@ +/* + * Copyright (C) 2009,2010 Red Hat, Inc. + * Copyright (C) 2012 Kees Cook + * + * This is free software; you can redistribute it and/or modify it under + * the terms of the GNU Library General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Red Hat Author(s): Behdad Esfahbod + * Ubuntu Authors(s): Kees Cook + */ + +#include +#include +#include + +#include + +/* + * VteMemStream: A memory-based stream + */ + +struct mem_region { + gchar * region; + gsize allocated; /* How much memory exists in the region. */ + gsize length; /* Current length of valid written data in the region. */ + gsize seekpos; /* Where in the region we are positioned from seeking. */ +}; + +typedef struct _VteMemStream { + VteStream parent; + + /* The first is for the write head, second is for last page */ + struct mem_region page[2]; + gsize offset[2]; /* Offset into... ? */ +} VteMemStream; + +typedef VteStreamClass VteMemStreamClass; + +static GType _vte_mem_stream_get_type (void); +#define VTE_TYPE_MEM_STREAM _vte_mem_stream_get_type () + +G_DEFINE_TYPE (VteMemStream, _vte_mem_stream, VTE_TYPE_STREAM) + +static void +_vte_mem_stream_init (VteMemStream *stream G_GNUC_UNUSED) +{ +} + +VteStream * +_vte_mem_stream_new (void) +{ + return (VteStream *) g_object_new (VTE_TYPE_MEM_STREAM, NULL); +} + +static void +_vte_mem_stream_finalize (GObject *object) +{ + VteMemStream *stream = (VteMemStream *) object; + gint i; + + for (i = 0; i < 2; i ++) { + if (stream->page[i].region) g_free (stream->page[i].region); + memset(&stream->page[i], 0, sizeof (stream->page[i])); + stream->offset[i] = 0; + } + + G_OBJECT_CLASS (_vte_mem_stream_parent_class)->finalize(object); +} + +static gsize +_mem_xseek (VteMemStream *stream, gint id, gsize pos, int whence) +{ + g_assert (id == 0 || id == 1); + + switch (whence) { + case SEEK_SET: + if (pos > stream->page[id].length) + pos = stream->page[id].length; + stream->page[id].seekpos = pos; + break; + case SEEK_END: + stream->page[id].seekpos = stream->page[id].length; + break; + } + return stream->page[id].seekpos; +} + +static gsize +_mem_xread (VteMemStream *stream, gint id, char *data, gsize len) +{ + g_assert (id == 0 || id == 1); + + if (G_UNLIKELY (len && !stream->page[id].region)) + return 0; + + if (len > stream->page[id].length - stream->page[id].seekpos) + len = stream->page[id].length - stream->page[id].seekpos; + + g_memmove (data, stream->page[id].region + stream->page[id].seekpos, len); + stream->page[id].seekpos += len; + + return len; +} + +static void +_mem_xwrite (VteMemStream *stream, gint id, const char *data, gsize len) +{ + g_assert (id == 0 || id == 1); + + if (G_UNLIKELY (!stream->page[id].region)) + return; + + while (stream->page[id].seekpos + len > stream->page[id].allocated) { + gsize want = stream->page[id].allocated * 2; + stream->page[id].region = g_realloc (stream->page[id].region, want); + /* TODO: handle alloc failure. */ + stream->page[id].allocated = want; + } + + g_memmove (stream->page[id].region + stream->page[id].seekpos, data, len); + stream->page[id].seekpos += len; + if (stream->page[id].seekpos > stream->page[id].length) + stream->page[id].length = stream->page[id].seekpos; +} + +static void +_mem_xtruncate (VteMemStream *stream, gint id, gsize size) +{ + g_assert (id == 0 || id == 1); + + if (G_UNLIKELY (!stream->page[id].region)) + return; + + /* This only expects the region to be reduced in size. */ + g_assert (size <= stream->page[id].length); + + stream->page[id].region = g_realloc(stream->page[id].region, size); + /* TODO: handle alloc failure. */ + stream->page[id].length = stream->page[id].allocated = size; + if (stream->page[id].seekpos > size) + stream->page[id].seekpos = size; +} + +static gboolean +_mem_xwrite_contents (VteMemStream *stream, gint id, GOutputStream *output, + GCancellable *cancellable, GError **error) +{ + gboolean ret; + gsize written; + + g_assert (id == 0 || id == 1); + + if (G_UNLIKELY (!stream->page[id].region)) + return TRUE; + + ret = g_output_stream_write_all (output, + stream->page[id].region + stream->page[id].seekpos, + stream->page[id].length - stream->page[id].seekpos, + &written, cancellable, error); + stream->page[id].seekpos = stream->page[id].length; + + return ret; +} + +static void +_vte_mem_stream_reset (VteStream *astream, gsize offset) +{ + VteMemStream *stream = (VteMemStream *) astream; + + if (stream->page[0].region) _mem_xtruncate (stream, 0, 0); + if (stream->page[1].region) _mem_xtruncate (stream, 1, 0); + + stream->offset[0] = stream->offset[1] = offset; +} + +static inline void +_vte_mem_stream_ensure_region0 (VteMemStream *stream) +{ + if (G_LIKELY (stream->page[0].region)) + return; + + stream->page[0].allocated = 4096; /* Arbitrary initial size. */ + stream->page[0].region = g_malloc(stream->page[0].allocated); + /* TODO: how to handle malloc failure? */ +} + +static gsize +_vte_mem_stream_append (VteStream *astream, const char *data, gsize len) +{ + VteMemStream *stream = (VteMemStream *) astream; + gsize ret; + + _vte_mem_stream_ensure_region0 (stream); + + ret = _mem_xseek (stream, 0, 0, SEEK_END); + _mem_xwrite (stream, 0, data, len); + + return stream->offset[0] + ret; +} + +static gboolean +_vte_mem_stream_read (VteStream *astream, gsize offset, char *data, gsize len) +{ + VteMemStream *stream = (VteMemStream *) astream; + gsize l; + + if (G_UNLIKELY (offset < stream->offset[1])) + return FALSE; + + if (offset < stream->offset[0]) { + _mem_xseek (stream, 1, offset - stream->offset[1], SEEK_SET); + l = _mem_xread (stream, 1, data, len); + offset += l; data += l; len -= l; if (!len) return TRUE; + } + + _mem_xseek (stream, 0, offset - stream->offset[0], SEEK_SET); + l = _mem_xread (stream, 0, data, len); + offset += l; data += l; len -= l; if (!len) return TRUE; + + return FALSE; +} + +static void +_vte_mem_stream_swap_regions (VteMemStream *stream) +{ + struct mem_region temp; + + temp = stream->page[0]; + stream->page[0] = stream->page[1]; + stream->page[1] = temp; +} + +static void +_vte_mem_stream_truncate (VteStream *astream, gsize offset) +{ + VteMemStream *stream = (VteMemStream *) astream; + + if (G_UNLIKELY (offset < stream->offset[1])) { + _mem_xtruncate (stream, 1, 0); + stream->offset[1] = offset; + } + + if (G_UNLIKELY (offset < stream->offset[0])) { + _mem_xtruncate (stream, 0, 0); + stream->offset[0] = stream->offset[1]; + _vte_mem_stream_swap_regions (stream); + } else { + _mem_xtruncate (stream, 0, offset - stream->offset[0]); + } +} + +static void +_vte_mem_stream_new_page (VteStream *astream) +{ + VteMemStream *stream = (VteMemStream *) astream; + + stream->offset[1] = stream->offset[0]; + if (stream->page[0].region) + stream->offset[0] += _mem_xseek (stream, 0, 0, SEEK_END); + _vte_mem_stream_swap_regions (stream); + _mem_xtruncate (stream, 0, 0); +} + +static gsize +_vte_mem_stream_head (VteStream *astream) +{ + VteMemStream *stream = (VteMemStream *) astream; + + if (stream->page[0].region) + return stream->offset[0] + _mem_xseek (stream, 0, 0, SEEK_END); + else + return stream->offset[0]; +} + +static gboolean +_vte_mem_stream_write_contents (VteStream *astream, GOutputStream *output, + gsize offset, + GCancellable *cancellable, GError **error) +{ + VteMemStream *stream = (VteMemStream *) astream; + + if (G_UNLIKELY (offset < stream->offset[1])) + return FALSE; + + if (offset < stream->offset[0]) { + _mem_xseek (stream, 1, offset - stream->offset[1], SEEK_SET); + if (!_mem_xwrite_contents (stream, 1, output, cancellable, error)) + return FALSE; + offset = stream->offset[0]; + } + + _mem_xseek (stream, 0, offset - stream->offset[0], SEEK_SET); + return _mem_xwrite_contents (stream, 0, output, cancellable, error); +} + +static void +_vte_mem_stream_class_init (VteMemStreamClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->finalize = _vte_mem_stream_finalize; + + klass->reset = _vte_mem_stream_reset; + klass->append = _vte_mem_stream_append; + klass->read = _vte_mem_stream_read; + klass->truncate = _vte_mem_stream_truncate; + klass->new_page = _vte_mem_stream_new_page; + klass->head = _vte_mem_stream_head; + klass->write_contents = _vte_mem_stream_write_contents; +} Index: vte-0.28.2/src/vtestream.h =================================================================== --- vte-0.28.2.orig/src/vtestream.h 2012-03-07 10:23:14.998517196 -0800 +++ vte-0.28.2/src/vtestream.h 2012-03-07 10:23:52.055018606 -0800 @@ -43,6 +43,8 @@ VteStream * _vte_file_stream_new (void); +VteStream * +_vte_mem_stream_new (void); G_END_DECLS Index: vte-0.28.2/src/ring.c =================================================================== --- vte-0.28.2.orig/src/ring.c 2012-03-07 11:17:05.896949593 -0800 +++ vte-0.28.2/src/ring.c 2012-03-07 14:42:35.626333589 -0800 @@ -49,6 +49,25 @@ #define _vte_ring_validate(ring) G_STMT_START {} G_STMT_END #endif +static void +_vte_ring_ensure_stream (VteRing *ring) +{ + if (G_LIKELY(ring->attr_stream)) + return; + + if (ring->max >= G_MAXLONG) { + /* "Infinite" scroll-back buffer limit, file-backed. */ + ring->attr_stream = _vte_file_stream_new (); + ring->text_stream = _vte_file_stream_new (); + ring->row_stream = _vte_file_stream_new (); + } else { + /* Predefined scroll-back buffer limit, memory-backed. */ + ring->attr_stream = _vte_mem_stream_new (); + ring->text_stream = _vte_mem_stream_new (); + ring->row_stream = _vte_mem_stream_new (); + } +} + void _vte_ring_init (VteRing *ring, gulong max_rows) @@ -62,10 +81,6 @@ ring->mask = 31; ring->array = g_malloc0 (sizeof (ring->array[0]) * (ring->mask + 1)); - ring->attr_stream = _vte_file_stream_new (); - ring->text_stream = _vte_file_stream_new (); - ring->row_stream = _vte_file_stream_new (); - ring->last_attr.text_offset = 0; ring->last_attr.attr.i = basic_cell.i.attr; ring->utf8_buffer = g_string_sized_new (128); @@ -81,6 +96,8 @@ { gulong i; + _vte_ring_ensure_stream (ring); + for (i = 0; i <= ring->mask; i++) _vte_row_data_fini (&ring->array[i]); @@ -103,12 +120,14 @@ static gboolean _vte_ring_read_row_record (VteRing *ring, VteRowRecord *record, gulong position) { + _vte_ring_ensure_stream (ring); return _vte_stream_read (ring->row_stream, position * sizeof (*record), (char *) record, sizeof (*record)); } static void _vte_ring_append_row_record (VteRing *ring, const VteRowRecord *record, gulong position) { + _vte_ring_ensure_stream (ring); _vte_stream_append (ring->row_stream, (const char *) record, sizeof (*record)); } @@ -121,6 +140,7 @@ int i; _vte_debug_print (VTE_DEBUG_RING, "Freezing row %lu.\n", position); + _vte_ring_ensure_stream (ring); record.text_offset = _vte_stream_head (ring->text_stream); record.attr_offset = _vte_stream_head (ring->attr_stream); @@ -183,6 +203,7 @@ GString *buffer = ring->utf8_buffer; _vte_debug_print (VTE_DEBUG_RING, "Thawing row %lu.\n", position); + _vte_ring_ensure_stream (ring); _vte_row_data_clear (row); @@ -266,6 +287,7 @@ _vte_ring_reset_streams (VteRing *ring, gulong position) { _vte_debug_print (VTE_DEBUG_RING, "Reseting streams to %lu.\n", position); + _vte_ring_ensure_stream (ring); _vte_stream_reset (ring->row_stream, position * sizeof (VteRowRecord)); _vte_stream_reset (ring->text_stream, 0); @@ -281,6 +303,7 @@ _vte_ring_new_page (VteRing *ring) { _vte_debug_print (VTE_DEBUG_RING, "Starting new stream page at %lu.\n", ring->writable); + _vte_ring_ensure_stream (ring); _vte_stream_new_page (ring->attr_stream); _vte_stream_new_page (ring->text_stream); @@ -608,6 +631,7 @@ gulong i; _vte_debug_print(VTE_DEBUG_RING, "Writing contents to GOutputStream.\n"); + _vte_ring_ensure_stream (ring); if (ring->start < ring->writable) { VteRowRecord record; Index: vte-0.28.2/src/vtestream.c =================================================================== --- vte-0.28.2.orig/src/vtestream.c 2012-03-07 11:41:24.427419860 -0800 +++ vte-0.28.2/src/vtestream.c 2012-03-07 12:55:14.227826250 -0800 @@ -31,3 +31,4 @@ #include "vtestream-base.h" #include "vtestream-file.h" +#include "vtestream-mem.h" Index: vte-0.28.2/src/Makefile.am =================================================================== --- vte-0.28.2.orig/src/Makefile.am 2012-03-07 12:55:40.912155853 -0800 +++ vte-0.28.2/src/Makefile.am 2012-03-07 12:55:49.460261440 -0800 @@ -80,6 +80,7 @@ vtestream.h \ vtestream-base.h \ vtestream-file.h \ + vtestream-mem.h \ vtetc.c \ vtetc.h \ vtetree.c \ debian/patches/91_keep_fds.patch0000644000000000000000000000424112034702063013725 0ustar Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=320128 Description: Keep file descriptors open on vte_fork_pty(). Index: vte-0.26.2/src/pty.c =================================================================== --- vte-0.26.2.orig/src/pty.c 2010-10-19 00:58:58.000000000 +1100 +++ vte-0.26.2/src/pty.c 2010-11-24 17:30:31.825693001 +1100 @@ -192,6 +192,7 @@ const char *name; int fd; } tty; + int keep_fd; } VtePtyChildSetupData; /** @@ -332,6 +333,20 @@ close(fd); } + if (data->keep_fd > 0) { + int i; + /* Close most descriptors. */ + for (i = 0; i < sysconf(_SC_OPEN_MAX); i++) { + if (i != data->keep_fd && + i != fd && + i != STDOUT_FILENO && + i != STDIN_FILENO && + i != STDERR_FILENO) { + close(i); + } + } + } + /* Reset our signals -- our parent may have done any number of * weird things to them. */ _vte_pty_reset_signal_handlers(); @@ -440,6 +455,23 @@ return (gchar **) g_ptr_array_free (array, FALSE); } +static int +_vte_pty_keep_fd(char **env_add) +{ + int i; + if (env_add == NULL) + return -1; + + const gchar *needle = "VTE_PTY_KEEP_FD="; + for (i = 0; env_add[i] != NULL; i++) { + gchar *s = strstr(env_add[i], needle); + if (s != NULL) + return atoi(&s[strlen(needle)]); + } + + return -1; +} + /* * __vte_pty_get_pty_flags: * @lastlog: %TRUE if the session should be logged to the lastlog @@ -523,6 +555,10 @@ /* add the given environment to the childs */ envp2 = __vte_pty_merge_environ (envv, pty->priv->term); + pty->priv->child_setup_data.keep_fd = _vte_pty_keep_fd(envp2); + if (pty->priv->child_setup_data.keep_fd > 0) + spawn_flags |= G_SPAWN_LEAVE_DESCRIPTORS_OPEN; + _VTE_DEBUG_IF (VTE_DEBUG_MISC) { g_printerr ("Spawing command:\n"); for (i = 0; argv[i] != NULL; i++) { debian/patches/lp246701_scroll_region_updates.patch0000644000000000000000000000605512034702063017406 0ustar Index: vte-0.28.0/src/vte.c =================================================================== --- vte-0.28.0.orig/src/vte.c 2011-05-17 12:18:16.676757671 +0200 +++ vte-0.28.0/src/vte.c 2011-05-17 12:18:22.586757675 +0200 @@ -4057,6 +4057,7 @@ long wcount, start, delta; gboolean leftovers, modified, bottom, again; gboolean invalidated_text; + gboolean in_scroll_region; GArray *unichars; struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL; @@ -4076,6 +4077,10 @@ cursor = screen->cursor_current; cursor_visible = terminal->pvt->cursor_visible; + in_scroll_region = screen->scrolling_restricted + && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) + && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); + /* We should only be called when there's data to process. */ g_assert(terminal->pvt->incoming || (terminal->pvt->pending->len > 0)); @@ -4174,6 +4179,8 @@ * points to the first character which isn't part of this * sequence. */ if ((match != NULL) && (match[0] != '\0')) { + gboolean new_in_scroll_region; + /* Call the right sequence handler for the requested * behavior. */ _vte_terminal_handle_sequence(terminal, @@ -4184,12 +4191,20 @@ start = (next - wbuf); modified = TRUE; - /* if we have moved during the sequence handler, restart the bbox */ + new_in_scroll_region = screen->scrolling_restricted + && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) + && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); + + delta = screen->scroll_delta; /* delta may have changed from sequence. */ + + /* if we have moved greatly during the sequence handler, or moved into a scroll_region + * from outside it, restart the bbox */ if (invalidated_text && - (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || - screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || - screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || - screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) { + ((new_in_scroll_region && !in_scroll_region) || + (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || + screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || + screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || + screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) { /* Clip off any part of the box which isn't already on-screen. */ bbox_topleft.x = MAX(bbox_topleft.x, 0); bbox_topleft.y = MAX(bbox_topleft.y, delta); @@ -4209,6 +4224,8 @@ bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT; bbox_topleft.x = bbox_topleft.y = G_MAXINT; } + + in_scroll_region = new_in_scroll_region; } else /* Second, we have a NULL match, and next points to the very * next character in the buffer. Insert the character which debian/patches/04_CVE-2012-2738.patch0000644000000000000000000000546712034702063013552 0ustar From 98ce2f265f986fb88c38d508286bb5e3716b9e74 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sat, 19 May 2012 18:04:12 +0000 Subject: emulation: Limit repetitions Don't allow malicious sequences to cause excessive repetitions. https://bugzilla.gnome.org/show_bug.cgi?id=676090 --- diff --git a/src/vteseq.c b/src/vteseq.c index 46def5b..7fb4707 100644 --- a/src/vteseq.c +++ b/src/vteseq.c @@ -1397,7 +1397,7 @@ vte_sequence_handler_dc (VteTerminal *terminal, GValueArray *params) static void vte_sequence_handler_DC (VteTerminal *terminal, GValueArray *params) { - vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_dc); + vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_dc); } /* Delete a line at the current cursor position. */ @@ -1790,7 +1790,7 @@ vte_sequence_handler_reverse_index (VteTerminal *terminal, GValueArray *params) static void vte_sequence_handler_RI (VteTerminal *terminal, GValueArray *params) { - vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_nd); + vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_nd); } /* Save cursor (position). */ @@ -2782,8 +2782,7 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params) { GValue *value; VteScreen *screen; - long param, end, row; - int i; + long param, end, row, i, limit; screen = terminal->pvt->screen; /* The default is one. */ param = 1; @@ -2801,7 +2800,13 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params) } else { end = screen->insert_delta + terminal->row_count - 1; } - /* Insert the new lines at the cursor. */ + + /* Only allow to insert as many lines as there are between this row + * and the end of the scrolling region. See bug #676090. + */ + limit = end - row + 1; + param = MIN (param, limit); + for (i = 0; i < param; i++) { /* Clear a line off the end of the region and add one to the * top of the region. */ @@ -2822,8 +2827,7 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params) { GValue *value; VteScreen *screen; - long param, end, row; - int i; + long param, end, row, i, limit; screen = terminal->pvt->screen; /* The default is one. */ @@ -2842,6 +2846,13 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params) } else { end = screen->insert_delta + terminal->row_count - 1; } + + /* Only allow to delete as many lines as there are between this row + * and the end of the scrolling region. See bug #676090. + */ + limit = end - row + 1; + param = MIN (param, limit); + /* Clear them from below the current cursor. */ for (i = 0; i < param; i++) { /* Insert a line at the end of the region and remove one from -- cgit v0.9.0.2 debian/patches/series0000644000000000000000000000040212034702063012023 0ustar 01_scroll_notebook.patch 02_meta.patch 03_CVE-2012-2738.patch 04_CVE-2012-2738.patch 25_optional-ncurses.patch 60_termcap-home-end.patch 91_keep_fds.patch 93_add_alt_screen_scroll_toggle.patch lp246701_scroll_region_updates.patch backscroll-stream-mem.patch debian/libvte-common.links0000644000000000000000000000006212034702063012776 0ustar /usr/share/vte/termcap-0.0 /usr/share/vte/termcap debian/copyright0000644000000000000000000000231712034702063011121 0ustar This package was debianized by Christian Marillat on Sun, 21 Jul 2002 16:30:57 +0200. It was downloaded from http://download.gnome.org/sources/vte/ Upstream Author: Behdad Esfahbod Guilherme de S. Pastore Nalin Dahyabhai Copyright: 2002 Nalin Dahyabhai License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL'. debian/control.in0000644000000000000000000001105112034702063011171 0ustar Source: vte Section: libs Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Standards-Version: 3.9.2 X-Python-Version: >= 2.3 Build-Depends: cdbs (>= 0.4.90), debhelper (>= 8), gnome-pkg-tools (>= 0.10), dh-autoreconf, libglib2.0-dev (>= 2.26.0), libcairo2-dev, libx11-dev, libgtk2.0-dev (>= 2.20.0), gobject-introspection (>= 0.9.12-4~), gettext, python-gtk2-dev, python-all-dev (>= 2.6.6-3~), libncurses5-dev, gtk-doc-tools, libpango1.0-dev (>= 1.22.0), intltool (>= 0.35) Build-Depends-Indep: libglib2.0-doc, libgtk2.0-doc, libatk1.0-doc Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/vte/ubuntu Package: libvte9 Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libvte-common (= ${source:Version}) Description: Terminal emulator widget for GTK+ 2.0 - runtime files The VTE library provides a terminal emulator widget VteTerminal for applications using the GTK+ toolkit. It also provides the VtePTY object containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . This package contains the runtime library, needed by programs using the VTE widget with GTK+ 2.0. Package: libvte9-udeb XC-Package-Type: udeb Section: debian-installer Priority: extra Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: Terminal emulator widget for GTK+ 2.0 - minimal runtime The VTE library provides a terminal emulator widget VteTerminal for applications using the GTK+ toolkit. It also provides the VtePTY object containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . This package contains the minimal runtime library for GTK+ 2.0 needed by the Debian installer. Package: libvte-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, libvte9 (= ${binary:Version}), libcairo2-dev, libx11-dev, libgtk2.0-dev (>= 2.20.0), libpango1.0-dev (>= 1.22.0), libglib2.0-dev (>= 2.26.0), libvte-common Recommends: libvte-doc Provides: python-vte-dev Description: Terminal emulator widget for GTK+ 2.0 - development files The VTE library provides a terminal emulator widget VteTerminal for applications using the GTK+ toolkit. It also provides the VtePTY object containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . This package contains development files for the VTE library and its Python bindings. It is needed to develop and build programs using the VTE widget with GTK+ 2.0. Package: libvte-common Architecture: all Depends: ${misc:Depends} Breaks: libvte9 (<< 1:0.28) Description: Terminal emulator widget for GTK+ 2.x - common files The VTE library provides a terminal emulator widget VteTerminal for applications using the GTK+ toolkit. It also provides the VtePTY object containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . This package contains internationalization files for the VTE library and common files for the GTK+ 2.x version. Package: python-vte Architecture: any Section: python Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-gtk2, libvte-common (= ${source:Version}) Breaks: gdebi (<< 0.6.1), python-apt (<< 0.8.0~exp2) Description: Python bindings for the VTE widget set The VTE library provides a terminal emulator widget VteTerminal for applications using the GTK+ toolkit. It also provides the VtePTY object containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . This package contains the Python bindings to the VTE library for GTK+ 2.x. Package: libvte-doc Architecture: all Section: doc Depends: ${misc:Depends} Description: Terminal emulator widget for GTK+ 2.x - documentation The VTE library provides a terminal emulator widget VteTerminal for applications using the GTK+ toolkit. It also provides the VtePTY object containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . This package contains documentation files for the VTE library for GTK+ 2.x. debian/libvte9.install0000644000000000000000000000004412034702063012127 0ustar usr/lib/libvte.so.* usr/lib/libvte9 debian/python-vte.install0000644000000000000000000000005012034702063012663 0ustar usr/lib/python*/*-packages/gtk-2.0/*.so debian/libvte9-udeb.install0000644000000000000000000000005412034702063013045 0ustar usr/lib/libvte.so.* usr/share/vte/termcap-* debian/libvte-common.install0000644000000000000000000000005312034702063013324 0ustar usr/share/locale usr/share/vte/termcap-0.0 debian/libvte-dev.install0000644000000000000000000000020412034702063012610 0ustar usr/include/vte-0.0 usr/lib/pkgconfig/vte.pc usr/lib/pkgconfig/pyvte.pc usr/lib/libvte.a usr/lib/libvte.so usr/share/pygtk/2.0/defs