Mon Jun 15 16:55:07 2020 UTC ()
entr: Always wait for childs to avoid zombies

PKGREVISION++


(leot)
diff -r1.15 -r1.16 pkgsrc/sysutils/entr/Makefile
diff -r1.13 -r1.14 pkgsrc/sysutils/entr/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/entr/patches/patch-entr.c
cvs diff -r1.15 -r1.16 pkgsrc/sysutils/entr/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/entr/Makefile 2020/06/13 22:04:35 1.15
+++ pkgsrc/sysutils/entr/Makefile 2020/06/15 16:55:07 1.16
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.15 2020/06/13 22:04:35 leot Exp $ 1# $NetBSD: Makefile,v 1.16 2020/06/15 16:55:07 leot Exp $
2# 2#
3 3
4DISTNAME= entr-4.5 4DISTNAME= entr-4.5
 5PKGREVISION= 1
5CATEGORIES= sysutils 6CATEGORIES= sysutils
6MASTER_SITES= http://eradman.com/entrproject/code/ 7MASTER_SITES= http://eradman.com/entrproject/code/
7 8
8MAINTAINER= leot@NetBSD.org 9MAINTAINER= leot@NetBSD.org
9HOMEPAGE= http://eradman.com/entrproject/ 10HOMEPAGE= http://eradman.com/entrproject/
10COMMENT= Run arbitrary commands when files change 11COMMENT= Run arbitrary commands when files change
11LICENSE= isc AND 2-clause-bsd 12LICENSE= isc AND 2-clause-bsd
12 13
13MAKE_ENV+= MANPREFIX="${PREFIX}/${PKGMANDIR}" 14MAKE_ENV+= MANPREFIX="${PREFIX}/${PKGMANDIR}"
14 15
15.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
16 17
17# Needs kqueue(2) or inotify(7) 18# Needs kqueue(2) or inotify(7)
cvs diff -r1.13 -r1.14 pkgsrc/sysutils/entr/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/entr/distinfo 2020/06/13 22:04:35 1.13
+++ pkgsrc/sysutils/entr/distinfo 2020/06/15 16:55:07 1.14
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.13 2020/06/13 22:04:35 leot Exp $ 1$NetBSD: distinfo,v 1.14 2020/06/15 16:55:07 leot Exp $
2 2
3SHA1 (entr-4.5.tar.gz) = a706c15f7be76e94c7504242cf488280af4bb0e2 3SHA1 (entr-4.5.tar.gz) = a706c15f7be76e94c7504242cf488280af4bb0e2
4RMD160 (entr-4.5.tar.gz) = 6e2c0f4828e2dc306185fc173658ba6ec44af468 4RMD160 (entr-4.5.tar.gz) = 6e2c0f4828e2dc306185fc173658ba6ec44af468
5SHA512 (entr-4.5.tar.gz) = db9499d78385df5056a30a4e3262fb436090acc5410ddfc529a7cfe4e10e304e13787abfc31dd38dbf8b9f01fa3369ef32d20c9fb903fa35763f41791bdda9c7 5SHA512 (entr-4.5.tar.gz) = db9499d78385df5056a30a4e3262fb436090acc5410ddfc529a7cfe4e10e304e13787abfc31dd38dbf8b9f01fa3369ef32d20c9fb903fa35763f41791bdda9c7
6Size (entr-4.5.tar.gz) = 24674 bytes 6Size (entr-4.5.tar.gz) = 24674 bytes
 7SHA1 (patch-entr.c) = 129df6c40e9aec79abfdfc1707be5ff23068be58
File Added: pkgsrc/sysutils/entr/patches/Attic/patch-entr.c
$NetBSD: patch-entr.c,v 1.1 2020/06/15 16:55:07 leot Exp $

Always wait childs to avoid zombies.

--- entr.c.orig	2020-04-20 16:02:05.000000000 +0000
+++ 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));