wok-current annotate gpm/stuff/gpm.gcc7.diff @ rev 25695
Up linux 5.10.214, Patch xorg-server (CVE-2024-31080, CVE-2024-31081, CVE-2024-31082, CVE-2024-31083)
| author | Stanislas Leduc <shann@slitaz.org> |
|---|---|
| date | Thu Apr 04 08:53:51 2024 +0000 (2 months ago) |
| parents | |
| children |
| rev | line source |
|---|---|
| shann@25634 | 1 --- ./src/prog/gpm-root.y.orig 2012-10-26 16:21:38.000000000 -0500 |
| shann@25634 | 2 +++ ./src/prog/gpm-root.y 2018-02-03 14:52:27.229309044 -0600 |
| shann@25634 | 3 @@ -1196,11 +1196,7 @@ |
| shann@25634 | 4 LOG_DAEMON : LOG_USER); |
| shann@25634 | 5 /* reap your zombies */ |
| shann@25634 | 6 childaction.sa_handler=reap_children; |
| shann@25634 | 7 -#if defined(__GLIBC__) |
| shann@25634 | 8 - __sigemptyset(&childaction.sa_mask); |
| shann@25634 | 9 -#else /* __GLIBC__ */ |
| shann@25634 | 10 - childaction.sa_mask=0; |
| shann@25634 | 11 -#endif /* __GLIBC__ */ |
| shann@25634 | 12 + sigemptyset(&childaction.sa_mask); |
| shann@25634 | 13 childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */ |
| shann@25634 | 14 sigaction(SIGCHLD,&childaction,NULL); |
| shann@25634 | 15 |
| shann@25634 | 16 --- ./src/daemon/open_console.c.orig 2018-02-03 14:49:24.586310986 -0600 |
| shann@25634 | 17 +++ ./src/daemon/open_console.c 2018-02-03 14:53:03.347308660 -0600 |
| shann@25634 | 18 @@ -24,6 +24,10 @@ |
| shann@25634 | 19 #include <sys/ioctl.h> /* ioctl */ |
| shann@25634 | 20 #include <sys/types.h> |
| shann@25634 | 21 |
| shann@25634 | 22 +#ifdef HAVE_SYS_SYSMACROS_H |
| shann@25634 | 23 +#include <sys/sysmacros.h> /* major() w/newer glibc */ |
| shann@25634 | 24 +#endif |
| shann@25634 | 25 + |
| shann@25634 | 26 /* Linux specific (to be outsourced in gpm2 */ |
| shann@25634 | 27 #include <linux/serial.h> /* for serial console check */ |
| shann@25634 | 28 #include <asm/ioctls.h> /* for serial console check */ |