From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4C72513835A for ; Thu, 11 Jun 2020 12:34:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D40DE093D; Thu, 11 Jun 2020 12:34:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 124FFE093D for ; Thu, 11 Jun 2020 12:34:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CCA3334F2C7 for ; Thu, 11 Jun 2020 12:34:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E96E296 for ; Thu, 11 Jun 2020 12:34:53 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1591878710.40f9c50e93d99e5afbddadfa6373e5637ff5a6e3.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/nagios-core/Manifest net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild X-VCS-Directories: net-analyzer/nagios-core/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 40f9c50e93d99e5afbddadfa6373e5637ff5a6e3 X-VCS-Branch: master Date: Thu, 11 Jun 2020 12:34:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4247b161-5bc0-4443-9b8a-2de1fd2c8b7a X-Archives-Hash: e65e5e831fb818f473b3a843c8c4ae4a commit: 40f9c50e93d99e5afbddadfa6373e5637ff5a6e3 Author: Michael Orlitzky gentoo org> AuthorDate: Thu Jun 11 12:29:42 2020 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Thu Jun 11 12:31:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40f9c50e net-analyzer/nagios-core: remove old version subject to CVE-2020-13977. Bug: https://bugs.gentoo.org/727662 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Michael Orlitzky gentoo.org> net-analyzer/nagios-core/Manifest | 1 - .../nagios-core/nagios-core-4.4.5-r6.ebuild | 242 --------------------- 2 files changed, 243 deletions(-) diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 98f6770b493..8e5831ec7d2 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -1,3 +1,2 @@ -DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675 SHA512 14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30 DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace SHA512 6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild deleted file mode 100644 index b8bec80a3e0..00000000000 --- a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit 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="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="acct-group/nagios - acct-user/nagios - 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}" - -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="${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" - - # 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) 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 - - # 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 - - 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" - 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 -}