FreeBSD Bugzilla – Attachment 207481 Details for
Bug 240566
devel/leatherman: Breaks sysutils/facter with the default lang/ruby changing to 2.6
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to fix leatherman
leatherman_waitpid_fix.patch (text/plain), 1.96 KB, created by
Allan Jude
on 2019-09-14 03:21:06 UTC
(
hide
)
Description:
Patch to fix leatherman
Filename:
MIME Type:
Creator:
Allan Jude
Created:
2019-09-14 03:21:06 UTC
Size:
1.96 KB
patch
obsolete
>Index: devel/leatherman/Makefile >=================================================================== >--- devel/leatherman/Makefile (revision 511996) >+++ devel/leatherman/Makefile (working copy) >@@ -2,6 +2,7 @@ > > PORTNAME= leatherman > PORTVERSION= 1.7.1 >+PORTREVISION= 1 > CATEGORIES= devel > > MAINTAINER= puppet@FreeBSD.org >Index: devel/leatherman/files/patch-execution_src_posix_execution.cc >=================================================================== >--- devel/leatherman/files/patch-execution_src_posix_execution.cc (nonexistent) >+++ devel/leatherman/files/patch-execution_src_posix_execution.cc (working copy) >@@ -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<char>(WEXITSTATUS(status)); > >Property changes on: devel/leatherman/files/patch-execution_src_posix_execution.cc >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:keywords >## -0,0 +1 ## >+FreeBSD=%H >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
romain
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 240566
: 207481