[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/files/, net-analyzer/nagios-core/

["Michael Orlitzky" <mjo@gentoo.org>]

commit:     390a02aa9cab0a7bdf5a86b0abc48f842d5b5ed3
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Aug 30 07:19:45 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 21:34:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=390a02aa

net-analyzer/nagios-core: drop old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 net-analyzer/nagios-core/Manifest                  |   1 -
 .../nagios-core-4.4.4-no-zombie-processes.patch    | 158 ---------------
 .../nagios-core/nagios-core-4.4.4-r1.ebuild        | 215 ---------------------
 3 files changed, 374 deletions(-)

diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 87e9dd98c4f..c1cd0864f89 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,3 @@
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
-DIST nagios-4.4.4.tar.gz 11303598 BLAKE2B e4015ca5c0383b0540f2eaf3d608343df850c6045a4539c1f1ab8c19dc95e9223816efe71034b37f6995cb623dc6b83c92e22a677fe687a34d2215b1a2758c90 SHA512 c8f2b83bad744d67be4ba8356d9eea0be3efbf42d9a215d64815cdf7d944eba798348ce0faea6cebe64f1c99e0edbf12540d83ca42f8b4b563cbcc60139afdb0
 DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675 SHA512 14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766

diff --git a/net-analyzer/nagios-core/files/nagios-core-4.4.4-no-zombie-processes.patch b/net-analyzer/nagios-core/files/nagios-core-4.4.4-no-zombie-processes.patch
deleted file mode 100644
index 4592b1d27f4..00000000000
--- a/net-analyzer/nagios-core/files/nagios-core-4.4.4-no-zombie-processes.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-This was an upstream bug that has been reverted for nagios-core-4.4.5:
-
-  https://github.com/NagiosEnterprises/nagioscore/issues/683
-
-Thanks to Tomáš Mózes (hydrapolic) for noticing and reporting the fix.
-
-diff --git a/base/events.c b/base/events.c
-index d601e970f..bb27b3240 100644
---- a/base/events.c
-+++ b/base/events.c
-@@ -351,13 +351,12 @@ void init_timing_loop(void) {
- 			 */
- 			check_delay =
- 					mult_factor * scheduling_info.service_inter_check_delay;
--			time_t check_window = reschedule_within_timeperiod(next_valid_time, temp_service->check_period_ptr, check_window(temp_service)) - current_time;
--			if(check_delay > check_window) {
-+			if(check_delay > check_window(temp_service)) {
- 				log_debug_info(DEBUGL_EVENTS, 0,
- 						"  Fixing check time %lu secs too far away\n",
--						check_delay - check_window);
-+						check_delay - check_window(temp_service));
- 				fixed_services++;
--				check_delay = check_window;
-+				check_delay = check_window(temp_service);
- 				log_debug_info(DEBUGL_EVENTS, 0, "  New check offset: %d\n",
- 						check_delay);
- 			}
-@@ -370,7 +369,8 @@ void init_timing_loop(void) {
- 			if(is_valid_time == ERROR) {
- 				log_debug_info(DEBUGL_EVENTS, 2, "Preferred Time is Invalid In Timeperiod '%s': %lu --> %s\n", temp_service->check_period_ptr->name, (unsigned long)temp_service->next_check, ctime(&temp_service->next_check));
- 				get_next_valid_time(temp_service->next_check, &next_valid_time, temp_service->check_period_ptr);
--				temp_service->next_check = reschedule_within_timeperiod(next_valid_time, temp_service->check_period_ptr, check_window(temp_service));
-+				temp_service->next_check = 
-+					(time_t)(next_valid_time + check_delay);
- 				}
- 
- 			log_debug_info(DEBUGL_EVENTS, 2, "Actual Check Time: %lu --> %s\n", (unsigned long)temp_service->next_check, ctime(&temp_service->next_check));
-@@ -508,7 +508,7 @@ void init_timing_loop(void) {
- 			log_debug_info(DEBUGL_EVENTS, 1, "Fixing check time (off by %lu)\n",
- 					check_delay - check_window(temp_host));
- 			fixed_hosts++;
--			check_delay = reschedule_within_timeperiod(next_valid_time, temp_host->check_period_ptr, check_window(temp_host));
-+			check_delay = ranged_urand(0, check_window(temp_host));
- 			}
- 		temp_host->next_check = (time_t)(current_time + check_delay);
- 
-diff --git a/cgi/status.c b/cgi/status.c
-index ae723c683..2f6a60fde 100644
---- a/cgi/status.c
-+++ b/cgi/status.c
-@@ -221,8 +221,26 @@ int main(void) {
- 	document_header(TRUE);
- 
- 	/* if a navbar search was performed, find the host by name, address or partial name */
--	if(navbar_search == TRUE) {
--		if(host_name != NULL && NULL != strstr(host_name, "*")) {
-+	if(navbar_search == TRUE && host_name != NULL) {
-+
-+		/* Remove trailing spaces from host_name */
-+		len = strlen(host_name);
-+		for (i = len - 1; i >= 0; i--) {
-+			if (!isspace(host_name[i])) {
-+				host_name[i+1] = '\0';
-+				break;
-+			}
-+		}
-+
-+		/* Remove leading spaces from host_name */
-+		for (i = 0; i < len; i++) {
-+			if (!isspace(host_name[i])) {
-+				break;
-+			}
-+		}
-+		strcpy(host_name, host_name + i);
-+
-+		if(NULL != strstr(host_name, "*")) {
- 			/* allocate for 3 extra chars, ^, $ and \0 */
- 			host_filter = malloc(sizeof(char) * (strlen(host_name) * 2 + 3));
- 			len = strlen(host_name);
-@@ -238,7 +256,7 @@ int main(void) {
- 			host_filter[regex_i++] = '$';
- 			host_filter[regex_i] = '\0';
- 			}
--		else if (host_name != NULL) {
-+		else {
- 			if((temp_host = find_host(host_name)) == NULL) {
- 				for(temp_host = host_list; temp_host != NULL; temp_host = temp_host->next) {
- 					if(is_authorized_for_host(temp_host, &current_authdata) == FALSE)
-diff --git a/lib/worker.c b/lib/worker.c
-index 4f7cbc384..a94719cc4 100644
---- a/lib/worker.c
-+++ b/lib/worker.c
-@@ -215,7 +215,7 @@ int worker_buf2kvvec_prealloc(struct kvvec *kvv, char *buf, unsigned long len, i
- 	} while (0)
- 
- /* forward declaration */
--static int gather_output(child_process *cp, iobuf *io, int final);
-+static void gather_output(child_process *cp, iobuf *io, int final);
- 
- static void destroy_job(child_process *cp)
- {
-@@ -258,23 +258,15 @@ static void destroy_job(child_process *cp)
- int finish_job(child_process *cp, int reason)
- {
- 	static struct kvvec resp = KVVEC_INITIALIZER;
--	int i, ret, rd;
-+	int i, ret;
- 
- 	/* get rid of still open filedescriptors */
- 	if (cp->outstd.fd != -1) {
--
--		rd = 1;
--		while(rd > 0) {
--			rd = gather_output(cp, &cp->outstd, 0);
--		}
-+		gather_output(cp, &cp->outstd, 1);
- 		iobroker_close(iobs, cp->outstd.fd);
- 	}
- 	if (cp->outerr.fd != -1) {
--
--		rd = 1;
--		while(rd > 0) {
--			rd = gather_output(cp, &cp->outerr, 0);
--		}
-+		gather_output(cp, &cp->outerr, 1);
- 		iobroker_close(iobs, cp->outerr.fd);
- 	}
- 
-@@ -450,13 +442,13 @@ static void kill_job(child_process *cp, int reason)
- 	destroy_job(cp);
- }
- 
--static int gather_output(child_process *cp, iobuf *io, int final)
-+static void gather_output(child_process *cp, iobuf *io, int final)
- {
- 	int retry = 5;
--	int rd;
- 
- 	for (;;) {
- 		char buf[4096];
-+		int rd;
- 
- 		rd = read(io->fd, buf, sizeof(buf));
- 		if (rd < 0) {
-@@ -492,13 +484,13 @@ static int gather_output(child_process *cp, iobuf *io, int final)
- 		if (rd <= 0 || final) {
- 			iobroker_close(iobs, io->fd);
- 			io->fd = -1;
-+			if (!final)
-+				check_completion(cp, WNOHANG);
- 			break;
- 		}
- 
- 		break;
- 	}
--
--	return rd;
- }

diff --git a/net-analyzer/nagios-core/nagios-core-4.4.4-r1.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.4-r1.ebuild
deleted file mode 100644
index 520b2503a8c..00000000000
--- a/net-analyzer/nagios-core/nagios-core-4.4.4-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/"
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="dev-libs/libltdl:0
-	virtual/mailx
-	perl? ( dev-lang/perl:= )
-	web? (
-		app-arch/unzip
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd[php] )
-		apache2? (
-			|| (
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
-			|| (
-				dev-lang/php:*[apache2]
-				dev-lang/php:*[cgi]
-				dev-lang/php:*[fpm] )
-		)
-	)"
-RDEPEND="${DEPEND}
-	vim-syntax? ( app-vim/nagios-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-no-zombie-processes.patch" )
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_configure() {
-	local myconf
-
-	if use perl; then
-		myconf="${myconf} --enable-embedded-perl --with-perlcache"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf="${myconf} --with-command-group=nagios"
-	else
-		if use apache2 ; then
-			myconf="${myconf} --with-command-group=apache"
-			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-		elif use lighttpd ; then
-			myconf="${myconf} --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf} \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		--with-cgibindir=/usr/$(get_libdir)/nagios/cgi-bin \
-		--with-webdir=/usr/share/nagios/htdocs
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) nagios
-
-	if use web; then
-		# Only compile the CGIs/HTML when USE=web is set.
-		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
-	fi
-}
-
-src_install() {
-	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
-
-	# There is no way to install the CGIs unstripped from the top-level
-	# makefile, so descend into base/ here. The empty INSTALL_OPTS
-	# ensures that root:root: owns the nagios executables.
-	cd "${S}/base" || die
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-	cd "${S}" || die
-
-	# Otherwise this gets installed as 770 and you get "access denied"
-	# for some reason or other when starting nagios. The permissions
-	# on nagiostats are just for consistency (these should both get
-	# fixed upstream).
-	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
-
-	# INSTALL_OPTS are needed for most of install-basic, but we don't
-	# want them on the LIBEXECDIR, argh.
-	emake DESTDIR="${D}" install-basic
-	fowners root:root /usr/$(get_libdir)/nagios/plugins
-
-	# Don't make the configuration owned by the nagios user, because
-	# then he can edit nagios.cfg and trick nagios into running as root
-	# and doing his bidding.
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
-
-	# No INSTALL_OPTS used in install-commandmode, thankfully.
-	emake DESTDIR="${D}" install-commandmode
-
-	if use web; then
-		# There is no way to install the CGIs unstripped from the
-		# top-level makefile, so descend into cgi/ here. The empty
-		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
-		cd "${S}/cgi" || die
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-		cd "${S}" || die
-
-		# install-html installs the new exfoliation theme
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
-
-		if use classicui; then
-			# This overwrites the already-installed exfoliation theme
-			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
-		fi
-
-		# Install cute Gentoo icons (bug #388323), setting their
-		# owner, group, and mode to match those of the rest of Nagios's
-		# images.
-		insinto /usr/share/nagios/htdocs/images/logos
-		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
-	fi
-
-	newinitd startup/openrc-init nagios
-
-	if use web ; then
-		if use apache2 ; then
-			# Install the Nagios configuration file for Apache.
-			insinto "/etc/apache2/modules.d"
-			doins "${FILESDIR}"/99_nagios4.conf
-		elif use lighttpd ; then
-			# Install the Nagios configuration file for Lighttpd.
-			insinto /etc/lighttpd
-			newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
-			ewarn "out of the box. Since you are not using one of them, you"
-			ewarn "will have to configure your webserver yourself."
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	if use web; then
-		if use apache2 || use lighttpd ; then
-			if use apache2; then
-				elog "To enable the Nagios web front-end, please edit"
-				elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
-				elog "to APACHE2_OPTS. Then Nagios will be available at,"
-				elog
-			elif use lighttpd; then
-				elog "To enable the Nagios web front-end, please add"
-				elog "'include \"nagios.conf\"' to the lighttpd configuration"
-				elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
-				elog "will be available at,"
-				elog
-			fi
-
-			elog "  http://localhost/nagios/"
-		fi
-	fi
-
-	elog
-	elog "If your kernel has /proc protection, nagios"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding nagios into"
-	elog "the group wheel, but this is not recomended."
-	elog
-}