rpms/gpm
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated to 1.20.3 Mass patch cleanup

Browse Source
This commit is contained in:
Zdenek Prikryl 2008-05-29 11:53:50 +00:00
parent 5b9f257ee7
commit 5aa6d6e317
16 changed files with 11 additions and 7360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gpm-1.20.1-aligned-sleep.patch
View File

@ -1,29 +0,0 @@
--- gpm-1.20.1/src/console.c.org 2006-09-03 10:11:17.000000000 +0200
+++ gpm-1.20.1/src/console.c 2006-09-03 10:14:34.000000000 +0200
@@ -30,6 +30,7 @@
#include <time.h> /* time() */
#include <sys/fcntl.h> /* O_RDONLY */
#include <sys/stat.h> /* mkdir() */
+#include <sys/time.h>
#include <asm/types.h> /* __u32 */
#include <linux/vt.h> /* VT_GETSTATE */
@@ -102,8 +103,17 @@ int is_text_console(void)
/*-------------------------------------------------------------------*/
void wait_text_console(void)
{
+ struct timeval now;
+ int usecs;
do {
- sleep(2);
+ /* sleep to the top of the seconds about 2 seconds from now */
+ gettimeofday(&now, NULL);
+ usecs = 2000000;
+ if (now.tv_usec <= 250000)
+ usecs -= 1000000;
+ usecs += 1000000 - now.tv_usec;
+
+ usleep(usecs);
} while (!is_text_console());
}

14
gpm-1.20.1-close-fds.patch
View File

@ -1,14 +0,0 @@
--- gpm-1.20.1/src/startup.c.close-fds 2006-09-22 13:46:19.000000000 +0200
+++ gpm-1.20.1/src/startup.c 2006-09-22 13:46:44.000000000 +0200
@@ -97,6 +97,11 @@
/* is changing to root needed, because of relative paths ? or can we just
* remove and ignore it ?? FIXME */
if (chdir("/") < 0) gpm_report(GPM_PR_OOPS,GPM_MESS_CHDIR_FAILED);
+
+ // close extra fds
+ close(0);
+ close(1);
+ close(2);
atexit(gpm_exited); /* call gpm_exited at the end */
}

18
gpm-1.20.1-consolename.patch
View File

@ -1,18 +0,0 @@
--- gpm-1.20.1/src/lib/liblow.c.orig 2004-10-13 16:34:15.181502369 -0400
+++ gpm-1.20.1/src/lib/liblow.c 2004-10-13 16:34:20.491778415 -0400
@@ -262,13 +262,14 @@
gpm_report(GPM_PR_ERR,"consolename not set");
goto err;
}
+#if 0
/* do we really need this check ? */
if(strncmp(tty,consolename,strlen(consolename)-1)
|| !isdigit(tty[strlen(consolename)-1])) {
gpm_report(GPM_PR_ERR,"strncmp/isdigit/consolename failed");
goto err;
}
-
+#endif
conn->vc=atoi(&tty[strlen(consolename)-1]);
}

17
gpm-1.20.1-deadsocket.patch
View File

@ -1,17 +0,0 @@
--- gpm-1.20.1/src/gpm.c.deadsocket 2007-03-23 16:59:42.000000000 +0100
+++ gpm-1.20.1/src/gpm.c 2007-03-23 17:10:10.000000000 +0100
@@ -544,7 +544,14 @@
* we can safely use micelist
*/
close(micelist->dev.fd);
+
+ close(ctlfd);
+ FD_CLR(ctlfd, &connSet);
wait_text_console();
+ ctlfd = listen_for_clients();
+ FD_SET(ctlfd, &connSet);
+ maxfd = max(maxfd, ctlfd);
+
/* reopen, reinit (the function is only used if we have one mouse device) */
if ((micelist->dev.fd = open(micelist->device, O_RDWR)) < 0)
gpm_report(GPM_PR_OOPS, GPM_MESS_OPEN, micelist->device);

21
gpm-1.20.1-default-handler.patch
View File

@ -1,21 +0,0 @@
--- gpm-1.20.1/src/lib/liblow.c.default-handler 2007-05-23 15:15:01.000000000 +0200
+++ gpm-1.20.1/src/lib/liblow.c 2007-05-23 15:16:26.000000000 +0200
@@ -250,7 +250,7 @@
gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM);
memcpy(tty,consolename,strlen(consolename)-1);
sprintf(&tty[strlen(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 */
@@ -271,7 +271,8 @@
}
#endif
conn->vc=atoi(&tty[strlen(consolename)-1]);
- }
+ } else /* a default handler -- use console */
+ tty = strdup(consolename);
if (gpm_consolefd == -1)
if ((gpm_consolefd=open(tty,O_WRONLY)) < 0) {

11
gpm-1.20.1-doc.patch Normal file
View File

@ -0,0 +1,11 @@
--- gpm-1.20.1/doc/gpm.info.orig 2008-05-22 16:10:27.000000000 +0200
+++ gpm-1.20.1/doc/gpm.info 2008-05-22 16:10:34.000000000 +0200
@@ -5,7 +5,7 @@ produced by makeinfo version 4.0 from
INFO-DIR-SECTION Miscellaneous
START-INFO-DIR-ENTRY
-* Gpm: (gpm). A server wich hands mouse events to non-X programs.
+* Gpm: (gpm). A server which hands mouse events to non-X programs.
END-INFO-DIR-ENTRY
This file is a user's and programmer's manual for gpm 1.20.1.

22
gpm-1.20.1-gpmopen.patch
View File

@ -1,22 +0,0 @@
--- gpm-1.20.1/src/lib/liblow.c.gpmopen 2004-05-04 17:36:09.000000000 -0400
+++ gpm-1.20.1/src/lib/liblow.c 2004-05-04 17:42:51.000000000 -0400
@@ -200,8 +200,6 @@
Gpm_Stst *new = NULL;
char* sock_name = 0;
- consolename = NULL;
-
#if 0
gpm_report(GPM_PR_DEBUG,"VC: %d",flag);
#endif
@@ -260,6 +258,10 @@
gpm_report(GPM_PR_ERR,"checking tty name failed");
goto err;
}
+ if (consolename == NULL) {
+ gpm_report(GPM_PR_ERR,"consolename not set");
+ goto err;
+ }
/* do we really need this check ? */
if(strncmp(tty,consolename,strlen(consolename)-1)
|| !isdigit(tty[strlen(consolename)-1])) {

12
gpm-1.20.1-idie.patch
View File

@ -1,12 +0,0 @@
--- gpm-1.20.1/src/lib/liblow.c.orig 2004-05-06 14:14:03.000000000 -0400
+++ gpm-1.20.1/src/lib/liblow.c 2004-05-06 14:18:05.000000000 -0400
@@ -376,7 +376,9 @@
/*....................................... Error: free all memory */
err:
+#if 0
gpm_report(GPM_PR_ERR,"Oh, oh, it's an error! possibly I die! ");
+#endif
do {
new=gpm_stack->next;
free(gpm_stack);

16
gpm-1.20.1-input.patch
View File

@ -1,16 +0,0 @@
diff -ur gpm-1.20.1.orig/src/headers/config.h.in gpm-1.20.1/src/headers/config.h.in
--- gpm-1.20.1.orig/src/headers/config.h.in 2004-09-04 10:24:11.000000000 -0400
+++ gpm-1.20.1/src/headers/config.h.in 2004-09-04 10:26:02.000000000 -0400
@@ -46,6 +46,12 @@
/* Define if you have the <linux/input.h> header file. */
#undef HAVE_LINUX_INPUT_H
+/* Definedif you have the input_id structure */
+#undef HAVE_INPUT_ID
+
+/* Definedif you have the input_absinfo structure */
+#undef HAVE_INPUT_ABSINFO
+
/* Define if you have the <linux/joystick.h> header file. */
#undef HAVE_LINUX_JOYSTICK_H

11
gpm-1.20.1-math.patch
View File

@ -1,11 +0,0 @@
--- gpm-1.20.1/configure.in.math Tue Jun 24 10:52:44 2003
+++ gpm-1.20.1/configure.in Tue Jun 24 10:53:54 2003
@@ -128,7 +128,7 @@
AC_SUBST(lispdir)
CPPFLAGS='-I$(srcdir) $(DEFS) -include headers/config.h -Wall -DSYSCONFDIR="\"$(sysconfdir)\"" -DSBINDIR="\"$(sbindir)\""'
-LDFLAGS='-L$(srcdir)'
+LDFLAGS='-lm -L$(srcdir)'
dnl AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir")
dnl AC_DEFINE_UNQUOTED(SBINDIR,"$sbindir")

15
gpm-1.20.1-no-console-error.patch
View File

@ -1,15 +0,0 @@
--- gpm-1.20.1/src/console.c.no-console-error 2006-01-18 17:06:15.000000000 +0100
+++ gpm-1.20.1/src/console.c 2006-01-18 17:08:19.000000000 +0100
@@ -249,8 +249,10 @@
/* Failed, try OLD console */
else if (stat(GPM_OLD_CONSOLE, &buf) == 0)
console.device = GPM_OLD_CONSOLE;
- else
- gpm_report(GPM_PR_OOPS, "Can't determine console device");
+ else { // XXX handle this gracefully?
+ fprintf( stderr, "no console device found" );
+ exit( 1 );
+ }
return console.device;
}

12
gpm-1.20.1-nodebug.patch
View File

@ -1,12 +0,0 @@
--- gpm-1.20.1/src/lib/liblow.c.orig 2004-03-31 15:06:45.000000000 -0500
+++ gpm-1.20.1/src/lib/liblow.c 2004-03-31 15:09:32.000000000 -0500
@@ -202,7 +202,9 @@
consolename = NULL;
+#if 0
gpm_report(GPM_PR_DEBUG,"VC: %d",flag);
+#endif
/*....................................... First of all, check xterm */

26
gpm-1.20.1-openmax.patch
View File

@ -1,26 +0,0 @@
--- gpm-1.20.1/src/prog/gpm-root.y.openmax 2002-12-24 23:57:16.000000000 +0100
+++ gpm-1.20.1/src/prog/gpm-root.y 2007-07-24 20:45:46.000000000 +0200
@@ -525,7 +525,9 @@
open("/dev/null",O_RDONLY); /* stdin */
open(consolename,O_WRONLY); /* stdout */
dup(1); /* stderr */
- for (i=3;i<OPEN_MAX; i++) close(i);
+ int open_max = sysconf(_SC_OPEN_MAX);
+ if (open_max == -1) open_max = 1024;
+ for (i=3;i<open_max; i++) close(i);
execl("/bin/sh","sh","-c",self->arg,(char *)NULL);
exit(1); /* shouldn't happen */
default: return 0;
--- gpm-1.20.1/src/special.c.openmax 2007-07-24 20:45:46.000000000 +0200
+++ gpm-1.20.1/src/special.c 2007-07-24 20:45:46.000000000 +0200
@@ -156,7 +156,9 @@
open(GPM_NULL_DEV,O_RDONLY); /* stdin */
open(console.device, O_WRONLY); /* stdout */
dup(1); /* stderr */
- for (i=3;i<OPEN_MAX; i++) close(i);
+ int open_max = sysconf(_SC_OPEN_MAX);
+ if (open_max == -1) open_max = 1024;
+ for (i=3;i<open_max; i++) close(i);
execl("/bin/sh","sh","-c",command,(char *)NULL);
exit(1); /* shouldn't happen */

11
gpm-1.20.1-subscript.patch
View File

@ -1,11 +0,0 @@
--- gpm-1.20.1/src/mice.c.lr 2004-02-15 09:19:48.000000000 +0100
+++ gpm-1.20.1/src/mice.c 2004-02-15 09:22:18.000000000 +0100
@@ -2112,7 +2112,7 @@
for (i=0; i<4; i++)
if (gunze_calib[i] & ~1023) calibok = 0;
if (gunze_calib[0] == gunze_calib[2]) calibok = 0;
- if (gunze_calib[1] == gunze_calib[4]) calibok = 0;
+ if (gunze_calib[1] == gunze_calib[3]) calibok = 0;
fclose(f);
}
if (!calibok) {

113
gpm-1.20.1-va_list.patch
View File

@ -1,113 +0,0 @@
--- gpm-1.20.1/src/report.c.va_list 2007-06-29 13:31:09.000000000 +0200
+++ gpm-1.20.1/src/report.c 2007-06-29 13:39:49.000000000 +0200
@@ -72,9 +72,16 @@
void gpm_report(int line, char *file, int stat, char *text, ... )
{
FILE *f = NULL;
- va_list ap;
+ va_list ap, ap3;
+#ifdef HAVE_VSYSLOG
+ va_list ap2;
+#endif
va_start(ap,text);
+ va_copy(ap3, ap);
+#ifdef HAVE_VSYSLOG
+ va_copy(ap2, ap);
+#endif
switch(option.run_status) {
/******************** STARTUP *****************/
@@ -83,7 +90,7 @@
case GPM_STAT_INFO:
#ifdef HAVE_VSYSLOG
syslog(LOG_INFO | LOG_USER, GPM_STRING_INFO);
- vsyslog(LOG_INFO | LOG_USER, text, ap);
+ vsyslog(LOG_INFO | LOG_USER, text, ap2);
#endif
fprintf(stderr,GPM_STRING_INFO);
vfprintf(stderr,text,ap);
@@ -93,7 +100,7 @@
case GPM_STAT_WARN:
#ifdef HAVE_VSYSLOG
syslog(LOG_DAEMON | LOG_WARNING, GPM_STRING_WARN);
- vsyslog(LOG_DAEMON | LOG_WARNING, text, ap);
+ vsyslog(LOG_DAEMON | LOG_WARNING, text, ap2);
#endif
fprintf(stderr,GPM_STRING_WARN);
vfprintf(stderr,text,ap);
@@ -103,7 +110,7 @@
case GPM_STAT_ERR:
#ifdef HAVE_VSYSLOG
syslog(LOG_DAEMON | LOG_ERR, GPM_STRING_ERR);
- vsyslog(LOG_DAEMON | LOG_ERR, text, ap);
+ vsyslog(LOG_DAEMON | LOG_ERR, text, ap2);
#endif
fprintf(stderr,GPM_STRING_ERR);
vfprintf(stderr,text,ap);
@@ -113,7 +120,7 @@
case GPM_STAT_OOPS:
#ifdef HAVE_VSYSLOG
syslog(LOG_DAEMON | LOG_ERR, GPM_STRING_OOPS);
- vsyslog(LOG_DAEMON | LOG_ERR, text, ap);
+ vsyslog(LOG_DAEMON | LOG_ERR, text, ap2);
#endif
fprintf(stderr,GPM_STRING_OOPS);
vfprintf(stderr,text,ap);
@@ -130,14 +137,14 @@
case GPM_STAT_INFO:
#ifdef HAVE_VSYSLOG
syslog(LOG_INFO | LOG_USER, GPM_STRING_INFO);
- vsyslog(LOG_INFO | LOG_USER, text, ap);
+ vsyslog(LOG_INFO | LOG_USER, text, ap2);
#endif
break;
case GPM_STAT_WARN:
#ifdef HAVE_VSYSLOG
syslog(LOG_DAEMON | LOG_WARNING, GPM_STRING_WARN);
- vsyslog(LOG_DAEMON | LOG_WARNING, text, ap);
+ vsyslog(LOG_DAEMON | LOG_WARNING, text, ap2);
#endif
if ((f = fopen(GPM_SYS_CONSOLE, "a")) != NULL) {
fprintf(f, GPM_STRING_WARN);
@@ -150,7 +157,7 @@
case GPM_STAT_ERR:
#ifdef HAVE_VSYSLOG
syslog(LOG_DAEMON | LOG_ERR, GPM_STRING_ERR);
- vsyslog(LOG_DAEMON | LOG_ERR, text, ap);
+ vsyslog(LOG_DAEMON | LOG_ERR, text, ap2);
#endif
if ((f = fopen(GPM_SYS_CONSOLE, "a")) != NULL) {
fprintf(f, GPM_STRING_ERR);
@@ -161,7 +168,7 @@
if ((f = fopen(console.device, "a")) != NULL) {
fprintf(f, GPM_STRING_ERR);
- vfprintf(f, text, ap);
+ vfprintf(f, text, ap3);
fprintf(f, "\n");
fclose(f);
}
@@ -170,7 +177,7 @@
case GPM_STAT_OOPS:
#ifdef HAVE_VSYSLOG
syslog(LOG_DAEMON | LOG_ERR, GPM_STRING_OOPS);
- vsyslog(LOG_DAEMON | LOG_ERR, text, ap);
+ vsyslog(LOG_DAEMON | LOG_ERR, text, ap2);
#endif
fprintf(stderr,GPM_STRING_OOPS);
vfprintf(stderr,text,ap);
@@ -208,6 +215,12 @@
break;
} /* switch for current modus */
+
+ va_end(ap);
+ va_end(ap3);
+#ifdef HAVE_VSYSLOG
+ va_end(ap2);
+#endif
} /* gpm_report */

7023
gpm-evdev-cumulative.patch
View File

File diff suppressed because it is too large Load Diff