From f8beac1f75d377422eb6097b58abd235d8ed782d Mon Sep 17 00:00:00 2001 From: David Spencer Date: Tue, 29 Aug 2017 18:47:04 +0100 Subject: system/nagvis: Fixed build. privacy.diff patch no longer applied (not needed) and the docs needed tweaking. Signed-off-by: David Spencer --- system/nagvis/global.diff | 36 ++++++++++++++++++++++++++++++++++++ system/nagvis/nagvis.SlackBuild | 5 ++--- system/nagvis/patches/global.diff | 36 ------------------------------------ system/nagvis/patches/privacy.diff | 22 ---------------------- 4 files changed, 38 insertions(+), 61 deletions(-) create mode 100644 system/nagvis/global.diff delete mode 100644 system/nagvis/patches/global.diff delete mode 100644 system/nagvis/patches/privacy.diff (limited to 'system/nagvis') diff --git a/system/nagvis/global.diff b/system/nagvis/global.diff new file mode 100644 index 0000000000..f544dd270e --- /dev/null +++ b/system/nagvis/global.diff @@ -0,0 +1,36 @@ +--- nagvis-1.8rc3/share/server/core/defines/global.php.orig 2015-02-18 01:38:00.696662555 +0100 ++++ nagvis-1.8rc3/share/server/core/defines/global.php 2015-02-18 01:40:33.052563023 +0100 +@@ -79,11 +79,11 @@ + // 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/nagvis.ini.php'); ++define('CONST_MAINCFG_CACHE', '/var/cache/nagvis/nagvis-conf'); + + // Path to the main configuration conf.d directory +-define('CONST_MAINCFG_DIR', '../../../etc/conf.d'); ++define('CONST_MAINCFG_DIR', '/etc/nagvis/conf.d'); + + // The directory below the NagVis root which is shared by the webserver + define('HTDOCS_DIR', 'share'); +--- nagvis-1.8rc3/share/server/core/classes/GlobalMainCfg.php.orig 2015-01-03 18:19:57.000000000 +0100 ++++ nagvis-1.8rc3/share/server/core/classes/GlobalMainCfg.php 2015-02-18 01:43:31.837753573 +0100 +@@ -1516,11 +1516,11 @@ + * @author Lars Michelsen + */ + private function setPathsByBase($base, $htmlBase) { +- $this->validConfig['paths']['cfg']['default'] = $base.'etc/'; +- $this->validConfig['paths']['mapcfg']['default'] = $base.'etc/maps/'; +- $this->validConfig['paths']['geomap']['default'] = $base.'etc/geomap'; +- $this->validConfig['paths']['profiles']['default'] = $base.'etc/profiles'; +- $this->validConfig['global']['authorisation_group_perms_file']['default'] = $base.'etc/perms.db'; ++ $this->validConfig['paths']['cfg']['default'] = '/etc/nagvis/'; ++ $this->validConfig['paths']['mapcfg']['default'] = '/etc/nagvis/maps/'; ++ $this->validConfig['paths']['geomap']['default'] = '/etc/nagvis/geomap'; ++ $this->validConfig['paths']['profiles']['default'] = '/etc/nagvis/profiles'; ++ $this->validConfig['global']['authorisation_group_perms_file']['default'] = '/etc/nagvis/perms.db'; + + $this->validConfig['paths']['var']['default'] = $base.'var/'; + $this->validConfig['paths']['sharedvar']['default'] = $base.HTDOCS_DIR.'/var/'; diff --git a/system/nagvis/nagvis.SlackBuild b/system/nagvis/nagvis.SlackBuild index 2be0aa4a88..d905260602 100644 --- a/system/nagvis/nagvis.SlackBuild +++ b/system/nagvis/nagvis.SlackBuild @@ -50,8 +50,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Patches thanks to Debian folks! -patch -p1 <$CWD/patches/global.diff -patch -p1 <$CWD/patches/privacy.diff +patch -p1 <$CWD/global.diff # Remove cruft find . -type f -name '.gitignore' -exec rm {} \; @@ -64,7 +63,7 @@ cp -a etc/{conf.d,geomap,maps} $PKG/etc/$PRGNAM cp -a share $PKG/usr/share/$PRGNAM cp -a docs/{de_DE,en_US,general} $PKG/usr/doc/$PRGNAM-$VERSION/html cp -a nagvis-make-admin $PKG/usr/doc/$PRGNAM-$VERSION/scripts -cp -a ChangeLog LICENCE README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION mv $PKG/usr/share/$PRGNAM/share/userfiles $PKG/var/lib/$PRGNAM # Put demo maps with documentation diff --git a/system/nagvis/patches/global.diff b/system/nagvis/patches/global.diff deleted file mode 100644 index f544dd270e..0000000000 --- a/system/nagvis/patches/global.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- nagvis-1.8rc3/share/server/core/defines/global.php.orig 2015-02-18 01:38:00.696662555 +0100 -+++ nagvis-1.8rc3/share/server/core/defines/global.php 2015-02-18 01:40:33.052563023 +0100 -@@ -79,11 +79,11 @@ - // 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/nagvis.ini.php'); -+define('CONST_MAINCFG_CACHE', '/var/cache/nagvis/nagvis-conf'); - - // Path to the main configuration conf.d directory --define('CONST_MAINCFG_DIR', '../../../etc/conf.d'); -+define('CONST_MAINCFG_DIR', '/etc/nagvis/conf.d'); - - // The directory below the NagVis root which is shared by the webserver - define('HTDOCS_DIR', 'share'); ---- nagvis-1.8rc3/share/server/core/classes/GlobalMainCfg.php.orig 2015-01-03 18:19:57.000000000 +0100 -+++ nagvis-1.8rc3/share/server/core/classes/GlobalMainCfg.php 2015-02-18 01:43:31.837753573 +0100 -@@ -1516,11 +1516,11 @@ - * @author Lars Michelsen - */ - private function setPathsByBase($base, $htmlBase) { -- $this->validConfig['paths']['cfg']['default'] = $base.'etc/'; -- $this->validConfig['paths']['mapcfg']['default'] = $base.'etc/maps/'; -- $this->validConfig['paths']['geomap']['default'] = $base.'etc/geomap'; -- $this->validConfig['paths']['profiles']['default'] = $base.'etc/profiles'; -- $this->validConfig['global']['authorisation_group_perms_file']['default'] = $base.'etc/perms.db'; -+ $this->validConfig['paths']['cfg']['default'] = '/etc/nagvis/'; -+ $this->validConfig['paths']['mapcfg']['default'] = '/etc/nagvis/maps/'; -+ $this->validConfig['paths']['geomap']['default'] = '/etc/nagvis/geomap'; -+ $this->validConfig['paths']['profiles']['default'] = '/etc/nagvis/profiles'; -+ $this->validConfig['global']['authorisation_group_perms_file']['default'] = '/etc/nagvis/perms.db'; - - $this->validConfig['paths']['var']['default'] = $base.'var/'; - $this->validConfig['paths']['sharedvar']['default'] = $base.HTDOCS_DIR.'/var/'; diff --git a/system/nagvis/patches/privacy.diff b/system/nagvis/patches/privacy.diff deleted file mode 100644 index 02f85795f6..0000000000 --- a/system/nagvis/patches/privacy.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- nagvis-1.8rc3/docs/en_US/toc.html.orig 2015-01-03 18:19:57.000000000 +0100 -+++ nagvis-1.8rc3/docs/en_US/toc.html 2015-02-18 01:49:13.318570773 +0100 -@@ -74,7 +74,7 @@ -

(*) New in 1.8

-
-

NagVis Logo

--

SourceForge.net Logo

-+

SourceForge.net

-
- - ---- nagvis-1.8rc3/docs/de_DE/toc.html.orig 2015-01-03 18:19:57.000000000 +0100 -+++ nagvis-1.8rc3/docs/de_DE/toc.html 2015-02-18 01:50:04.417197043 +0100 -@@ -77,7 +77,7 @@ - --> -
-

NagVis Logo

--

SourceForge.net Logo

-+

SourceForge.net

-
- - -- cgit v1.2.3