summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2018-12-01 19:19:19 +0100
committerMichał Górny <mgorny@gentoo.org>2018-12-01 19:19:19 +0100
commit160a88adcc626c622152c184aa537508e5af9d67 (patch)
tree21ce03adf2d9df1eb6d49dd4f4b0eeae199e8ffe /net-analyzer/nagvis/files
parentmedia-plugins/alsaequal: Remove last-rited pkg (diff)
downloadgentoo-160a88adcc626c622152c184aa537508e5af9d67.tar.gz
gentoo-160a88adcc626c622152c184aa537508e5af9d67.tar.bz2
gentoo-160a88adcc626c622152c184aa537508e5af9d67.zip
net-analyzer/nagvis: Remove last-rited pkg
Closes: https://bugs.gentoo.org/477742 Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'net-analyzer/nagvis/files')
-rw-r--r--net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch13
-rw-r--r--net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch30
2 files changed, 0 insertions, 43 deletions
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 771076c4eaa7..000000000000
--- 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 <rkyrylych@op5.com>
- */
- 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 9786b970179f..000000000000
--- 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');