From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Sep 5 23:10:20 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CA0CB16A421 for ; Mon, 5 Sep 2005 23:10:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79E8F43D4C for ; Mon, 5 Sep 2005 23:10:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j85NAJls088380 for ; Mon, 5 Sep 2005 23:10:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j85NAJa6088379; Mon, 5 Sep 2005 23:10:19 GMT (envelope-from gnats) Resent-Date: Mon, 5 Sep 2005 23:10:19 GMT Resent-Message-Id: <200509052310.j85NAJa6088379@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Daniel Roethlisberger Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E55A16A41F; Mon, 5 Sep 2005 23:03:40 +0000 (GMT) (envelope-from roe@dragon.roe.ch) Received: from dragon.roe.ch (dragon.roe.ch [212.53.102.185]) by mx1.FreeBSD.org (Postfix) with ESMTP id 677F243D45; Mon, 5 Sep 2005 23:03:39 +0000 (GMT) (envelope-from roe@dragon.roe.ch) Received: from aphrodite.roe ([192.168.1.13]) by dragon.roe.ch (envelope-from ) with ESMTP (TLSv1:AES256-SHA:256) id 1ECQ02-0006d8-00 ; Tue, 06 Sep 2005 01:03:38 +0200 Received: from aphrodite.roe (localhost [127.0.0.1]) by aphrodite.roe (8.13.4/8.13.3) with ESMTP id j85N3xwP019293; Tue, 6 Sep 2005 01:03:59 +0200 (CEST) (envelope-from roe@aphrodite.roe) Received: (from roe@localhost) by aphrodite.roe (8.13.4/8.13.3/Submit) id j85N3xMj019292; Tue, 6 Sep 2005 01:03:59 +0200 (CEST) (envelope-from roe) Message-Id: <200509052303.j85N3xMj019292@aphrodite.roe> Date: Tue, 6 Sep 2005 01:03:59 +0200 (CEST) From: Daniel Roethlisberger To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: mich@FreeBSD.org, arundel@h3c.de, daniel@roe.ch Subject: ports/85770: [PATCH] x11/aterm: fix winsize bug X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Daniel Roethlisberger List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Sep 2005 23:10:20 -0000 >Number: 85770 >Category: ports >Synopsis: [PATCH] x11/aterm: fix winsize bug >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Sep 05 23:10:18 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Daniel Roethlisberger >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD aphrodite.roe 5.4-STABLE FreeBSD 5.4-STABLE #4: Sun Aug 28 20:49:49 CEST 2005 root@aphrodite.roe:/usr/obj/usr/src/sys/APHRODITE i386 >Description: Remove file: pkg-message This patch fixes the annoying window size bug introduced with the recent 1.0.0 commit, which made aterm pretty much unusable under some circumstances. This fix has been submitted upstream and will hopefully be included in the next release of aterm. >How-To-Repeat: >Fix: --- portpatch-aterm-1.0.0-winsize-fix.diff begins here --- diff -ruN aterm.orig/Makefile aterm/Makefile --- aterm.orig/Makefile Tue Sep 6 00:39:37 2005 +++ aterm/Makefile Tue Sep 6 00:48:51 2005 @@ -7,6 +7,7 @@ PORTNAME= aterm PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES+= x11 # `+=' is for slave ports MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -71,6 +72,5 @@ post-install: @${CHMOD} 4711 ${PREFIX}/bin/aterm - @${CAT} ${PKGMESSAGE} .include diff -ruN aterm.orig/files/patch-aa aterm/files/patch-aa --- aterm.orig/files/patch-aa Tue Sep 6 00:39:37 2005 +++ aterm/files/patch-aa Tue Sep 6 00:40:24 2005 @@ -1,6 +1,6 @@ ---- src/command.c.orig Mon Oct 22 23:02:47 2001 -+++ src/command.c Mon Oct 22 22:43:26 2001 -@@ -69,12 +69,18 @@ +--- src/command.c.orig Tue Jun 21 22:08:16 2005 ++++ src/command.c Tue Sep 6 00:35:28 2005 +@@ -73,12 +73,18 @@ #ifndef NO_XLOCALE # if (XtSpecificationRelease < 6) # define NO_XLOCALE @@ -22,7 +22,7 @@ #ifdef TTY_GID_SUPPORT # include #endif -@@ -534,7 +540,7 @@ +@@ -600,7 +606,7 @@ ttydev = tty_name; # define PTYCHAR1 "pqrstuvwxyz" @@ -31,3 +31,20 @@ for (c1 = PTYCHAR1; *c1; c1++) { ptydev[len - 2] = ttydev[len - 2] = *c1; for (c2 = PTYCHAR2; *c2; c2++) { +@@ -1043,8 +1049,6 @@ + signal(SIGTERM, Exit_signal); + signal(SIGCHLD, Child_signal); + +- tt_winsize(ptyfd); /* set window size */ +- + /* need to trap SIGURG for SVR4 (Unixware) rlogin */ + /* signal (SIGURG, SIG_DFL); */ + +@@ -1084,6 +1088,7 @@ + } + #endif /* SRIOCSREDIR */ + } ++ tt_winsize(0); /* set window size */ + + /* reset signals and spin off the command interpreter */ + signal(SIGINT, SIG_DFL); diff -ruN aterm.orig/pkg-message aterm/pkg-message --- aterm.orig/pkg-message Tue Sep 6 00:39:37 2005 +++ aterm/pkg-message Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ - - ATTENTION: - -Due to a BSD related bug in aterm in some cases the $COLUMNS and $LINES -envirement variables are not being updated to the corresponding window geometry -values. This will cause problems with applications such as 'man' or 'ee'. You -need to adjust the window geometry manually at least once in order for the two -envirement variable mentioned above to get adjusted correctly. - -The AfterStep/aterm developers know about this problem and are working on it. --- portpatch-aterm-1.0.0-winsize-fix.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: