From owner-svn-ports-all@freebsd.org Sat Sep 14 16:29:23 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DDCC5F9021; Sat, 14 Sep 2019 16:29:23 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46VydH5Jt2z49c5; Sat, 14 Sep 2019 16:29:23 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9A5D3225D6; Sat, 14 Sep 2019 16:29:23 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8EGTNGD042623; Sat, 14 Sep 2019 16:29:23 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8EGTN6U042621; Sat, 14 Sep 2019 16:29:23 GMT (envelope-from romain@FreeBSD.org) Message-Id: <201909141629.x8EGTN6U042621@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: romain set sender to romain@FreeBSD.org using -f From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= Date: Sat, 14 Sep 2019 16:29:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512035 - in head/devel/leatherman: . files X-SVN-Group: ports-head X-SVN-Commit-Author: romain X-SVN-Commit-Paths: in head/devel/leatherman: . files X-SVN-Commit-Revision: 512035 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2019 16:29:23 -0000 Author: romain Date: Sat Sep 14 16:29:22 2019 New Revision: 512035 URL: https://svnweb.freebsd.org/changeset/ports/512035 Log: Fix execution interupted by signal detection With the default version of Ruby changing to 2.6, sysutils/facter fails to gather some facts due to leatherman not handling signals properly. With hat: puppet PR: 240566 Submitted by: allanjude Reported by: albert.shih@obspm.fr Added: head/devel/leatherman/files/patch-execution_src_posix_execution.cc (contents, props changed) Modified: head/devel/leatherman/Makefile Modified: head/devel/leatherman/Makefile ============================================================================== --- head/devel/leatherman/Makefile Sat Sep 14 16:20:52 2019 (r512034) +++ head/devel/leatherman/Makefile Sat Sep 14 16:29:22 2019 (r512035) @@ -2,6 +2,7 @@ PORTNAME= leatherman PORTVERSION= 1.7.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= puppet@FreeBSD.org Added: head/devel/leatherman/files/patch-execution_src_posix_execution.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/leatherman/files/patch-execution_src_posix_execution.cc Sat Sep 14 16:29:22 2019 (r512035) @@ -0,0 +1,20 @@ +--- execution/src/posix/execution.cc.orig 2019-08-10 21:37:06 UTC ++++ execution/src/posix/execution.cc +@@ -487,9 +487,14 @@ namespace leatherman { namespace execution { + kill(-child, SIGKILL); + } + // Wait for the child to exit +- if (waitpid(child, &status, 0) == -1) { +- LOG_DEBUG(format_error(_("waitpid failed"))); +- return; ++ while (waitpid(child, &status, 0) == -1) { ++ if ( errno == EINTR ) { ++ LOG_DEBUG(format_error(_("waitpid was interrupted by a signal, retrying"))); ++ continue; ++ } else { ++ LOG_DEBUG(format_error(_("waitpid failed"))); ++ return; ++ } + } + if (WIFEXITED(status)) { + status = static_cast(WEXITSTATUS(status));