Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 smgl/simpleinit-msb/HISTORY          |    3 +++
 smgl/simpleinit-msb/PRE_BUILD        |    1 +
 smgl/simpleinit-msb/sigsetmask.patch |   31 +++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)

New commits:
commit 0a7791d340de6b0a97bdab31016b9f70b938edc7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    simpleinit-msb: Fix build against musl

diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY
index 48c74be..9a0b74c 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,3 +1,6 @@
+2019-06-12 Ismael Luceno <ismael AT sourcemage.org>
+       * PRE_BUILD, sigsetmask.patch: Fixed build against musl
+
 2019-01-20  Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: delete gnupg
 
diff --git a/smgl/simpleinit-msb/PRE_BUILD b/smgl/simpleinit-msb/PRE_BUILD
index 0644d79..770164c 100755
--- a/smgl/simpleinit-msb/PRE_BUILD
+++ b/smgl/simpleinit-msb/PRE_BUILD
@@ -12,6 +12,7 @@ message "${MESSAGE_COLOR}Apply linux 2.6.38+ headers 
patch...${DEFAULT_COLOR}" &
 patch -p1 < "$SPELL_DIRECTORY/simpleinit-ftbfs-define-enoictlcmd.patch" &&
 message "${MESSAGE_COLOR}Applying glibc 2.28 patch...${DEFAULT_COLOR}" &&
 patch -p1 < "$SPELL_DIRECTORY"/glibc-2.28.patch &&
+patch -fp1 -i "$SPELL_DIRECTORY"/sigsetmask.patch &&
 
 sedit '/^LDFLAGS[\t ]*=/d;/^CFLAGS[\t ]*=/s/=.*/+= -D_GNU_SOURCE/' \
   sysvtools/Makefile &&
diff --git a/smgl/simpleinit-msb/sigsetmask.patch 
b/smgl/simpleinit-msb/sigsetmask.patch
new file mode 100644
index 0000000..e0dcba4
--- /dev/null
+++ b/smgl/simpleinit-msb/sigsetmask.patch
@@ -0,0 +1,31 @@
+From 63710dafab6b84204ab7a8c7001bcbe3c22b033f Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Tue, 11 Jun 2019 22:37:06 +0200
+Subject: [PATCH] shutdown: Replace sigsetmask with sigprocmask
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ login-utils/shutdown.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/login-utils/shutdown.c b/login-utils/shutdown.c
+index 5b68a618d76a..202e12e1f08e 100644
+--- a/login-utils/shutdown.c
++++ b/login-utils/shutdown.c
+@@ -195,7 +195,13 @@ main(int argc, char *argv[])
+           for (fd = 0; fd < 3; fd++) close (fd);
+           while (1) wait (NULL);  /*  Grim reaper never stops  */
+       }
+-      sigsetmask (0); /*  simpleinit(8) blocks all signals: undo for ALRM  
*/
++      /*  simpleinit(8) blocks all signals: undo for ALRM  */
++      {
++              sigset_t n;
++              sigemptyset(&n);
++              sigaddset(&n, SIGALRM);
++              sigprocmask(SIG_UNBLOCK, &n, NULL);
++      }
+       for (i = 1; i < NSIG; i++) signal (i, SIG_DFL); /* unnecessary */
+         setlocale(LC_ALL, "");
+         bindtextdomain(PACKAGE, LOCALEDIR);
+--
+2.21.0