MANIFEST | 2 +-
misc.c | 3 +--
package/debian/changelog | 6 ++++++
package/freebsd/Makefile | 2 +-
package/xterm.spec | 4 ++--
version.h | 6 +++---
xterm.log.html | 19 ++++++++++++++++++-
7 files changed, 32 insertions(+), 10 deletions(-)
New commits:
commit 9d1d81fcbf72e3222b196493a9a0cbed10a43f93
Author: Sven Joachim <svenj...@gmx.de>
Date: Wed Dec 4 17:49:17 2013 +0100
Imported Upstream version 300
diff --git a/MANIFEST b/MANIFEST
index 1804074..499d9ab 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-299, version xterm-299
+MANIFEST for xterm-300, version xterm-300
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/misc.c b/misc.c
index 9c26cb6..129d0a5 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.681 2013/11/26 22:47:29 tom Exp $ */
+/* $XTermId: misc.c,v 1.682 2013/12/03 23:24:48 tom Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -735,7 +735,6 @@ init_colored_cursor(void)
strcat(leaf, theme);
if ((fp = fopen(xterm_cursor_theme, "w")) != 0) {
fprintf(fp, "[Icon Theme]\n");
- fprintf(fp, "Inherits=\n");
fclose(fp);
*leaf = '\0';
xtermSetenv("XCURSOR_PATH", xterm_cursor_theme);
diff --git a/package/debian/changelog b/package/debian/changelog
index 00907c7..828b54c 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (300) unstable; urgency=high
+
+ * fix a regression from #298 changes
+
+ -- Thomas E. Dickey <dic...@invisible-island.net> Tue, 03 Dec 2013 18:59:58
-0500
+
xterm-dev (299) unstable; urgency=low
* fix remaining regression from #297 changes
diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile
index b3c4f6c..9d0bcb3 100644
--- a/package/freebsd/Makefile
+++ b/package/freebsd/Makefile
@@ -5,7 +5,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 299
+PORTVERSION= 300
CATEGORIES= x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
diff --git a/package/xterm.spec b/package/xterm.spec
index 854d4b4..092668a 100644
--- a/package/xterm.spec
+++ b/package/xterm.spec
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.57 2013/12/01 16:47:52 tom Exp $
+# $XTermId: xterm.spec,v 1.58 2013/12/03 23:59:13 tom Exp $
Summary: X terminal emulator (development version)
%global my_middle xterm
%global my_suffix -dev
%global fullname %{my_middle}%{my_suffix}
%global my_class XTermDev
Name: %{fullname}
-Version: 299
+Version: 300
Release: 1
License: X11
Group: User Interface/X
diff --git a/version.h b/version.h
index 50477c5..bc96669 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.375 2013/12/01 16:38:13 tom Exp $ */
+/* $XTermId: version.h,v 1.376 2013/12/03 23:53:59 tom Exp $ */
/*
* Copyright 1998-2012,2013 by Thomas E. Dickey
@@ -38,8 +38,8 @@
* version of X to which this version of xterm has been built. The resulting
* number in parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 299
-#define XTERM_DATE 2013-12-01
+#define XTERM_PATCH 300
+#define XTERM_DATE 2013-12-03
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index 4af7eec..3fb93b0 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -30,7 +30,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.1407 2013/12/01 20:56:56 tom Exp $
+ $XTermId: xterm.log.html,v 1.1410 2013/12/04 00:16:42 tom Exp $
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -69,6 +69,8 @@
CHANGELOG</a>).</p>
<ul>
+ <li><a href="#xterm_300">Patch #300 - 2013/12/03</a></li>
+
<li><a href="#xterm_299">Patch #299 - 2013/12/01</a></li>
<li><a href="#xterm_298">Patch #298 - 2013/11/27</a></li>
@@ -880,6 +882,21 @@
<li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
</ul>
+ <h1><a name="xterm_300" id="xterm_300">Patch #300 -
+ 2013/12/03</a></h1>
+
+ <ul>
+ <li>amend workaround for <code>Xcursor</code> library from
+ <a href="#xterm_298">patch #298</a>; the suggested solution for
+ Debian #466704 fell afoul of a bug in <code>Xcursor</code>
+ which treated an empty value for <code>Inherits=</code> as a
+ valid theme—and resulted in a stack overflow due to
+ unbounded recursion. Certain environments such as XFCE4 exposed
+ the bug. A related report in Debian #531679 was closed without
+ following the recommendation to limit stack recursion in this
+ library (reported by Sergey V Dyatko, Debian #731269).</li>
+ </ul>
+
<h1><a name="xterm_299" id="xterm_299">Patch #299 -
2013/12/01</a></h1>
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vofyj-0006wy...@moszumanska.debian.org
