diff options
| author | Eric Sandall | 2007-12-01 01:35:29 -0800 |
|---|---|---|
| committer | Eric Sandall | 2007-12-01 01:36:16 -0800 |
| commit | 474deb38278c0c272b1e5a93c0038a7ddb264336 (patch) | |
| tree | a15607d2be88a33a384d2e8dbf0099f3de00b409 | |
| parent | 35ad9d1889fe5b8d0c75db6bccad48c1f3ccbb23 (diff) | |
gpm: OPEN_MAX patches updated to apply cleanly against 1.20.1
| -rw-r--r-- | utils/gpm/HISTORY | 2 | ||||
| -rw-r--r-- | utils/gpm/gpm-OPEN_MAX-1.patch | 9 | ||||
| -rw-r--r-- | utils/gpm/gpm-OPEN_MAX-2.patch | 12 |
3 files changed, 12 insertions, 11 deletions
diff --git a/utils/gpm/HISTORY b/utils/gpm/HISTORY index 8ea024e7b0..402c445492 100644 --- a/utils/gpm/HISTORY +++ b/utils/gpm/HISTORY @@ -3,7 +3,9 @@ (Bug #14109) * BUILD: Fails to compile with multiple make jobs * gpm-OPEN_MAX-1.patch: Patch from P. Berens to fix Bug #14109 + Updated to apply cleanly against 1.20.1 * gpm-OPEN_MAX-2.patch: Patch from P. Berens to fix Bug #14109 + Updated to apply cleanly against 1.20.1 2006-07-09 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * CONFIGURE: make the dialogs optional #11598 and clean it up diff --git a/utils/gpm/gpm-OPEN_MAX-1.patch b/utils/gpm/gpm-OPEN_MAX-1.patch index ca5707c5d6..b3be5f0fd1 100644 --- a/utils/gpm/gpm-OPEN_MAX-1.patch +++ b/utils/gpm/gpm-OPEN_MAX-1.patch @@ -1,8 +1,7 @@ -diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y -index 3a97602..b496550 100644 ---- a/src/prog/gpm-root.y -+++ b/src/prog/gpm-root.y -@@ -526,7 +526,9 @@ int f_bgcmd(int mode, DrawItem *self, int uid) +diff -Naur gpm-1.20.1.orig/src/prog/gpm-root.y gpm-1.20.1/src/prog/gpm-root.y +--- gpm-1.20.1.orig/src/prog/gpm-root.y 2007-12-01 01:32:11.225537231 -0800 ++++ gpm-1.20.1/src/prog/gpm-root.y 2007-12-01 01:33:21.339840854 -0800 +@@ -525,7 +525,9 @@ open("/dev/null",O_RDONLY); /* stdin */ open(consolename,O_WRONLY); /* stdout */ dup(1); /* stderr */ diff --git a/utils/gpm/gpm-OPEN_MAX-2.patch b/utils/gpm/gpm-OPEN_MAX-2.patch index 5765e4d056..502d62447c 100644 --- a/utils/gpm/gpm-OPEN_MAX-2.patch +++ b/utils/gpm/gpm-OPEN_MAX-2.patch @@ -1,10 +1,9 @@ -t a/src/special.c b/src/special.c -index 5bed91a..c6cd04d 100644 ---- a/src/special.c -+++ b/src/special.c -@@ -156,7 +156,9 @@ int processSpecial(Gpm_Event *event) +diff -Naur gpm-1.20.1.orig/src/special.c gpm-1.20.1/src/special.c +--- gpm-1.20.1.orig/src/special.c 2007-12-01 01:32:11.225537231 -0800 ++++ gpm-1.20.1/src/special.c 2007-12-01 01:34:00.774824800 -0800 +@@ -155,7 +155,9 @@ open(GPM_NULL_DEV,O_RDONLY); /* stdin */ - open(console.device, O_WRONLY); /* stdout */ + open(option.consolename,O_WRONLY); /* stdout */ dup(1); /* stderr */ - for (i=3;i<OPEN_MAX; i++) close(i); + int open_max = sysconf(_SC_OPEN_MAX); @@ -12,3 +11,4 @@ index 5bed91a..c6cd04d 100644 + for (i=3;i<open_max; i++) close(i); execl("/bin/sh","sh","-c",command,(char *)NULL); exit(1); /* shouldn't happen */ + |