MANIFEST | 2 +- debian/changelog | 9 +++++++++ debian/copyright | 2 +- main.c | 8 ++++---- package/debian/changelog | 6 ++++++ package/debian/copyright | 2 +- package/freebsd/Makefile | 2 +- package/xterm.spec | 4 ++-- version.h | 8 ++++---- xterm.log.html | 15 +++++++++++++-- 10 files changed, 42 insertions(+), 16 deletions(-)
New commits: commit 0e672e9c2a3b6d2c4b871a43dd5e4a12db1c1d82 Author: Sven Joachim <[email protected]> Date: Sat Jan 2 16:17:42 2016 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index d94b0c4..8b3e577 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xterm (322-1) UNRELEASED; urgency=medium +xterm (322-1) unstable; urgency=medium * New upstream release. - Fix regression due to incorrect fix for compiler warning when allocating storage for /etc/shells (Closes: #809646). * Update years in debian/copyright. - -- Sven Joachim <[email protected]> Sat, 02 Jan 2016 16:10:35 +0100 + -- Sven Joachim <[email protected]> Sat, 02 Jan 2016 16:17:27 +0100 xterm (321-1) unstable; urgency=medium commit 25542cacd2d6baab70d7b508d9882527c20ddb49 Author: Sven Joachim <[email protected]> Date: Sat Jan 2 16:13:20 2016 +0100 Update years in debian/copyright diff --git a/debian/changelog b/debian/changelog index 3367a4e..d94b0c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xterm (322-1) UNRELEASED; urgency=medium * New upstream release. - Fix regression due to incorrect fix for compiler warning when allocating storage for /etc/shells (Closes: #809646). + * Update years in debian/copyright. -- Sven Joachim <[email protected]> Sat, 02 Jan 2016 16:10:35 +0100 diff --git a/debian/copyright b/debian/copyright index fdaebdc..a6a2f02 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ This package was debianized by first time by David Martinez Moreno Upstream sources: http://invisible-island.net/xterm/xterm.html -Copyright 1997-2015 by Thomas E. Dickey +Copyright 1997-2016 by Thomas E. Dickey Copyright 1999-2000 by Steve Wall Copyright 2013,2014 by Ross Combs commit 40534aa3045cbcea355fe547cacc40590642ce44 Author: Sven Joachim <[email protected]> Date: Sat Jan 2 16:11:58 2016 +0100 New upstream release, closing bug #809646 diff --git a/debian/changelog b/debian/changelog index d0ac8d7..3367a4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xterm (322-1) UNRELEASED; urgency=medium + + * New upstream release. + - Fix regression due to incorrect fix for compiler warning when + allocating storage for /etc/shells (Closes: #809646). + + -- Sven Joachim <[email protected]> Sat, 02 Jan 2016 16:10:35 +0100 + xterm (321-1) unstable; urgency=medium * New upstream release. commit 7bfca55d7cd7433af575284dfbbed6d81409eb85 Author: Sven Joachim <[email protected]> Date: Sat Jan 2 16:06:31 2016 +0100 Imported Upstream version 322 diff --git a/MANIFEST b/MANIFEST index 74cd987..1009b48 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-321, version xterm-321 +MANIFEST for xterm-322, version xterm-322 -------------------------------------------------------------------------------- MANIFEST this file 256colres.h resource-definitions for 256-color mode diff --git a/main.c b/main.c index 27120b3..2e68a44 100644 --- a/main.c +++ b/main.c @@ -1,7 +1,7 @@ -/* $XTermId: main.c,v 1.776 2015/12/29 15:19:35 tom Exp $ */ +/* $XTermId: main.c,v 1.777 2016/01/02 14:12:19 tom Exp $ */ /* - * Copyright 2002-2014,2015 by Thomas E. Dickey + * Copyright 2002-2015,2016 by Thomas E. Dickey * * All Rights Reserved * @@ -3248,8 +3248,8 @@ validShell(const char *pathname) if (validProgram(pathname) && stat(ok_shells, &sb) == 0 && (sb.st_mode & S_IFMT) == S_IFREG - && (sb.st_size != 0) - && (sb.st_size < (off_t) (((size_t) ~0) - 2)) + && ((size_t) sb.st_size > 0) + && ((size_t) sb.st_size < (((size_t) ~0) - 2)) && (blob = calloc((size_t) sb.st_size + 2, sizeof(char))) != 0) { if ((fp = fopen(ok_shells, "r")) != 0) { rc = fread(blob, sizeof(char), (size_t) sb.st_size, fp); diff --git a/package/debian/changelog b/package/debian/changelog index a8592c8..1d0ce23 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,3 +1,9 @@ +xterm-dev (322) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <[email protected]> Sat, 02 Jan 2016 08:42:56 -0500 + xterm-dev (321) unstable; urgency=low * maintenance updates diff --git a/package/debian/copyright b/package/debian/copyright index 0a69d30..1280a8c 100644 --- a/package/debian/copyright +++ b/package/debian/copyright @@ -35,7 +35,7 @@ authorization. Files: * */* License: MIT-X11 -Copyright 1996-2014,2015 by Thomas E. Dickey +Copyright 1996-2015,2016 by Thomas E. Dickey (date ranges vary, depending on when the respective files were first changed significantly, and run through the most recent change date). diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile index 493e30d..55f002b 100644 --- a/package/freebsd/Makefile +++ b/package/freebsd/Makefile @@ -5,7 +5,7 @@ # and "make makesum". PORTNAME= xterm -PORTVERSION= 321 +PORTVERSION= 322 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/ \ CRITICAL diff --git a/package/xterm.spec b/package/xterm.spec index 8ded496..d2e5b70 100644 --- a/package/xterm.spec +++ b/package/xterm.spec @@ -1,11 +1,11 @@ -# $XTermId: xterm.spec,v 1.86 2015/09/27 23:17:50 tom Exp $ +# $XTermId: xterm.spec,v 1.87 2016/01/02 13:42:56 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: 321 +Version: 322 Release: 1 License: X11 Group: User Interface/X diff --git a/version.h b/version.h index b394bcc..3768c54 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ -/* $XTermId: version.h,v 1.420 2016/01/01 01:37:58 tom Exp $ */ +/* $XTermId: version.h,v 1.422 2016/01/02 14:15:49 tom Exp $ */ /* - * Copyright 1998-2014,2015 by Thomas E. Dickey + * Copyright 1998-2015,2016 by Thomas E. Dickey * * All Rights Reserved * @@ -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 321 -#define XTERM_DATE 2015-12-31 +#define XTERM_PATCH 322 +#define XTERM_DATE 2016-01-02 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" diff --git a/xterm.log.html b/xterm.log.html index bbc7b86..2349539 100644 --- a/xterm.log.html +++ b/xterm.log.html @@ -2,7 +2,7 @@ ***************************************************************************** * this file is part of xterm * * * - * Copyright 1997-2014,2015 by Thomas E. Dickey * + * Copyright 1997-2015,2016 by Thomas E. Dickey * * * * All Rights Reserved * * * @@ -30,7 +30,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * ***************************************************************************** - $XTermId: xterm.log.html,v 1.1634 2016/01/01 01:38:06 tom Exp $ + $XTermId: xterm.log.html,v 1.1638 2016/01/02 14:26:50 tom Exp $ --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> @@ -72,6 +72,8 @@ CHANGELOG</a>).</p> <ul> + <li><a href="#xterm_322">Patch #322 - 2016/01/02</a></li> + <li><a href="#xterm_321">Patch #321 - 2015/12/31</a></li> <li><a href="#xterm_320">Patch #320 - 2015/08/28</a></li> @@ -927,6 +929,15 @@ <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li> </ul> + <h1><a name="xterm_322" id="xterm_322">Patch #322 - + 2016/01/02</a></h1> + + <ul> + <li>fix regression due to incorrect fix for compiler warning + when allocating storage for <code>/etc/shells</code> (reports + by Ashish Shukla, Debian #809646).</li> + </ul> + <h1><a name="xterm_321" id="xterm_321">Patch #321 - 2015/12/31</a></h1>
