/[pkgs]/devel/xorg-x11-server/xserver-1.3.0-xkb-and-loathing.patch
ViewVC logotype

Contents of /devel/xorg-x11-server/xserver-1.3.0-xkb-and-loathing.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.2 - (show annotations) (download) (as text)
Fri Nov 2 17:11:11 2007 UTC (2 years ago) by ajax
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
File MIME type: text/x-patch
FILE REMOVED 
* Fri Nov 02 2007 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.6
- Merge a bunch of the more trivial patches upstream.
- New git snapshot containing the merged bits.
- Remove unused patches.
- Drop the XFree86 obsoletes.
1 --- xorg-server-1.3.0.0/os/utils.c.jx 2007-04-25 13:28:05.000000000 -0400
2 +++ xorg-server-1.3.0.0/os/utils.c 2007-04-30 14:33:04.000000000 -0400
3 @@ -1725,6 +1725,8 @@
4 int pid;
5 } *pidlist;
6
7 +static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */
8 +
9 pointer
10 Popen(char *command, char *type)
11 {
12 @@ -1746,11 +1748,15 @@
13 return NULL;
14 }
15
16 + /* Ignore the smart scheduler while this is going on */
17 + old_alarm = signal(SIGALRM, SIG_IGN);
18 +
19 switch (pid = fork()) {
20 case -1: /* error */
21 close(pdes[0]);
22 close(pdes[1]);
23 xfree(cur);
24 + signal(SIGALRM, old_alarm);
25 return NULL;
26 case 0: /* child */
27 if (setgid(getgid()) == -1)
28 @@ -1926,6 +1932,8 @@
29 /* allow EINTR again */
30 OsReleaseSignals ();
31
32 + signal(SIGALRM, old_alarm);
33 +
34 return pid == -1 ? -1 : pstat;
35 }
36
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2