wok-current diff 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
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/gpm/stuff/gpm.gcc7.diff	Thu Apr 04 08:53:51 2024 +0000
     1.3 @@ -0,0 +1,28 @@
     1.4 +--- ./src/prog/gpm-root.y.orig	2012-10-26 16:21:38.000000000 -0500
     1.5 ++++ ./src/prog/gpm-root.y	2018-02-03 14:52:27.229309044 -0600
     1.6 +@@ -1196,11 +1196,7 @@
     1.7 +                                                         LOG_DAEMON : LOG_USER);
     1.8 +    /* reap your zombies */
     1.9 +    childaction.sa_handler=reap_children;
    1.10 +-#if defined(__GLIBC__)
    1.11 +-   __sigemptyset(&childaction.sa_mask);
    1.12 +-#else /* __GLIBC__ */
    1.13 +-   childaction.sa_mask=0;
    1.14 +-#endif /* __GLIBC__ */
    1.15 ++   sigemptyset(&childaction.sa_mask);
    1.16 +    childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
    1.17 +    sigaction(SIGCHLD,&childaction,NULL);
    1.18 + 
    1.19 +--- ./src/daemon/open_console.c.orig	2018-02-03 14:49:24.586310986 -0600
    1.20 ++++ ./src/daemon/open_console.c	2018-02-03 14:53:03.347308660 -0600
    1.21 +@@ -24,6 +24,10 @@
    1.22 + #include <sys/ioctl.h>              /* ioctl             */
    1.23 + #include <sys/types.h>
    1.24 + 
    1.25 ++#ifdef HAVE_SYS_SYSMACROS_H
    1.26 ++#include <sys/sysmacros.h>          /* major() w/newer glibc */
    1.27 ++#endif
    1.28 ++
    1.29 + /* Linux specific (to be outsourced in gpm2 */
    1.30 + #include <linux/serial.h>           /* for serial console check */
    1.31 + #include <asm/ioctls.h>            /* for serial console check */