gentoo auto-resync : 02:11:2022 - 03:08:46

5 files changed, 102 insertions, 25 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8189617c9599..9ba466cb3cfa 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/ipaudit/Manifest b/net-analyzer/ipaudit/Manifest
index d666c052cd83..51e16e81d08f 100644
--- a/net-analyzer/ipaudit/Manifest
+++ b/net-analyzer/ipaudit/Manifest
@@ -1,5 +1,3 @@
-DIST ipaudit-1.0BETA2.tar.gz 135680 BLAKE2B 2a8e7754251c743758d6e0d7008d904a3a237c26a660f5c07661c632dd75ecda6cf3b04253eb76f64c72ed278da00030cf64231bdc4760a6b04df1497f628ec2 SHA512 3a8890821c515aea95762eeb2cc7a649533ff739984c944bcb26acb72434e1f2b453a98365719fce9e062d6262b9d76ac389f149ad2a19361422783bc0b55e09
 DIST ipaudit-1.1.tar.gz 170253 BLAKE2B 6515cab817a35835d5c3eb33dc4d8c9f28a1ceb906854e55c3695fc6ee5d230ad2ae6a6fd59849623e161fe4deb5013f55bdf6effcaaf6ca4d064ded73c148f0 SHA512 5eb1971b454c8c96c02dc260e537a9a627554b7c9d1e269be9de2ffdb5cbfed00272b643de7b15865659cef0db482e4c460f96b1545bcd6c4f208c96d7401ef9
-EBUILD ipaudit-1.0_beta2-r1.ebuild 572 BLAKE2B 3da67855fe463b17ae3fd1df3faf82e491cb38ca2f05808679a86f9fc33d850374f95cc78b86f64198831e4859e5ce0124bd40b058a34bcaadd921ed548f5ae8 SHA512 ff10e20d8ab5844822ed36a54d1d94636507af73ff4683c0e25253938491bcf9898b1658e5f60be9709488d911e80f72cdd0b6edaea24a91ee1eb37e5de544bf
 EBUILD ipaudit-1.1.ebuild 512 BLAKE2B 304111f0f0a1c7f425d474dfbd50e331516cf2ab384b35150c45e039045831db9227023941d6d0f284ade101d2967e751a7dadcb721f585c4a7e2a12dab4f64b SHA512 51a259811bc53886992bcd87d73f3ce373e52871142e00c6ae92d09aa8c5a02fe95c45b51aa29a2664e45ec5275f8b72fbe534292ab739b1db219045282c7202
 MISC metadata.xml 338 BLAKE2B 340f5c1773bbf5d3acb294d752edcc8be524d3a1bf9feacab11766f658a2a61e47da8e878ea1e1e6174d898e3d349d5f9bed0dcf6997c08e44b4fbf74d954360 SHA512 91d56934279db25b950f0f0e97983bff931a44690d416e77a673931d879a9af8274bf297c1ad6a9cb0a2682a7460ae10f31f86c155a52b4197a30c609c21ff4f
diff --git a/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild b/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild
deleted file mode 100644
index fce596bdb7e8..000000000000
--- a/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="IPAudit monitors network activity on a network by host, protocol and port"
-HOMEPAGE="http://ipaudit.sourceforge.net/"
-MY_P="${PN}-${PV/_beta/BETA}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="mysql"
-DEPEND="net-libs/libpcap
-		mysql? ( dev-db/mysql-connector-c:0= )"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS README )
-
-src_configure() {
-	econf $(use_with mysql)
-}
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index ef1c63b08e6f..453018c8c4c5 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -4,7 +4,9 @@ AUX nrpe.xinetd.2 245 BLAKE2B 3e9db31c7d5b28dab18d2f5855d0465f25fc9cf4a70deac9a5
 DIST nrpe-4.0.0.tar.gz 523846 BLAKE2B 850a420f0550e1dfe6b0ea98a9d9cafec0ec583c115be89b3ba8e88a309c40226c87f6ae880d12c582822e492c5991e3d2444b68f5644750fc74ad75596c96fd SHA512 8773102f28f3e7e96f3637e77489eb12ffe88fe839abfe3f150d2eb3d2efe05f7f812ab4d52a64cbd8d0a5e491aed93d5300b7ce9a8dd072b3a00d885b91276b
 DIST nrpe-4.0.2.tar.gz 524146 BLAKE2B dc100579420eeccaaa2a913f56c76b86b6ebdce8d1afdddcc428bfd4a8c12ad19050ab0395e7a109d4e8b43ca7d6a11e13ec4a4250a91483e37725c184382ca2 SHA512 4d7cf6abc974bc79df54afc42644418e3f086a279c8c17d0fd104f19e3c21c0f3dae4fb4268dd134446ff9fe505159b0446372c5cac71cfe03a97479ed41c09b
 DIST nrpe-4.0.3.tar.gz 524160 BLAKE2B d2c99cadf718e7049c911388b105fb4f5248307c733d94a73fd02ac69c49be230dad58be0a182af9c8d7e0d1f34e8dba6b8fc46a7c01eb15d845f2b3a54499ed SHA512 31d932c481c8a53bd0f8865fb3cfeeb1466b9b05fa89382aa056aa9343a09843b51fe5398fd0388e6bba99e9c3d8093f6033799fd83afd43012bfe8fdc5a33e3
+DIST nrpe-4.1.0.tar.gz 528228 BLAKE2B a8890eef9f32e43417270eb80dcb9eedf1272d70d2dad73fecd855565358fbe9cb1d716fe0b79270310c2c5097eba3ffc7f786c89eecae9f6b84d2fbb43d3e0f SHA512 a47935eecc65d646737166f98f5f160e3d1d5bbd245e006e8cd0758af75db083f870db6c02c1edd0d44cf9a91909ba26df8eee1620a7ac4d9f98032f2cce8981
 EBUILD nrpe-4.0.0.ebuild 2755 BLAKE2B a7f5021e1420484b28e90971ab03e70fc280b5471ba845e077ba1aadf95311ed9d16bb0908a43621994013c66556b809bd15591db4a72ee19f86374db11dbec0 SHA512 a2587ab7129bb6abf513efe5cb868609ecd95251419c1486bc43f9aff849816809582f8103fe0b009e6430c5bbcc455d1df4bafddce685768a5b7e881492454c
 EBUILD nrpe-4.0.2.ebuild 2810 BLAKE2B 4d947f53a170ba7d178581ea7fab97eb2faa45207e6b9103352905dd6b445676d76a91cf3287addce3e965c746d525146f52e5523d13d6599a6d215d880afd13 SHA512 04f3e6b17a8636f7eb3c2055cb0d8213047c80544e4f64aaae30b17396acdb0446421bd8bfa245b3c97c4ba6b40039d3c614a0b95e8de1dbf1a97d1341899f0a
 EBUILD nrpe-4.0.3.ebuild 2766 BLAKE2B 482c7ed7765f9bb3d80073bc02a2bd9e9107d8098839df3dce9418079496bf5e8b66232ae34b711df056ea0b0ac2e97bdacbbcff0dcbfacee86dd00f7bb05dc9 SHA512 e64b136a99e7bf2dd15578e092d94e3b8dff3f29ea0029ad88ded307a46d93869af0e1e22a541107d74a7edeae86af5c81e62316dc7eeb2223e6dc1dfce396ee
+EBUILD nrpe-4.1.0.ebuild 2725 BLAKE2B 10a180fa2723017aefaa3084904e6904b3a965cee88710997dc2bddf45203b695c32f0115c19a2c8211abb20f49395b4449c89629d77d29b0992b197719f99a4 SHA512 469c6726c29426f99e890da5d61c1014dbf8dc90a4cc3210f382242820ef4ef062db4c33dda03907cfde90e3139ffd5916a9e5a1e482cd69380d02afc226ecab
 MISC metadata.xml 835 BLAKE2B ab7ed34110f413eea203a266b7e32c07e41630829c058af4dcf1583c9b0a4fc833ddf2f5578a7b86abf384e9adac409980e2356f27d858498f1d09780e127755 SHA512 ef4853d8444835b87d85013f9f3da9b08c764a16f89caaf83cdb37651fb83d0fb932e00652839c164ebcb9f7b5f113fd9a185859fed042cd289f260cbacc260b
diff --git a/net-analyzer/nrpe/nrpe-4.1.0.ebuild b/net-analyzer/nrpe/nrpe-4.1.0.ebuild
new file mode 100644
index 000000000000..88306182ea63
--- /dev/null
+++ b/net-analyzer/nrpe/nrpe-4.1.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+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 selinux ssl tcpd"
+
+DEPEND="acct-group/nagios
+	acct-user/nagios
+	tcpd? (
+		sys-apps/tcp-wrappers
+	)
+	ssl? (
+		dev-libs/openssl:=
+	)"
+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"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+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).
+	#
+	# Note: upstream defaults to using "nagios" as the default NRPE
+	# user and group. I have a feeling that this isn't quite correct
+	# on a system where "nagios" is also the user running the nagios
+	# server daemon. In the future, it would be nice if someone who
+	# actually uses NRPE could test with an unprivileged "nrpe" as
+	# the user and group.
+	econf \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		--localstatedir=/var/lib/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) \
+		$(use_enable tcpd)
+}
+
+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 "${ED}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool'
+	rm -r "${ED}/run" || die 'failed to remove /run'
+}
+
+pkg_postinst() {
+	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
+}