gentoo resync : 08.01.2021

3 files changed, 88 insertions, 0 deletions

diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 3fbc432acdf0..cd5b470d79de 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,3 +1,4 @@
+AUX monit-fix-unmonitor.patch 1231 BLAKE2B 691cc01a06817be42a90706e967577aadb6597ded78c5976d5fd505744a29a6f151e97b4d143d615324122920f849704f42ea995566cef9a3a6dcef850e46289 SHA512 535e789068744f9110b60e35bd0bc5b9f5f1f6f64d8170c0cc233fc019e9679b562064698eafb7d1f0454bed14d6659ab47543a29484cf72f6537703faf69ef1
 AUX monit.initd-5.0-r1 798 BLAKE2B 3596494122e9746157e86379f204e54d5ad7c0eb378323f3cd2ef7019e9f7a7fba0d8567afe71da8dc2a8b6e17be5fc4162211d36f227183a1557b9b33021f3c SHA512 5e0e2ae2bd1b7e1153a24a51f10b11b7006c43c5b4d68008b477dd0a4cdf97e2109cdb48b1165b79e6f5ad8e98c24a86ff0688f9aecc9297a46d82dd402e0554
 AUX monit.pamd 120 BLAKE2B 76744f79babaa99fa2961f73158ca755f885e9ea8e20b76dcb29f8fd10be6b5804b09b3c90f59ada7ce81eab90713ba43d2b2f28a6abc278fdfc75b356af4e67 SHA512 75c5fbad1c04fc5c9c0de224df245d64f4e59e23f79f4037edcc94623795852900318747e8a71946cab406009834643e84e1cd40b27854951d5462e740712b5c
 AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e4360520252369951b3f7f87a3dd96440a58c9d2c4973ce9980a00ab7085c92af1e6542ae10d679ba352d170b19 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88
@@ -8,5 +9,6 @@ DIST monit-5.27.1.tar.gz 1459360 BLAKE2B ef8030112c401ab08653692c702f2ec6d34c116
 EBUILD monit-5.25.3.ebuild 1204 BLAKE2B b1afff4ec33ccbea3c8e06de97e756590706a54492bac64da87b5a40278ed835806cbccbe9b2b7869e443b83f00f9b6cdf6d78e6929d5683916cf11756c3da7f SHA512 02a0b6d37182baf77a2cb835664ea0d8faf3a473647d234ffc2a62df313d564ec491d9682808161bf4da62aa558fa03293a1b8eea017840acb52298bcfe1834d
 EBUILD monit-5.26.0.ebuild 1207 BLAKE2B aa074c71f4eb188e69feb148663344e15c8ab1e818c960018d59abd21ea5713eb148cdb9c796b996b00aca20f9a4e46ab3ce75f90465d35fb2cd7901a18b9858 SHA512 add86722d2fa2a539c6ac3c4758731e0b72d279d8c56f9634880507e1db0e364a2c4b66ef7d23a60c6a56550bb5fc15d0f8d99a16aa11cd81890093eb368fcf9
 EBUILD monit-5.27.0.ebuild 1189 BLAKE2B 6d26a251a2971408adb9801306041c873741e6d2f8b785a050764c40fc7d1076881aeffac520c102e1c3138a945f23abc1b62d83bb6c6b8cc4ddb615511de277 SHA512 9ad4ca52585b0e2b20407b7a901e6fbb8dc0aeac56e6f9fb4c47b2453f745c88d416f5cbbe8b80c75d67c7b06fd99b68616736eb9f28328db18261bbb965581d
+EBUILD monit-5.27.1-r1.ebuild 1252 BLAKE2B 828454c39b96d5ebde4bc3edd2dde1111914242a3d883f439d76e0f53f7f84e1a8c745daa59d22cee19f69c034ffe86f5f01325d26d39d3eb115007c1aba04c4 SHA512 3de6f38ded218644e8d087c5bff499a2a78b29a2fc4a3e0928dfd49c994a96654f0cfad338f64220b052182c465a93fb41516dc92c9252931850d3031d0496ab
 EBUILD monit-5.27.1.ebuild 1189 BLAKE2B 6d26a251a2971408adb9801306041c873741e6d2f8b785a050764c40fc7d1076881aeffac520c102e1c3138a945f23abc1b62d83bb6c6b8cc4ddb615511de277 SHA512 9ad4ca52585b0e2b20407b7a901e6fbb8dc0aeac56e6f9fb4c47b2453f745c88d416f5cbbe8b80c75d67c7b06fd99b68616736eb9f28328db18261bbb965581d
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-admin/monit/files/monit-fix-unmonitor.patch b/app-admin/monit/files/monit-fix-unmonitor.patch
new file mode 100644
index 000000000000..9e134a08d374
--- /dev/null
+++ b/app-admin/monit/files/monit-fix-unmonitor.patch
@@ -0,0 +1,27 @@
+From a737d3e3bac5bd0378f645eb675a7e4c248e2216 Mon Sep 17 00:00:00 2001
+From: tildeslash <info@tildeslash.com>
+Date: Tue, 27 Oct 2020 19:53:56 +0100
+Subject: [PATCH] Fixed: Issue #931: The "if oes exist" file test with
+ unmonitor or stop action didn't work properly.
+
+---
+ CHANGES                           | 9 +++++++--
+ configure.ac                      | 2 +-
+ src/validate.c                    | 3 +++
+ system/packages/redhat/monit.spec | 5 ++++-
+ 4 files changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/src/validate.c b/src/validate.c
+index 2bf818a..36aa7ef 100644
+--- a/src/validate.c
++++ b/src/validate.c
+@@ -1686,6 +1686,9 @@ State_Type check_file(Service_T s) {
+                         Event_post(s, Event_Exist, State_Failed, l->action, "file exists");
+                 }
+         }
++        // Double-check the monitoring state: the "if does exist" may call unmonitor/stop, which resets the service object
++        if (s->monitor == Monitor_Not)
++                return rv;
+         if (! S_ISREG(s->inf.file->mode) && ! S_ISSOCK(s->inf.file->mode)) {
+                 Event_post(s, Event_Invalid, State_Failed, s->action_INVALID, "is neither a regular file nor a socket");
+                 return State_Failed;
diff --git a/app-admin/monit/monit-5.27.1-r1.ebuild b/app-admin/monit/monit-5.27.1-r1.ebuild
new file mode 100644
index 000000000000..ae564169cc26
--- /dev/null
+++ b/app-admin/monit/monit-5.27.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 pam systemd eutils
+
+DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="ipv6 libressl pam ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	pam? ( sys-libs/pam )"
+BDEPEND="
+	sys-devel/flex
+	sys-devel/bison
+"
+
+PATCHES=( "${FILESDIR}/monit-fix-unmonitor.patch" )
+
+src_prepare() {
+	default
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with ipv6)
+		$(use_with pam)
+		$(use_with ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc; insopts -m600; doins monitrc
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+
+	dobashcomp system/bash/monit
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}