cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a race in setting the window size; patch from Nathan Houghton,

Browse Source 
similar ports diff from jasper@ - ok landry@ jasper@
This commit is contained in:
sthen 2010-08-26 10:36:52 +00:00
parent 8961f0c15a
commit b1351841d3
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/rxvt/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.41 2010/07/30 06:59:00 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.42 2010/08/26 10:36:52 sthen Exp $
COMMENT-main= color, low memory usage, xterm replacement
COMMENT-clock= analog clock for X11 w/appoint. reminder and mail notif
@ -6,9 +6,9 @@ COMMENT-clock= analog clock for X11 w/appoint. reminder and mail notif
VER= 2.7.10
DISTNAME= rxvt-${VER}
PKGNAME-main= rxvt-${VER}
REVISION-main= 4
REVISION-main= 5
PKGNAME-clock= rclock-${VER}
REVISION-clock= 0
REVISION-clock= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rxvt/} \
ftp://ftp.fu-berlin.de/unix/X11/terms/rxvt/ \
@ -19,7 +19,7 @@ HOMEPAGE= http://www.rxvt.org/
MAINTAINER= Jason Ish <ish@openbsd.org>
# GPL
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes

26
x11/rxvt/patches/patch-src_init_c Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-src_init_c,v 1.1 2010/08/26 10:36:53 sthen Exp $
avoid a race commonly hit by tiling WMs
--- src/init.c.orig Wed Aug 25 23:52:24 2010
+++ src/init.c Wed Aug 25 23:53:06 2010
@@ -1316,6 +1316,9 @@ rxvt_run_command(rxvt_t *r, const char *const *argv)
/* need to trap SIGURG for SVR4 (Unixware) rlogin */
/* signal (SIGURG, SIG_DFL); */
+/* set window size */
+ rxvt_tt_winsize(STDIN_FILENO, r->TermWin.ncol, r->TermWin.nrow);
+
#ifndef __QNX__
/* spin off the command interpreter */
switch (r->h->cmd_pid = fork()) {
@@ -1398,9 +1401,6 @@ rxvt_run_child(rxvt_t *r, const char *const *argv)
}
#endif /* SRIOCSREDIR */
}
-
- /* set window size */
- rxvt_tt_winsize(STDIN_FILENO, r->TermWin.ncol, r->TermWin.nrow);
/* reset signals and spin off the command interpreter */
signal(SIGINT, SIG_DFL);

4
x11/rxvt/pkg/PLIST-clock
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST-clock,v 1.2 2004/09/15 19:26:31 espie Exp $
bin/rclock
@comment $OpenBSD: PLIST-clock,v 1.3 2010/08/26 10:36:53 sthen Exp $
@bin bin/rclock
@man man/man1/rclock.1

4
x11/rxvt/pkg/PLIST-main
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/21 21:04:56 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2010/08/26 10:36:53 sthen Exp $
@pkgpath x11/rxvt
@mode 4755
bin/rxvt
@bin bin/rxvt
@mode
@man man/man1/rxvt.1