wok-next view gpm/stuff/patches/gpm-1.20.7.patch @ rev 21020
Cleaning is almost finished... I should proceed to upgrades.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri Nov 02 14:15:08 2018 +0200 (2018-11-02) |
| parents | |
| children |
line source
1 # from https://bugzilla.redhat.com/show_bug.cgi?id=1500092
2 # from https://src.fedoraproject.org/rpms/gpm/pull-request/1
3 --- a/src/prog/gpm-root.y
4 +++ b/src/prog/gpm-root.y
5 @@ -1196,11 +1196,7 @@
6 LOG_DAEMON : LOG_USER);
7 /* reap your zombies */
8 childaction.sa_handler=reap_children;
9 -#if defined(__GLIBC__)
10 - __sigemptyset(&childaction.sa_mask);
11 -#else /* __GLIBC__ */
12 - childaction.sa_mask=0;
13 -#endif /* __GLIBC__ */
14 + sigemptyset(&childaction.sa_mask);
15 childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
16 sigaction(SIGCHLD,&childaction,NULL);
18 --- a/src/daemon/open_console.c
19 +++ b/src/daemon/open_console.c
20 @@ -23,6 +23,10 @@
21 #include <sys/stat.h> /* stat() */
22 #include <sys/ioctl.h> /* ioctl */
24 +#ifdef HAVE_SYS_SYSMACROS_H
25 +#include <sys/sysmacros.h> /* major() w/newer glibc */
26 +#endif
27 +
28 /* Linux specific (to be outsourced in gpm2 */
29 #include <linux/serial.h> /* for serial console check */
30 #include <asm/ioctls.h> /* for serial console check */