diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-12-24 10:48:15 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-12-24 12:04:12 +0100 |
| commit | a623ef98fbd8aba07ef277bec890ebb5b07c8b09 (patch) | |
| tree | a2045483763cf532105587a061657af8ae5969a0 | |
| parent | 76e081c9973e719bbe54b6b5be08325fd5852bc2 (diff) | |
main/monit: fix invalid use of vfork
fixes #11078
upstream:
https://bitbucket.org/tildeslash/monit/issues/867/invalid-use-of-vfork-in-command_execute
(cherry picked from commit e9c60b18f0f5196596221fe3172710bb76b4561e)
| -rw-r--r-- | main/monit/APKBUILD | 4 | ||||
| -rw-r--r-- | main/monit/fix-invalid-use-of-vfork.patch | 15 |
2 files changed, 18 insertions, 1 deletions
diff --git a/main/monit/APKBUILD b/main/monit/APKBUILD index cabc8399ee2..6d903e48a10 100644 --- a/main/monit/APKBUILD +++ b/main/monit/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=monit pkgver=5.26.0 -pkgrel=1 +pkgrel=2 pkgdesc="Managing and monitoring on a UNIX system" url="https://mmonit.com/monit/" arch="all" @@ -11,6 +11,7 @@ license="AGPL-3.0-or-later" makedepends="openssl-dev zlib-dev" subpackages="$pkgname-doc $pkgname-openrc" source="https://mmonit.com/monit/dist/monit-$pkgver.tar.gz + fix-invalid-use-of-vfork.patch $pkgname.initd " @@ -49,4 +50,5 @@ package() { } sha512sums="ae5bfc9f2e8cf2d2efa7a121f3bb865dc5b66b647e23e005349799f3f4384dfa1534ed88d0767ca41dac4cea2674fb82cfb51098129d350b470143df548c6900 monit-5.26.0.tar.gz +549fda6dc92c2630152a29f5bb94d29a59abb06300e55eb93ed729758d73ed7dceaa2e9f491c9d33419920aef24c0360f865753be28af13a11216129529611ae fix-invalid-use-of-vfork.patch cf2b417a73766ff568f1df904f1ccdee1289037994c8ba1743cf1d04cb1ea8945f66d6cb2c9bab868f600a7c7ae57436d1f49cccbe22745b41282034e169ef25 monit.initd" diff --git a/main/monit/fix-invalid-use-of-vfork.patch b/main/monit/fix-invalid-use-of-vfork.patch new file mode 100644 index 00000000000..b5c26a202eb --- /dev/null +++ b/main/monit/fix-invalid-use-of-vfork.patch @@ -0,0 +1,15 @@ +Upstream report: https://bitbucket.org/tildeslash/monit/issues/867/invalid-use-of-vfork-in-command_execute + +diff --git a/libmonit/src/system/Command.c b/libmonit/src/system/Command.c +index a17fde4..2c75fe4 100644 +--- a/libmonit/src/system/Command.c ++++ b/libmonit/src/system/Command.c +@@ -497,7 +497,7 @@ Process_T Command_execute(T C) { + Process_T P = _Process_new(); + int descriptors = System_getDescriptorsGuarded(); + _createPipes(P); +- if ((P->pid = vfork()) < 0) { ++ if ((P->pid = fork()) < 0) { + ERROR("Command: fork failed -- %s\n", System_getLastError()); + Process_free(&P); + return NULL; |