xterm: Changes to 'debian-unstable'
MANIFEST | 2 +-
configure | 2 +-
configure.in | 4 ++--
debian/changelog | 6 ++++--
debian/control | 9 ++++++++-
debian/rules | 5 +----
debian/xterm.overrides | 1 -
main.c | 6 +++---
print.c | 8 +++++---
ptyx.h | 4 ++--
screen.c | 11 ++++++-----
version.h | 4 ++--
xterm.log.html | 17 ++++++++++++++++-
13 files changed, 51 insertions(+), 28 deletions(-)
New commits:
commit 292f4922c57c47955b6a76f990bddb5a3b690b41
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 4 16:38:12 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index b562bb5..75fc7a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (247-1) UNRELEASED; urgency=low
+xterm (247-1) unstable; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
@@ -7,7 +7,7 @@ xterm (247-1) UNRELEASED; urgency=low
* Kill remaining subversion $Id$ tags from debian packaging files.
* Use libutempter, remove setgid bit from the xterm binary (closes: #537867).
- -- Julien Cristau <jcristau@debian.org> Sun, 23 Aug 2009 00:40:57 +0200
+ -- Julien Cristau <jcristau@debian.org> Fri, 04 Sep 2009 16:24:35 +0200
xterm (246-1) unstable; urgency=low
commit ed8925e4187af4ae648a18ea727904e86b6d5055
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 4 15:56:28 2009 +0200
Use libutempter, remove setgid bit from the xterm binary.
diff --git a/debian/changelog b/debian/changelog
index 7edfc66..b562bb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xterm (247-1) UNRELEASED; urgency=low
* Remove David Martínez Moreno from Uploaders as he hasn't been active on
this package lately.
* Kill remaining subversion $Id$ tags from debian packaging files.
+ * Use libutempter, remove setgid bit from the xterm binary (closes: #537867).
-- Julien Cristau <jcristau@debian.org> Sun, 23 Aug 2009 00:40:57 +0200
diff --git a/debian/control b/debian/control
index d4d428d..5935bf0 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends:
libncurses5-dev | libncurses-dev,
libxft-dev (>> 2.1.2), libxrender-dev (>> 1:0.9.0),
libxaw7-dev,
+ libutempter-dev,
debhelper (>= 5),
quilt,
lynx
diff --git a/debian/rules b/debian/rules
index e92ebad..32c5fea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,7 @@ $(STAMP_DIR)/configure: $(STAMP_DIR)/patch
--enable-narrowproto \
--enable-exec-xterm \
--enable-dabbrev \
+ --with-utempter \
$(confflags) \
DESKTOP_FLAGS="$(DESKTOP_FLAGS)" \
CFLAGS="$(CFLAGS)" \
@@ -107,8 +108,6 @@ install: build
dh_installchangelogs
dh_installmenu
dh_install --sourcedir=debian/tmp --list-missing
- # Lintian overrides.
- cp debian/xterm.overrides $(CURDIR)/debian/xterm/usr/share/lintian/overrides/xterm
# Generate plain text XTerm FAQ from HTML.
debian/local/xterm.faq.gz: debian/local/xterm.faq.html
@@ -127,8 +126,6 @@ binary-arch: install
dh_strip
dh_compress
dh_fixperms
- chown :utmp debian/xterm/usr/bin/xterm
- chmod g+s debian/xterm/usr/bin/xterm
dh_installdeb
dh_shlibdeps
dh_gencontrol
diff --git a/debian/xterm.overrides b/debian/xterm.overrides
deleted file mode 100644
index 7c4a3e6..0000000
--- a/debian/xterm.overrides
+++ /dev/null
@@ -1 +0,0 @@
-xterm: setgid-binary usr/bin/xterm 2755 root/utmp
commit 97bf139aabf7fac7d2e13d232b360d42847bff55
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 4 16:05:36 2009 +0200
Wrap Build-Depends field in debian/control
diff --git a/debian/control b/debian/control
index 53974d2..d4d428d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,13 @@ Standards-Version: 3.8.3
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm
Homepage: http://invisible-island.net/xterm/xterm.html
-Build-Depends: libncurses5-dev | libncurses-dev, libxft-dev (>> 2.1.2), libxrender-dev (>> 1:0.9.0), libxaw7-dev, debhelper (>= 5), quilt, lynx
+Build-Depends:
+ libncurses5-dev | libncurses-dev,
+ libxft-dev (>> 2.1.2), libxrender-dev (>> 1:0.9.0),
+ libxaw7-dev,
+ debhelper (>= 5),
+ quilt,
+ lynx
# Reasons for Build-Depends:
#
commit e53834dd3e84934f59b3b3f91899875c50186aed
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 4 16:04:32 2009 +0200
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index 644b8b8..7edfc66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xterm (246-2) UNRELEASED; urgency=low
+xterm (247-1) UNRELEASED; urgency=low
+ * New upstream release.
* Bump Standards-Version to 3.8.3.
* Remove David Martínez Moreno from Uploaders as he hasn't been active on
this package lately.
commit 89ec563b8565649955aeb036411cc710a3b31395
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 4 16:00:18 2009 +0200
Import xterm 247
diff --git a/MANIFEST b/MANIFEST
index bcd71a7..603e76f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-246, version xterm-246
+MANIFEST for xterm-247, version xterm-247
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/configure b/configure
index c28534d..eca3e84 100755
--- a/configure
+++ b/configure
@@ -9000,7 +9000,7 @@ LIBS="$LIBS $X_EXTRA_LIBS"
# Check for openpty() in -lutil if the UNIX98-style pty functions are not
# available. E.g. for GNU libc 2.0.
case $host_os in #(vi
-freebsd*|netbsd*) # 2004/8/15 - revisit this if/when grantpt is known to work.
+freebsd*|netbsd*|dragonfly*) # 2004/8/15 - revisit this if/when grantpt is known to work.
echo "$as_me:9005: checking for openpty in -lutil" >&5
echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
diff --git a/configure.in b/configure.in
index 53dcf69..3fe3c64 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.252 2009/08/13 19:41:01 tom Exp $
+dnl $XTermId: configure.in,v 1.253 2009/08/30 21:46:21 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
@@ -285,7 +285,7 @@ LIBS="$LIBS $X_EXTRA_LIBS"
# Check for openpty() in -lutil if the UNIX98-style pty functions are not
# available. E.g. for GNU libc 2.0.
case $host_os in #(vi
-freebsd*|netbsd*) # 2004/8/15 - revisit this if/when grantpt is known to work.
+freebsd*|netbsd*|dragonfly*) # 2004/8/15 - revisit this if/when grantpt is known to work.
AC_CHECK_LIB(util,openpty)
;;
*)
diff --git a/main.c b/main.c
index 900a92b..13ad09c 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.593 2009/08/07 23:14:47 tom Exp $ */
+/* $XTermId: main.c,v 1.594 2009/08/30 21:40:45 Alex.Hornung Exp $ */
/*
* W A R N I N G
@@ -380,7 +380,7 @@ extern struct utmp *getutid __((struct utmp * _Id));
#include <util.h> /* openpty() */
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
#include <libutil.h> /* openpty() */
#endif
@@ -2415,7 +2415,7 @@ main(int argc, char *argv[]ENVP_ARG)
}
}
-#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
#define USE_OPENPTY 1
static int opened_tty = -1;
#endif
diff --git a/print.c b/print.c
index 7ea1c8e..7200e3e 100644
--- a/print.c
+++ b/print.c
@@ -1,4 +1,4 @@
-/* $XTermId: print.c,v 1.105 2009/08/07 00:25:10 tom Exp $ */
+/* $XTermId: print.c,v 1.107 2009/08/31 00:37:04 tom Exp $ */
/************************************************************
@@ -279,8 +279,10 @@ xtermPrintEverything(XtermWidget xw)
int bot = screen->max_row;
int was_open = initialized;
- if (!screen->whichBuf)
- top = -screen->savedlines;
+ if (!screen->whichBuf) {
+ top = -screen->savedlines - screen->topline;
+ bot -= screen->topline;
+ }
TRACE(("xtermPrintEverything, rows %d..%d\n", top, bot));
while (top <= bot)
diff --git a/ptyx.h b/ptyx.h
index 909e9c6..c1e18d9 100644
--- a/ptyx.h
+++ b/ptyx.h
@@ -1,4 +1,4 @@
-/* $XTermId: ptyx.h,v 1.625 2009/08/14 23:14:26 tom Exp $ */
+/* $XTermId: ptyx.h,v 1.626 2009/08/30 21:40:45 Alex.Hornung Exp $ */
/*
* Copyright 1999-2008,2009 by Thomas E. Dickey
@@ -156,7 +156,7 @@
#define USE_PTY_DEVICE 1
#define USE_PTY_SEARCH 1
-#if defined(__osf__) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#if defined(__osf__) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
#undef USE_PTY_DEVICE
#undef USE_PTY_SEARCH
#define USE_PTS_DEVICE 1
diff --git a/screen.c b/screen.c
index 26ad604..d1d8363 100644
--- a/screen.c
+++ b/screen.c
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.394 2009/08/16 18:16:45 tom Exp $ */
+/* $XTermId: screen.c,v 1.396 2009/08/30 00:06:07 tom Exp $ */
/*
* Copyright 1999-2008,2009 by Thomas E. Dickey
@@ -281,7 +281,7 @@ allocScrnHead(TScreen * screen, unsigned nrow)
static unsigned
sizeofScrnRow(TScreen * screen, unsigned ncol)
{
- unsigned result = 1;
+ unsigned result;
unsigned sizeAttribs;
#if OPT_ISO_COLORS
unsigned sizeColors;
@@ -289,13 +289,14 @@ sizeofScrnRow(TScreen * screen, unsigned ncol)
(void) screen;
+ result = (ncol * sizeof(CharData));
+ AlignValue(result);
+
#if OPT_WIDE_CHARS
if (screen->wide_chars) {
- result += (unsigned) screen->max_combining;
+ result *= (unsigned) (1 + screen->max_combining);
}
#endif
- result = (ncol * result * sizeof(CharData));
- AlignValue(result);
sizeAttribs = (ncol * SizeofScrnPtr(attribs));
AlignValue(sizeAttribs);
diff --git a/version.h b/version.h
index 51ae53a..1356265 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.302 2009/08/14 09:04:02 tom Exp $ */
+/* $XTermId: version.h,v 1.303 2009/08/28 10:49:30 tom Exp $ */
/*
* These definitions are used to build the string that's printed in response to
@@ -6,7 +6,7 @@
* version of X to which this version of xterm has been built. The number in
* parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 246
+#define XTERM_PATCH 247
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index 132314f..bacfdde 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -20,7 +20,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.781 2009/08/16 22:51:21 tom Exp $
+ $XTermId: xterm.log.html,v 1.785 2009/08/30 23:59:11 tom Exp $
-->
<HTML>
<HEAD>
@@ -45,6 +45,7 @@ Most of these are summarized in the XFree86 CHANGELOG
is the latest version of this file.
<UL>
+<LI><A HREF="#xterm_247">Patch #247 - 2009/8/30</A>
<LI><A HREF="#xterm_246">Patch #246 - 2009/8/16</A>
<LI><A HREF="#xterm_245">Patch #245 - 2009/8/12</A>
<LI><A HREF="#xterm_244">Patch #244 - 2009/8/9</A>
@@ -294,6 +295,20 @@ is the latest version of this file.
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+<H1><A NAME="xterm_247">Patch #247 - 2009/8/30</A></H1>
+<ul>
+ <li>add ifdef's and check for openpty() on DragonFly (patch by
+ Alex Hornung).
+
+ <li>correct calculation for size of line's data block, which was
+ sometimes off-by-one when configured
+ using <code>--enable-16bit-chars</code>
+ (report by H Merijn Brand).
+
+ <li>fix indexing error in print-everything feature from
+ <a href="#xterm_246">patch #246</a> (patch by Ovidiu Gheorghioiu).
+</ul>
+
<H1><A NAME="xterm_246">Patch #246 - 2009/8/16</A></H1>
<ul>
<li>remove obsolete logic for saving/restoring wrapping flags, which
Reply to: