SOURCES: gpm-OPEN_MAX.patch - fixed build with new llh (2.6.23.1-1)

tommat tommat at pld-linux.org
Sat Nov 24 15:38:20 CET 2007


Author: tommat                       Date: Sat Nov 24 14:38:20 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed build with new llh (2.6.23.1-1)

---- Files affected:
SOURCES:
   gpm-OPEN_MAX.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/gpm-OPEN_MAX.patch
diff -u SOURCES/gpm-OPEN_MAX.patch:1.2 SOURCES/gpm-OPEN_MAX.patch:1.3
--- SOURCES/gpm-OPEN_MAX.patch:1.2	Mon Sep 24 22:12:30 2001
+++ SOURCES/gpm-OPEN_MAX.patch	Sat Nov 24 15:38:15 2007
@@ -8,3 +8,45 @@
  #include <sys/param.h>
  
  #include "gpmInt.h"
+diff -Nur 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-11-24 15:24:56.000000000 +0100
++++ gpm-1.20.1/src/prog/gpm-root.y	2007-11-24 15:27:14.000000000 +0100
+@@ -44,7 +44,7 @@
+ #include <sys/stat.h>       /* fstat() */
+ #include <sys/utsname.h>    /* uname() */
+ #include <termios.h>        /* winsize */
+-#include <linux/limits.h>   /* OPEN_MAX */
++#include <linux/limits.h>   /* NR_OPEN */
+ #include <linux/vt.h>       /* VT_ACTIVATE */
+ #include <linux/keyboard.h> /* K_SHIFT */
+ #include <utmp.h>         
+@@ -526,7 +526,7 @@
+ 	            open("/dev/null",O_RDONLY); /* stdin  */
+ 	            open(consolename,O_WRONLY); /* stdout */
+ 	            dup(1);                     /* stderr */  
+-	            for (i=3;i<OPEN_MAX; i++) close(i);
++	            for (i=3;i<NR_OPEN; i++) close(i);
+ 	            execl("/bin/sh","sh","-c",self->arg,(char *)NULL);
+ 	            exit(1); /* shouldn't happen */
+ 	         default: return 0;
+diff -Nur gpm-1.20.1-orig/src/special.c gpm-1.20.1/src/special.c
+--- gpm-1.20.1-orig/src/special.c	2007-11-24 15:24:56.000000000 +0100
++++ gpm-1.20.1/src/special.c	2007-11-24 15:27:05.000000000 +0100
+@@ -25,7 +25,7 @@
+ 
+ /* This file is compiled conditionally, see the Makefile */
+ 
+-#include <linux/limits.h> /* for OPEN_MAX */
++#include <linux/limits.h> /* for NR_OPEN */
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -156,7 +156,7 @@
+       open(GPM_NULL_DEV,O_RDONLY); /* stdin  */
+       open(option.consolename,O_WRONLY); /* stdout */
+       dup(1);                     /* stderr */
+-      for (i=3;i<OPEN_MAX; i++) close(i);
++      for (i=3;i<NR_OPEN; i++) close(i);
+       execl("/bin/sh","sh","-c",command,(char *)NULL);
+       exit(1); /* shouldn't happen */
+       
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/gpm-OPEN_MAX.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list