commit: b29ce230cbd49c1b9ce5b9a3b02c15387cd090e0 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Sun Feb 23 15:12:22 2025 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Sun Feb 23 15:12:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b29ce230
net-analyzer/nagios-core: drop 4.5.1 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> net-analyzer/nagios-core/Manifest | 1 - .../nagios-core/files/nagios-core-4.5.1-musl.patch | 98 -------- net-analyzer/nagios-core/nagios-core-4.5.1.ebuild | 268 --------------------- 3 files changed, 367 deletions(-) diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index bf01a55a3155..64298238148b 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -1,3 +1,2 @@ -DIST nagios-4.5.1.tar.gz 11540195 BLAKE2B 8fa4654a2e7f218d65c8a318418002f09b0e118f44382030900587881d9fac868e8b4416be8e9fb2ae74444aecb9555719ef29bc88fd95067d84aecca4bacf28 SHA512 71b57d4e0bd2971e8e62b7013c406888d0afd40bc23b032ee9bfdb6e2b3cb083746c5259ef997df241249d2ddaafd6ba5a6470527feddf02e03da32cc0c724b9 DIST nagios-4.5.8.tar.gz 2587824 BLAKE2B c2f571ff7e9a525a70d6425905c5b04703ad5c9c516e36c0146d39c3ae13555f76a9a6429365f3c4cf4482f3053471b40989b81debb94d8974d0fecaf2788a7c SHA512 a293dc28638fffe944adfcf732025100550a1ab54d3a96bacebffb09a98954a9cd9fa122b4afea73b473dcf5560904d5acaa31d8ffd356b6e3b90ae37d86d4b2 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 diff --git a/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch b/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch deleted file mode 100644 index eda71db9bcd4..000000000000 --- a/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 19602faf7111203b748a4dc9ccaf3111586a8e96 Mon Sep 17 00:00:00 2001 -From: Sebastian Wolf <[email protected]> -Date: Fri, 29 Mar 2024 17:01:52 -0400 -Subject: [PATCH 1/2] Fix #952 - s/uint/unsigned int/g - ---- - Changelog | 4 ++++ - lib/t-utils.c | 10 +++++----- - lib/test-dkhash.c | 2 +- - 3 files changed, 10 insertions(+), 6 deletions(-) - -diff --git a/Changelog b/Changelog -index ec3cd64fc..fcf4742f2 100644 ---- a/Changelog -+++ b/Changelog -@@ -2,6 +2,10 @@ - Nagios Core 4 Change Log - ######################## - -+4.5.2 - 2024-04-30 -+------------------ -+* Fix build when compiling against musl libc (#952) (Sebastian Wolf) -+ - 4.5.1 - 2024-02-28 - ------------------- - * Fix text rendering in Configuration -> Command Expansion when the command ends in whitespace (Thanks Joran LEREEC for reporting this issue) (Dylan Anderson) -diff --git a/lib/t-utils.c b/lib/t-utils.c -index badab7c03..123f114c8 100644 ---- a/lib/t-utils.c -+++ b/lib/t-utils.c -@@ -1,8 +1,8 @@ - #include "t-utils.h" - - const char *cyan = "", *red = "", *green = "", *yellow = "", *reset = ""; --uint passed, failed, t_verbose = 0; --static uint t_depth; -+unsigned int passed, failed, t_verbose = 0; -+static unsigned int t_depth; - static const char *indent_str = " "; - - /* can't be used when a or b has side-effects, but we don't care here */ -@@ -27,9 +27,9 @@ void t_set_colors(int force) - } - } - --static void t_indent(uint depth) -+static void t_indent(unsigned int depth) - { -- uint i; -+ unsigned int i; - for (i = 0; i < depth; i++) { - printf("%s", indent_str); - } -@@ -136,7 +136,7 @@ int ok_int(int a, int b, const char *name) - return TEST_FAIL; - } - --int ok_uint(uint a, uint b, const char *name) -+int ok_unsigned int(unsigned int a, unsigned int b, const char *name) - { - if (a == b) { - t_pass("%s", name); -diff --git a/lib/test-dkhash.c b/lib/test-dkhash.c -index 6db1d7a92..15c2b676c 100644 ---- a/lib/test-dkhash.c -+++ b/lib/test-dkhash.c -@@ -68,7 +68,7 @@ static struct test_data *ddup(int x, int i, int j) - } - - struct dkhash_check { -- uint entries, count, max, added, removed; -+ unsigned int entries, count, max, added, removed; - int ent_delta, addrm_delta; - }; - - -From c4f56318e6ecfab85d592ea302d747c80be5f557 Mon Sep 17 00:00:00 2001 -From: Sebastian Wolf <[email protected]> -Date: Fri, 29 Mar 2024 17:04:29 -0400 -Subject: [PATCH 2/2] derp - ---- - lib/t-utils.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/t-utils.c b/lib/t-utils.c -index 123f114c8..24098655f 100644 ---- a/lib/t-utils.c -+++ b/lib/t-utils.c -@@ -136,7 +136,7 @@ int ok_int(int a, int b, const char *name) - return TEST_FAIL; - } - --int ok_unsigned int(unsigned int a, unsigned int b, const char *name) -+int ok_uint(unsigned int a, unsigned int b, const char *name) - { - if (a == b) { - t_pass("%s", name); diff --git a/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild b/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild deleted file mode 100644 index d2f37b2264cc..000000000000 --- a/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild +++ /dev/null @@ -1,268 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd toolchain-funcs - -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="https://downloads.sourceforge.net/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 +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 (USE=apache2_modules_cgi) -# * mod_cgid (USE=apache2_modules_cgid) -# * mod_fcgid (www-apache/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 - -# The dependencies checked by the configure script. All of these are -# also runtime dependencies; that's why ./configure checks for them. -CONFIGURE_DEPEND="acct-group/nagios - acct-user/nagios - virtual/mailx - dev-lang/perl:=" - -# In addition to the things that the ./configure script checks for, -# we also need to be able to unzip stuff on the build host. -# -# We need the apache/lighttpd groups in src_install() for the things -# installed as the --with-command-group argument, so they go here too. -# The groups are also needed at runtime, but that is ensured by apache -# and lighttpd themselves being in RDEPEND. -BDEPEND="${CONFIGURE_DEPEND} - apache2? ( acct-group/apache ) - lighttpd? ( acct-group/lighttpd ) - web? ( app-arch/unzip )" - -# This is linked into /usr/bin/nagios{,tats} -DEPEND="dev-libs/libltdl:0" - -RDEPEND="${CONFIGURE_DEPEND} - ${DEPEND} - web? ( - media-libs/gd[jpeg,png] - lighttpd? ( www-servers/lighttpd[php] ) - apache2? ( - || ( - www-servers/apache[${MOD_ALIAS},apache2_modules_cgi] - www-servers/apache[${MOD_ALIAS},apache2_modules_cgid] - ( www-servers/apache[${MOD_ALIAS}] www-apache/mod_fcgid ) ) - || ( - dev-lang/php:*[apache2] - dev-lang/php:*[cgi] - dev-lang/php:*[fpm] ) - ) - ) - vim-syntax? ( app-vim/nagios-syntax )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/${P}-musl.patch" ) - -src_configure() { - local myconf - - 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 - - # We pass "unknown" as the init type because we don't want it to - # guess. Later on, we'll manually install both OpenRC and systemd - # services. - econf ${myconf} \ - --prefix="${EPREFIX}/usr" \ - --bindir="${EPREFIX}/usr/sbin" \ - --localstatedir="${EPREFIX}/var/lib/nagios" \ - --sysconfdir="${EPREFIX}/etc/nagios" \ - --libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \ - --with-cgibindir="${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin" \ - --with-webdir="${EPREFIX}/usr/share/nagios/htdocs" \ - --with-init-type="unknown" - - # The paths in the web server configuration files need to match - # those passed to econf above. - cp "${FILESDIR}/99_nagios4-r1.conf" \ - "${FILESDIR}/lighttpd_nagios4-r1.conf" \ - "${T}/" || die "failed to create copies of web server conf files" - - sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \ - -e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \ - -i "${T}/99_nagios4-r1.conf" \ - -i "${T}/lighttpd_nagios4-r1.conf" \ - || die "failed to substitute paths into web server conf files" - -} - -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)" 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 - - # The build system installs these directories, but portage assumes - # that the build system doesn't know what it's doing so we have to - # keepdir them, too. I guess you'll have to manually re-check the - # upstream build system forever to see if this is still necessary. - keepdir /var/lib/nagios{,/archives,/rw,/spool,/spool/checkresults} - - 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 - - # The ./configure script for nagios detects the init system on the - # build host, which is wrong for all sorts of reasons. We've gone - # to great lengths above to avoid running "install-init" -- even - # indirectly -- and so now we must install whatever service files - # we need by hand. - newinitd startup/openrc-init nagios - systemd_newunit startup/default-service nagios.service - - if use web ; then - if use apache2 ; then - # Install the Nagios configuration file for Apache. - insinto "/etc/apache2/modules.d" - newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf" - elif use lighttpd ; then - # Install the Nagios configuration file for Lighttpd. - insinto /etc/lighttpd - newins "${T}/lighttpd_nagios4-r1.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 - - if [ -n "${REPLACING_VERSIONS}" ]; then - ewarn "The local state directory for nagios has changed in v4.4.5," - ewarn "from ${EROOT}/var/nagios to ${EROOT}/var/lib/nagios. If you" - ewarn "wish to migrate your state to the new location, first stop" - ewarn "nagios and then run" - ewarn "" - ewarn " diff --recursive --brief ${EROOT}/var/nagios ${EROOT}/var/lib/nagios" - ewarn "" - ewarn "to identify any files that should be moved to the new" - ewarn "location. They can simply be moved with \"mv\" before" - ewarn "restarting nagios." - fi -}
