packages: mrxvt/mrxvt.spec, mrxvt/mrxvt-xkill.patch (NEW) - patch for orpha...
draenog
draenog at pld-linux.org
Fri Mar 18 21:55:13 CET 2011
Author: draenog Date: Fri Mar 18 20:55:13 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- patch for orphaned processes after xkill, see:
http://www.mail-archive.com/misc@openbsd.org/msg61290.html
- adapterized
---- Files affected:
packages/mrxvt:
mrxvt.spec (1.24 -> 1.25) , mrxvt-xkill.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/mrxvt/mrxvt.spec
diff -u packages/mrxvt/mrxvt.spec:1.24 packages/mrxvt/mrxvt.spec:1.25
--- packages/mrxvt/mrxvt.spec:1.24 Wed Feb 10 23:38:52 2010
+++ packages/mrxvt/mrxvt.spec Fri Mar 18 21:55:08 2011
@@ -4,13 +4,14 @@
Summary(pt_BR.UTF-8): Um emulador de vt102 colorido
Name: mrxvt
Version: 0.5.4
-Release: 2
+Release: 3
License: GPL v2
Group: X11/Applications
-Source0: http://dl.sourceforge.net/materm/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/materm/%{name}-%{version}.tar.gz
# Source0-md5: 0232c8868484751dcb931a28f0756f69
Source1: %{name}.desktop
Source2: %{name}.png
+Patch0: %{name}-xkill.patch
URL: http://materm.sourceforge.net/
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
@@ -41,6 +42,7 @@
%prep
%setup -q
+%patch0 -p1
%build
export LDFLAGS="%{rpmldflags} -lutempter -L%{_libdir}"
@@ -108,6 +110,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.25 2011/03/18 20:55:08 draenog
+- patch for orphaned processes after xkill, see:
+ http://www.mail-archive.com/misc@openbsd.org/msg61290.html
+- adapterized
+
Revision 1.24 2010/02/10 22:38:52 sparky
- dropped BR: autoconf
================================================================
Index: packages/mrxvt/mrxvt-xkill.patch
diff -u /dev/null packages/mrxvt/mrxvt-xkill.patch:1.1
--- /dev/null Fri Mar 18 21:55:13 2011
+++ packages/mrxvt/mrxvt-xkill.patch Fri Mar 18 21:55:08 2011
@@ -0,0 +1,46 @@
+diff -ur mrxvt-0.5.4.old/src/init.c mrxvt-0.5.4/src/init.c
+--- mrxvt-0.5.4.old/src/init.c 2008-06-13 20:08:13.000000000 +0100
++++ mrxvt-0.5.4/src/init.c 2011-03-18 20:11:36.645940109 +0000
+@@ -46,6 +46,7 @@
+ int rxvt_getdtablesize ();
+ #endif
+ int rxvt_xerror_handler (const Display*, const XErrorEvent*);
++int rxvt_xioerror_handler (Display*);
+ void rxvt_init_colors (rxvt_t*);
+ void rxvt_init_win_size (rxvt_t*);
+ void rxvt_color_aliases (rxvt_t*, int);
+@@ -885,6 +886,25 @@
+ r->num_fds = 7 + 1;
+ #endif
+ }
++/* + * FIXME
++ *
++ * Wed Apr 30 14:35:33 CEST 2008 +gar <[EMAIL PROTECTED]>
++ *
++ * This is a workaround for for OpenBSD users. On killed connection after
++ * ctrl+alt+backspace with ksh as default shell child processes don't exit,
++ * remaining in WCHAN state for ttyin. This works for me, I set a IO error
++ * handler for killed connection (man XSetErrorHandler) to clean vts before
++ * exiting. + */
++int
++rxvt_xioerror_handler(Display *d)
++{
++ rxvt_msg(DBG_ERROR, DBG_INIT, "IO error, cleaning...\n");
++ rxvt_Exit_signal(1);
++ return 0;
++// abort();
++}
++
++
+
+
+ /* INTPROTO */
+@@ -1079,6 +1099,7 @@
+ * allowed.
+ */
+ XSetErrorHandler( (XErrorHandler) rxvt_xerror_handler );
++ XSetIOErrorHandler( rxvt_xioerror_handler );
+
+ /* Initialize all atoms after establishing connection to X */
+ for (i = 0; i < NUM_XA; i++)
+Only in mrxvt-0.5.4/src: init.c~
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mrxvt/mrxvt.spec?r1=1.24&r2=1.25&f=u
More information about the pld-cvs-commit
mailing list