rpms/gpm/F-7 gpm-1.20.1-default-handler.patch, NONE, 1.1 gpm.spec, 1.52, 1.53

[Tomas Janousek (tjanouse)]

Author: tjanouse

Update of /cvs/pkgs/rpms/gpm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4047

Modified Files:
	gpm.spec 
Added Files:
	gpm-1.20.1-default-handler.patch 
Log Message:
* Wed May 23 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-84
- applied patch for #240389, fixing default handlers


gpm-1.20.1-default-handler.patch:

--- NEW FILE gpm-1.20.1-default-handler.patch ---
--- gpm-1.20.1/src/lib/liblow.c.orig	2002-12-24 23:57:16.000000000 +0100
+++ gpm-1.20.1/src/lib/liblow.c	2007-05-17 01:48:02.000000000 +0200
@@ -249,7 +249,7 @@
             gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM);
          memcpy(tty,option.consolename,strlen(option.consolename)-1);
          sprintf(&tty[strlen(option.consolename)-1],"%i",flag);
-      } else { /* use your current vc */ 
+      } else if (flag==0) { /* use your current vc */ 
          if (isatty(0)) tty = ttyname(0);             /* stdin */
          if (!tty && isatty(1)) tty = ttyname(1);     /* stdout */
          if (!tty && isatty(2)) tty = ttyname(2);     /* stderr */
@@ -265,7 +265,8 @@
          }
           
          conn->vc=atoi(&tty[strlen(option.consolename)-1]);
-      }
+      } else /* a default handler -- use console */
+        tty = strdup(option.consolename);
 
       if (gpm_consolefd == -1)
          if ((gpm_consolefd=open(tty,O_WRONLY)) < 0) {


Index: gpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpm/F-7/gpm.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gpm.spec	4 May 2007 08:32:25 -0000	1.52
+++ gpm.spec	23 May 2007 13:07:16 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console.
 Name: gpm
 Version: 1.20.1
-Release: 83%{?dist}
+Release: 84%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz
@@ -22,6 +22,7 @@
 Patch22: gpm-1.20.1-close-fds.patch
 Patch23: gpm-1.20.1-aligned-sleep.patch
 Patch24: gpm-1.20.1-deadsocket.patch
+Patch25: gpm-1.20.1-default-handler.patch
 
 Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info
 Requires: bash >= 2.0
@@ -68,6 +69,7 @@
 %patch22 -p1 -b .close-fds
 %patch23 -p1 -b .aligned-sleep
 %patch24 -p1 -b .deadsocket
+%patch25 -p1 -b /default-handler
 
 %build
 rm -f configure
@@ -186,6 +188,9 @@
 %{_libdir}/libgpm.so
 
 %changelog
+* Wed May 23 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-84
+- applied patch for #240389, fixing default handlers
+
 * Thu May 03 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-83
 - gpm-devel now requires version-release correctly, fixes #238785