Tags: pending
On Fri, Feb 12, 2016 at 02:07:14AM +0100, Szabolcs Nagy wrote:
> fixed.
Thank you. Given the lack of maintainer input, I've uploaded your
changes to DELAYED/10 and am attaching the relevant nmudiff.
Helmut
diff --minimal -Nru gpm-1.20.7/debian/changelog gpm-1.20.7/debian/changelog
--- gpm-1.20.7/debian/changelog 2021-01-24 19:34:33.000000000 +0100
+++ gpm-1.20.7/debian/changelog 2021-09-06 09:23:55.000000000 +0200
@@ -1,3 +1,17 @@
+gpm (1.20.7-8.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Szabolcs Nagy ]
+ * Fix build on musl-linux-any: (Closes: #813751)
+ + Use SA_NODEFER instead of its non-standard alias SA_NOMASK.
+ + Add missing sys/select.h and fcntl.h includes.
+ + Use standard sigemptyset unconditionally.
+ + Define SA_INTERRUPT if it's not defined (historical no-op).
+ + With these changes gpm builds against musl libc.
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 06 Sep 2021 09:23:55 +0200
+
gpm (1.20.7-8) unstable; urgency=high
* Fix enabling of gpm under systemd by adding #DEBHELPER# marker to
diff --minimal -Nru gpm-1.20.7/debian/patches/musl.patch
gpm-1.20.7/debian/patches/musl.patch
--- gpm-1.20.7/debian/patches/musl.patch 1970-01-01 01:00:00.000000000
+0100
+++ gpm-1.20.7/debian/patches/musl.patch 2021-09-06 09:23:55.000000000
+0200
@@ -0,0 +1,60 @@
+--- a/src/lib/liblow.c
++++ b/src/lib/liblow.c
+@@ -179,7 +179,7 @@
+ /* Reincarnation. Prepare for another death early. */
+ sigemptyset(&sa.sa_mask);
+ sa.sa_handler = gpm_suspend_hook;
+- sa.sa_flags = SA_NOMASK;
++ sa.sa_flags = SA_NODEFER;
+ sigaction (SIGTSTP, &sa, 0);
+
+ /* Pop the gpm stack by closing the useless connection */
+@@ -386,7 +386,7 @@
+
+ /* if signal was originally ignored, job control is not supported */
+ if (gpm_saved_suspend_hook.sa_handler != SIG_IGN) {
+- sa.sa_flags = SA_NOMASK;
++ sa.sa_flags = SA_NODEFER;
+ sa.sa_handler = gpm_suspend_hook;
+ sigaction(SIGTSTP, &sa, 0);
+ }
+--- a/src/prog/display-buttons.c
++++ b/src/prog/display-buttons.c
+@@ -36,6 +36,7 @@
+ #include <stdio.h> /* printf() */
+ #include <time.h> /* time() */
+ #include <errno.h> /* errno */
++#include <sys/select.h> /* fd_set, FD_ZERO */
+ #include <gpm.h> /* gpm information */
+
+ /* display resulting data */
+--- a/src/prog/display-coords.c
++++ b/src/prog/display-coords.c
+@@ -37,6 +37,7 @@
+ #include <stdio.h> /* printf() */
+ #include <time.h> /* time() */
+ #include <errno.h> /* errno */
++#include <sys/select.h> /* fd_set, FD_ZERO */
+ #include <gpm.h> /* gpm information */
+
+ /* display resulting data */
+--- a/src/prog/gpm-root.y
++++ b/src/prog/gpm-root.y
+@@ -1197,6 +1197,9 @@
+ /* reap your zombies */
+ childaction.sa_handler=reap_children;
+ sigemptyset(&childaction.sa_mask);
++#ifndef SA_INTERRUPT
++#define SA_INTERRUPT 0
++#endif
+ childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
+ sigaction(SIGCHLD,&childaction,NULL);
+
+--- a/contrib/control/gpm_has_mouse_control.c
++++ a/contrib/control/gpm_has_mouse_control.c
+@@ -1,4 +1,4 @@
+-#include <sys/fcntl.h>
++#include <fcntl.h>
+ #include <sys/kd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --minimal -Nru gpm-1.20.7/debian/patches/series
gpm-1.20.7/debian/patches/series
--- gpm-1.20.7/debian/patches/series 2020-03-07 03:05:27.000000000 +0100
+++ gpm-1.20.7/debian/patches/series 2021-09-06 09:23:55.000000000 +0200
@@ -18,3 +18,4 @@
093_fix-typos.patch
94_gpm-1.20.7-glibc-2.26-1.patch
95_fix-compilation-with-gcc-10.patch
+musl.patch
