1 Submitted by: Pierre Labastie <pierre dot labastie at neuf dot fr>
2 Date: 2017-08-17
3 Initial Package Version: 1.20.7
4 Origin: Nutyx
5 Upstream Status: There are PRs, but nothing committed yet
6 Description: Fix build failures introduced by glibc-2.26
7
8 diff -Naur gpm-1.20.7-orig/src/daemon/open_console.c gpm-1.20.7/src/daemon/open_console.c
9 --- gpm-1.20.7-orig/src/daemon/open_console.c 2012-10-26 21:21:38.000000000 +0000
10 +++ gpm-1.20.7/src/daemon/open_console.c 2017-08-08 17:58:15.176232558 +0000
11 @@ -23,6 +23,10 @@
12 #include <sys/stat.h> /* stat() */
13 #include <sys/ioctl.h> /* ioctl */
14
15 +#ifdef HAVE_SYS_SYSMACROS_H
16 +#include <sys/sysmacros.h> /* major() w/newer glibc */
17 +#endif
18 +
19 /* Linux specific (to be outsourced in gpm2 */
20 #include <linux/serial.h> /* for serial console check */
21 #include <asm/ioctls.h> /* for serial console check */
22 diff -Naur gpm-1.20.7-orig/src/prog/gpm-root.y gpm-1.20.7/src/prog/gpm-root.y
23 --- gpm-1.20.7-orig/src/prog/gpm-root.y 2012-10-26 21:21:38.000000000 +0000
24 +++ gpm-1.20.7/src/prog/gpm-root.y 2017-08-08 18:00:36.442898559 +0000
25 @@ -443,6 +443,7 @@
26 }
27
28 /*---------------------------------------------------------------------*/
29 +#if 0
30 static int f_debug_one(FILE *f, Draw *draw)
31 {
32 DrawItem *ip;
33 @@ -465,6 +466,7 @@
34 #undef LINE
35 return 0;
36 }
37 +#endif
38
39 int f_debug(int mode, DrawItem *self, int uid)
40 {
41 @@ -960,10 +962,8 @@
42 /*------------*/
43 static inline void scr_restore(int fd, FILE *f, unsigned char *buffer, int vc)
44 {
45 - int x,y, dumpfd;
46 + int dumpfd;
47 char dumpname[20];
48 -
49 - x=buffer[2]; y=buffer[3];
50
51 /* WILL NOT WORK WITH DEVFS! FIXME! */
52 sprintf(dumpname,"/dev/vcsa%i",vc);
53 @@ -1196,11 +1196,7 @@
54 LOG_DAEMON : LOG_USER);
55 /* reap your zombies */
56 childaction.sa_handler=reap_children;
57 -#if defined(__GLIBC__)
58 - __sigemptyset(&childaction.sa_mask);
59 -#else /* __GLIBC__ */
60 - childaction.sa_mask=0;
61 -#endif /* __GLIBC__ */
62 + sigemptyset(&childaction.sa_mask);
63 childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
64 sigaction(SIGCHLD,&childaction,NULL);
65
|
