commit: 160a88adcc626c622152c184aa537508e5af9d67 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Dec 1 18:19:19 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Dec 1 18:19:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=160a88ad
net-analyzer/nagvis: Remove last-rited pkg Closes: https://bugs.gentoo.org/477742 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-analyzer/nagvis/Manifest | 1 - .../nagvis/files/nagvis-1.6.6-base-path.patch | 13 ---- .../files/nagvis-1.6.6-global-definitions.patch | 30 -------- net-analyzer/nagvis/metadata.xml | 11 --- net-analyzer/nagvis/nagvis-1.6.6.ebuild | 90 ---------------------- profiles/package.mask | 5 -- 6 files changed, 150 deletions(-) diff --git a/net-analyzer/nagvis/Manifest b/net-analyzer/nagvis/Manifest deleted file mode 100644 index 71c63ecf82b..00000000000 --- a/net-analyzer/nagvis/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nagvis-1.6.6.tar.gz 3430714 BLAKE2B af932327b91f64b1d146d6937f45f94ff9826728126c19254abc4ba57883fce18380e36f99a205532df93b4a1b9225ad34140a90d3d80e2203581353c0915ea1 SHA512 e5858b185dd5d31fc8d414df5b3464941769249ce582b10e155e89ba7aa0c45724550c44de9d7bfb23b96caa737e519f320e45050126feb94593cca2bfc583cb diff --git a/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch b/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch deleted file mode 100644 index 771076c4eaa..00000000000 --- a/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/share/server/core/classes/GlobalMainCfg.php 2012-05-31 11:14:23.000000000 -0400 -+++ b/share/server/core/classes/GlobalMainCfg.php 2012-05-31 11:17:10.000000000 -0400 -@@ -1215,8 +1215,8 @@ - * @author Roman Kyrylych <[email protected]> - */ - private function getBasePath() { -- // Go 3 levels up from nagvis/share/nagvis to nagvis base path -- return realpath(dirname($_SERVER['SCRIPT_FILENAME']) . '/../../..') . '/'; -+ // Go 2 levels up from share/nagvis to nagvis base path -+ return realpath(dirname($_SERVER['SCRIPT_FILENAME']) . '/../..') . '/'; - // Note: the method below causes problems when <docroot>/nagvis is a symlink to <nagvis-base>/share - // return realpath(dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])))).'/'; - } diff --git a/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch b/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch deleted file mode 100644 index 9786b970179..00000000000 --- a/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/share/server/core/defines/global.php 2012-05-13 05:44:27.000000000 -0400 -+++ b/share/server/core/defines/global.php 2012-05-31 11:20:39.000000000 -0400 -@@ -64,7 +64,7 @@ - define('DEBUGLEVEL', 6); - - // Path to the debug file --define('DEBUGFILE', '../../../var/nagvis-debug.log'); -+define('DEBUGFILE', '../../var/nagvis-debug.log'); - - // It is possible to define a conf.d directory for splitting the main - // configuration in several files. Only the values defined in the CONST_MAINCFG -@@ -78,14 +78,14 @@ - // The last value wins. - // - // Path to the main configuration file --define('CONST_MAINCFG', '../../../etc/nagvis.ini.php'); --define('CONST_MAINCFG_CACHE', '../../../var/nagvis-conf'); -+define('CONST_MAINCFG', '../../etc/nagvis.ini.php'); -+define('CONST_MAINCFG_CACHE', '../../var/nagvis-conf'); - - // Path to the main configuration conf.d directory --define('CONST_MAINCFG_DIR', '../../../etc/conf.d'); -+define('CONST_MAINCFG_DIR', '../../etc/conf.d'); - - // The directory below the NagVis root which is shared by the webserver --define('HTDOCS_DIR', 'share'); -+define('HTDOCS_DIR', ''); - - // Needed minimal PHP version - define('CONST_NEEDED_PHP_VERSION', '5.0'); diff --git a/net-analyzer/nagvis/metadata.xml b/net-analyzer/nagvis/metadata.xml deleted file mode 100644 index 03cfbae2f91..00000000000 --- a/net-analyzer/nagvis/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="automap">Enable automated map generation using <pkg>media-gfx/graphviz</pkg></flag> - </use> - <upstream> - <remote-id type="sourceforge">nagvis</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/nagvis/nagvis-1.6.6.ebuild b/net-analyzer/nagvis/nagvis-1.6.6.ebuild deleted file mode 100644 index 19ce16533ff..00000000000 --- a/net-analyzer/nagvis/nagvis-1.6.6.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils depend.apache - -DESCRIPTION="Visualization addon for the network managment system Nagios" -HOMEPAGE="http://www.nagvis.org/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="apache2 automap" - -DEPEND="virtual/httpd-php" -RDEPEND="|| ( net-analyzer/nagios net-analyzer/icinga ) - automap? ( >=media-gfx/graphviz-2.14 ) - apache2? ( dev-lang/php[apache2] ) - net-analyzer/mk-livestatus - dev-lang/php[gd,nls,json,session,pdo,sqlite,sockets,mysql,unicode,xml] - virtual/httpd-php:*" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-base-path.patch - epatch "${FILESDIR}"/${P}-global-definitions.patch - grep -Rl "/usr/local" "${S}"/* | xargs sed -i s:/usr/local:/usr:g ||die - sed -i s:@NAGVIS_WEB@:/nagvis:g "${S}"/etc/apache2-nagvis.conf-sample ||die - sed -i s:@NAGVIS_PATH@:/usr/share/nagvis/:g "${S}"/etc/apache2-nagvis.conf-sample ||die - sed -i s:/usr/nagios/var/rw/live:/var/nagios/rw/live:g "${S}"/etc/nagvis.ini.php-sample ||die -} - -src_install() { - dodoc README INSTALL - - insinto /usr/share/nagvis - doins -r share/{config.php,index.php,frontend,netmap,server,userfiles} - doins -r docs - - diropts -o apache -g root - dodir /var/nagvis/tmpl/{cache,compile} - diropts - dosym /var/nagvis /usr/share/nagvis/var - - if use apache2 ; then - insinto "${APACHE_MODULES_CONFDIR}" - newins etc/apache2-nagvis.conf-sample 98_${PN}.conf - fi - - insinto /etc/nagvis - doins -r etc/{conf.d,automaps,geomap,.htaccess,nagvis.ini.php-sample} - fowners apache:root /etc/nagvis - fperms 0664 /etc/nagvis/nagvis.ini.php-sample - dosym /etc/nagvis /usr/share/nagvis/etc - - diropts -o apache -g root -m0775 - insopts -o apache -g root -m0664 - doins -r etc/maps - diropts - insopts - - # move image maps dir from usr to var and symlink it back - dodir /var/nagvis/userfiles/images - mv "${D}"/usr/share/nagvis/userfiles/images/maps "${D}"/var/nagvis/userfiles/images/ ||die - fowners apache:root /var/nagvis/userfiles/images/maps - dosym /var/nagvis/userfiles/images/maps /usr/share/nagvis/userfiles/images/maps -} - -pkg_postinst() { - elog "Before running NagVis for the first time, you will need to set up" - elog "/etc/nagvis/nagvis.ini.php" - elog "A sample is in" - elog "/etc/nagvis/nagvis.ini.php-sample" - if use apache2 ; then - elog - elog "For web interface make sure to add -D NAGVIS to APACHE2_OPTS in" - elog "/etc/conf.d/apache2 and to restart apache2. A default configuration" - elog "has been placed at /etc/apache2/modules.d/98_${PN}.conf" - fi - elog "" - elog "Default user/password are: nagiosadmin/nagiosadmin" - elog " guest/guest" -} diff --git a/profiles/package.mask b/profiles/package.mask index fca9aa450f8..74764243f25 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -475,11 +475,6 @@ www-apps/lxr # /dev (#452248), ignores CFLAGS (#452244). Removal in a month. app-misc/iguanaIR -# Pacho Ramos <[email protected]> (01 Nov 2018) -# Needs a major version bump to a version that is security audited -# (#477742). Removal in a month. -net-analyzer/nagvis - # Pacho Ramos <[email protected]> (01 Nov 2018) # All this packages are broken and need major version bumps to fix them. See # bug #504114, #486510, #510550, #511096, #517260, #551784, #616490, #
