gentoo Easter resync : 12.04.2020

4 files changed, 6 insertions, 95 deletions

diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index dd35c79ec11a..65f081de7a93 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -2,9 +2,8 @@ AUX nrpe-3.2.1-eliminate-systemd-pid.patch 1264 BLAKE2B e0fb75dcc231881fd02fba73
 AUX nrpe.init 1152 BLAKE2B eea4c8554ef02b7eb9e602a4b0750565520dd830435586043f61534a58563eaed379f1296df5eaf68aab88440f4199354118ffbcc5b4340eda633bb3eb49092c SHA512 19f470407d63b2949535acd6e5849afbea44f82a5773f9110f8b025c380c0626a0a733ead417b1ce293741168acea5a885c2e9f94fb1c0b3e38a06e0eae4ddca
 AUX nrpe.service 242 BLAKE2B 715f0e8b91d6c40405d6d1f3689bbbf750e61e78e1d727debbe998ae81922b36f1d5f7c011f6881979e485a81c08d3f1f405b962023fecea643c8f7a9e04c3df SHA512 ffd67467cc4f5ccdf73e0860d1355a8cc3e528d0c67f2054b0ad76c02a43f9c5a8964a3f6df6f91eaa8e15c3c9596259aa964ad69aa2da60678d68fa892b2346
 AUX nrpe.xinetd.2 245 BLAKE2B 3e9db31c7d5b28dab18d2f5855d0465f25fc9cf4a70deac9a5d0c87c7cc546a33b432dbca172a49addadc0bd6583d870ec0fe350bf60e015e325d8bb923aca47 SHA512 d687cb2a5babfd28a97d3a5f1ac665758341ecc37fdd0193dbf0df4cba68c88aa24776a33a706989843fa5356b2e3e995662a823ceb2b86ba8f846f8c47e18fb
-DIST nrpe-3.2.1.tar.gz 518015 BLAKE2B c9be2bf24e3d9977a7ff5c2f0e08bfe841729289af836bb7ac6ccb2c173a519958b12cc3e90ece612ac6c2527ad472ef1464be648a66b11ff8ad483d5ad78cc1 SHA512 ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856
 DIST nrpe-4.0.0.tar.gz 523846 BLAKE2B 850a420f0550e1dfe6b0ea98a9d9cafec0ec583c115be89b3ba8e88a309c40226c87f6ae880d12c582822e492c5991e3d2444b68f5644750fc74ad75596c96fd SHA512 8773102f28f3e7e96f3637e77489eb12ffe88fe839abfe3f150d2eb3d2efe05f7f812ab4d52a64cbd8d0a5e491aed93d5300b7ce9a8dd072b3a00d885b91276b
-EBUILD nrpe-3.2.1-r1.ebuild 2518 BLAKE2B 04b3c3a51d54fa4224462952fad8a87462e4ec7d7779c9302dba7f02591c42c6df772dca9d0b24fcb1d03d0b22d224511c7388e26efa7d22b8ee5261aefa540a SHA512 ae839675938af1bb739ed9fa7295b7d219b4d751b99c16dbbba3709a89b7e639ebd69e1b4c2ef446f4f1a0836472f1873d698060ae911d093db08fab5cc063a9
-EBUILD nrpe-3.2.1-r3.ebuild 2823 BLAKE2B 9a84075935704b6293c5bad466daf7dea676206f778cf7ad466929b4e9e593ff0bd7b5eb54c40cf3d1e6f35ef7a9e5da033d4dce7481ce11ec21639d2ce29aba SHA512 b3bc91e7c5a2e5e557aba4e1c891ea6551b4877bdee743ce5264fad84e84258a606a42fb32e085c901b59bc7009ddbd6adbcc703a3886779b3c417c82c708d75
-EBUILD nrpe-4.0.0.ebuild 2823 BLAKE2B 9a84075935704b6293c5bad466daf7dea676206f778cf7ad466929b4e9e593ff0bd7b5eb54c40cf3d1e6f35ef7a9e5da033d4dce7481ce11ec21639d2ce29aba SHA512 b3bc91e7c5a2e5e557aba4e1c891ea6551b4877bdee743ce5264fad84e84258a606a42fb32e085c901b59bc7009ddbd6adbcc703a3886779b3c417c82c708d75
+DIST nrpe-4.0.2.tar.gz 524146 BLAKE2B dc100579420eeccaaa2a913f56c76b86b6ebdce8d1afdddcc428bfd4a8c12ad19050ab0395e7a109d4e8b43ca7d6a11e13ec4a4250a91483e37725c184382ca2 SHA512 4d7cf6abc974bc79df54afc42644418e3f086a279c8c17d0fd104f19e3c21c0f3dae4fb4268dd134446ff9fe505159b0446372c5cac71cfe03a97479ed41c09b
+EBUILD nrpe-4.0.0.ebuild 2818 BLAKE2B bb9f9c1d2a73a0209c56dc419f4683036b0abaf6770e9a39be95ed1c7bd59820b978f501d97c5b067fce393f811e73fd4f3478bc9bda723be42ce2712bb46270 SHA512 9251a9b424567a23ef301bdbc3e6f4edcaf57b2e138beca8cf2f9ac4a46f177ce9c361df677a926767ee63c025bad7ab5ab5bf42bd9744e05e9594f32fbe854c
+EBUILD nrpe-4.0.2.ebuild 2874 BLAKE2B 0a3135a0421456de630405025c0b8f23f377f1998cf0f74cc44e456ed115fdcfa0642babf3f69815d1406ddb103383ecb985caf028b1fe6e46c68dea85bfb0df SHA512 554ca7a50f3fbe1b51d46df5c502a9282e7edca1001fd88f138827df6acf5e09ef885b81ba650d5d26bdd1ed5e6a62c5edc407521ba054a3be74c56123b868aa
 MISC metadata.xml 770 BLAKE2B 93991f7ee4c1b6c26b67e873fae0cdb66170cd93ba6b79d6e798cb2605126888a996f633eccd038ece2a822d1b92498c2036746bb3a1add2e336c6026c2db86d SHA512 48693abab21581eff977b8deaa5fabc5d388960c9cd090b590a1f6d3c8d37b63fe33ec86d6f95d7435404314b84053f8c2ca84b0f33c6c7241ea7260f82a3a27
diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild b/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild
deleted file mode 100644
index e6bbf0ba41bb..000000000000
--- a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-DESCRIPTION="Nagios Remote Plugin Executor"
-HOMEPAGE="https://github.com/NagiosEnterprises/nrpe"
-SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="command-args libressl selinux ssl"
-
-DEPEND="sys-apps/tcp-wrappers
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-RDEPEND="${DEPEND}
-	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
-	selinux? ( sec-policy/selinux-nagios )"
-
-PATCHES=( "${FILESDIR}/nrpe-3.2.1-eliminate-systemd-pid.patch" )
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_configure() {
-	# The configure script tries to detect what OS, distribution, and
-	# init system you're running and changes the build/install process
-	# depending on what it comes up with. We specify fixed values
-	# because we don't want it guessing, for example, whether or not
-	# to install the tmpfiles.d entry based on whether or not systemd
-	# is currently running (OpenRC uses them too).
-	econf \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--with-nrpe-user=nagios \
-		--with-nrpe-group=nagios \
-		--with-piddir=/run \
-		--with-opsys=unknown \
-		--with-dist-type=unknown \
-		--with-init-type=unknown \
-		--with-inetd-type=unknown \
-		$(use_enable command-args) \
-		$(use_enable ssl)
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	default
-
-	dodoc CHANGELOG.md SECURITY.md
-	insinto /etc/nagios
-	newins sample-config/nrpe.cfg nrpe.cfg
-	fowners root:nagios /etc/nagios/nrpe.cfg
-	fperms 0640 /etc/nagios/nrpe.cfg
-
-	newinitd "startup/openrc-init" nrpe
-	newconfd "startup/openrc-conf" nrpe
-	systemd_newunit "startup/default-service" "${PN}.service"
-
-	insinto /etc/xinetd.d/
-	newins "${FILESDIR}/nrpe.xinetd.2" nrpe
-
-	rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool'
-}
-
-pkg_postinst() {
-	elog 'Some users have reported incompatibilities between nrpe-2.x and'
-	elog 'nrpe-3.x. We recommend that you use the same major version for'
-	elog 'both your server and clients.'
-
-	if use command-args ; then
-		ewarn ''
-		ewarn 'You have enabled command-args for NRPE. That lets clients'
-		ewarn 'supply arguments to the commands that are run, and IS A'
-		ewarn 'SECURITY RISK!'
-		ewarn''
-	fi
-}
diff --git a/net-analyzer/nrpe/nrpe-4.0.0.ebuild b/net-analyzer/nrpe/nrpe-4.0.0.ebuild
index 6e332b90dd45..d1e218e2cd8a 100644
--- a/net-analyzer/nrpe/nrpe-4.0.0.ebuild
+++ b/net-analyzer/nrpe/nrpe-4.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="command-args libressl selinux ssl"
 
 DEPEND="acct-group/nagios
diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r3.ebuild b/net-analyzer/nrpe/nrpe-4.0.2.ebuild
index 6e332b90dd45..73205353081b 100644
--- a/net-analyzer/nrpe/nrpe-3.2.1-r3.ebuild
+++ b/net-analyzer/nrpe/nrpe-4.0.2.ebuild
@@ -75,7 +75,8 @@ src_install() {
 	insinto /etc/xinetd.d/
 	newins "${FILESDIR}/nrpe.xinetd.2" nrpe
 
-	rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool'
+	rm "${ED}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool'
+	rm -r "${ED}/run" || die 'failed to remove /run'
 }
 
 pkg_postinst() {