Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 utils/entr/DETAILS     |    1 +
 utils/entr/HISTORY     |    4 ++++
 utils/entr/PRE_BUILD   |    4 ++++
 utils/entr/child.patch |   23 +++++++++++++++++++++++
 4 files changed, 32 insertions(+)

New commits:
commit 5f5ee44cb2d65ecfce17fc7a43eab91a4ce5126c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    entr: add official patch to fix handling child procs

diff --git a/utils/entr/DETAILS b/utils/entr/DETAILS
index 350f677..4f1c1c8 100755
--- a/utils/entr/DETAILS
+++ b/utils/entr/DETAILS
@@ -1,5 +1,6 @@
            SPELL=entr
          VERSION=4.5
+      PATCHLEVEL=1
           SOURCE=${SPELL}-${VERSION}.tar.gz
    SOURCE_URL[0]=https://eradman.com/entrproject/code/${SOURCE}
      
SOURCE_HASH=sha512:db9499d78385df5056a30a4e3262fb436090acc5410ddfc529a7cfe4e10e304e13787abfc31dd38dbf8b9f01fa3369ef32d20c9fb903fa35763f41791bdda9c7
diff --git a/utils/entr/HISTORY b/utils/entr/HISTORY
index b0ec58d..48a984c 100644
--- a/utils/entr/HISTORY
+++ b/utils/entr/HISTORY
@@ -1,3 +1,7 @@
+2020-06-15 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL=1
+       * child.patch: added, official patch to fix handling child procs
+
 2020-06-14 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 4.5
 
diff --git a/utils/entr/PRE_BUILD b/utils/entr/PRE_BUILD
new file mode 100755
index 0000000..e78a651
--- /dev/null
+++ b/utils/entr/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+patch -p1 < "${SPELL_DIRECTORY}/child.patch"
diff --git a/utils/entr/child.patch b/utils/entr/child.patch
new file mode 100644
index 0000000..25cc6d2
--- /dev/null
+++ b/utils/entr/child.patch
@@ -0,0 +1,23 @@
+From 76a56e3f8ee79c7a70acd96a3530d02ca9cf1f7a Mon Sep 17 00:00:00 2001
+From: Leonardo Taccari <iamleot AT gmail.com>
+Date: Mon, 15 Jun 2020 19:06:39 +0200
+Subject: [PATCH] Always wait childs to avoid zombies
+
+---
+ entr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/entr.c b/entr.c
+index 1532a9c..db414ab 100644
+--- a/entr.c
++++ b/entr.c
+@@ -254,8 +254,8 @@ void
+ proc_exit(int sig) {
+       int status;
+ 
++      xwaitpid(child_pid, &status, 0);
+       if ((oneshot_opt == 1) && (terminating == 0)) {
+-              xwaitpid(child_pid, &status, 0);
+               if ((shell_opt == 1) && (restart_opt == 0)) {
+                       fprintf(stdout, "%s returned exit code %d\n",
+                           basename(getenv("SHELL")), WEXITSTATUS(status));