wok-next diff 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 diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/gpm/stuff/patches/gpm-1.20.7.patch	Fri Nov 02 14:15:08 2018 +0200
     1.3 @@ -0,0 +1,30 @@
     1.4 +# from https://bugzilla.redhat.com/show_bug.cgi?id=1500092
     1.5 +# from https://src.fedoraproject.org/rpms/gpm/pull-request/1
     1.6 +--- a/src/prog/gpm-root.y
     1.7 ++++ b/src/prog/gpm-root.y
     1.8 +@@ -1196,11 +1196,7 @@
     1.9 +                                                         LOG_DAEMON : LOG_USER);
    1.10 +    /* reap your zombies */
    1.11 +    childaction.sa_handler=reap_children;
    1.12 +-#if defined(__GLIBC__)
    1.13 +-   __sigemptyset(&childaction.sa_mask);
    1.14 +-#else /* __GLIBC__ */
    1.15 +-   childaction.sa_mask=0;
    1.16 +-#endif /* __GLIBC__ */
    1.17 ++   sigemptyset(&childaction.sa_mask);
    1.18 +    childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
    1.19 +    sigaction(SIGCHLD,&childaction,NULL);
    1.20 + 
    1.21 +--- a/src/daemon/open_console.c
    1.22 ++++ b/src/daemon/open_console.c
    1.23 +@@ -23,6 +23,10 @@
    1.24 + #include <sys/stat.h>               /* stat()            */
    1.25 + #include <sys/ioctl.h>              /* ioctl             */
    1.26 + 
    1.27 ++#ifdef HAVE_SYS_SYSMACROS_H
    1.28 ++#include <sys/sysmacros.h>          /* major() w/newer glibc */
    1.29 ++#endif
    1.30 ++
    1.31 + /* Linux specific (to be outsourced in gpm2 */
    1.32 + #include <linux/serial.h>           /* for serial console check */
    1.33 + #include <asm/ioctls.h>            /* for serial console check */