[pkg-nagios-changes] [Git][nagios-team/pkg-nagvis][master] 2 commits: Remove dependency on php-php-gettext

[Markus Frosch]

Markus Frosch pushed to branch master at Debian Nagios Maintainer Group / pkg-nagvis


Commits:
4fb1411f by Markus Frosch at 2020-03-24T16:52:21+01:00
Remove dependency on php-php-gettext

Upstream has a vulnerability with CVE-2016-6175

NagVis uses a patched version, which works since NagVis does not use the
vulnerable feature.

Once upstream fixes this, and it gets uploaded to Debian, we should
revert this.

Git-Dch: Full

- - - - -
b5df31fd by Markus Frosch at 2020-03-24T17:02:12+01:00
Update config patch

- - - - -


4 changed files:

- debian/control
- debian/nagvis.links
- debian/patches/config.patch
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -24,7 +24,6 @@ Depends: ${misc:Depends},
          graphviz,
          php-sqlite3,
          php-net-socket,
-         php-php-gettext,
          libjs-jquery
 Suggests: check-mk-livestatus, nagvis-demos
 Description: visualization addon for Nagios or Icinga


=====================================
debian/nagvis.links
=====================================
@@ -3,7 +3,6 @@
 /usr/share/nagvis/docs /usr/share/nagvis/share/docs
 /etc/nagvis	/usr/share/nagvis/etc
 /var/cache/nagvis /usr/share/nagvis/var
-/usr/share/php/php-php-gettext /usr/share/nagvis/share/server/core/ext/php-gettext-1.0.12
 /usr/share/nagvis/defaults/nagvis.ini.php-sample /usr/share/doc/nagvis/nagvis.ini.php-sample
 /usr/share/nagvis/defaults/apache2-nagvis.conf-sample /usr/share/doc/nagvis/apache2-nagvis.conf-sample
 etc/nagvis/apache2.conf etc/apache2/conf-available/nagvis.conf


=====================================
debian/patches/config.patch
=====================================
@@ -9,11 +9,9 @@ Last-Update: 2013-12-12
  share/server/core/defines/global.php        |  6 +++---
  2 files changed, 8 insertions(+), 8 deletions(-)
 
-diff --git a/share/server/core/classes/GlobalMainCfg.php b/share/server/core/classes/GlobalMainCfg.php
-index 65e5ecb..2460503 100644
 --- a/share/server/core/classes/GlobalMainCfg.php
 +++ b/share/server/core/classes/GlobalMainCfg.php
-@@ -1604,11 +1604,11 @@ class GlobalMainCfg {
+@@ -1625,11 +1625,11 @@
       * @author 	Lars Michelsen <lm at larsmichelsen.com>
       */
      private function setPathsByBase($base, $htmlBase) {
@@ -30,11 +28,9 @@ index 65e5ecb..2460503 100644
  
          $this->validConfig['paths']['var']['default']                = $base.'var/';
          $this->validConfig['paths']['sharedvar']['default']          = $base.HTDOCS_DIR.'/var/';
-diff --git a/share/server/core/defines/global.php b/share/server/core/defines/global.php
-index 983cd96..2778f28 100644
 --- a/share/server/core/defines/global.php
 +++ b/share/server/core/defines/global.php
-@@ -75,11 +75,11 @@ define('DEBUGFILE', '../../../var/nagvis-debug.log');
+@@ -75,11 +75,11 @@
  // The last value wins.
  //
  // Path to the main configuration file


=====================================
debian/rules
=====================================
@@ -20,8 +20,6 @@ override_dh_install:
 	rm -rf debian/nagvis/usr/share/nagvis/share/userfiles/
 	# Remove files, we use the symlink to libjs-jquery
 	rm -f debian/nagvis/var/lib/nagvis/userfiles/templates/jquery-*.min.js
-	# We use the external php-gettext lib to avoid copy copies
-	rm -rf debian/nagvis/usr/share/nagvis/share/server/core/ext/php-gettext-1.0.12
 	# Fixing some lintian issues
 	rm -f debian/nagvis/usr/share/nagvis/share/frontend/nagvis-js/ext/dwoo-1.1.0/LICENSE
 	find debian/nagvis/ -name ".gitignore" -delete



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/-/compare/2cd7620b92fd0b2c09aca491b2e90e77b7d2dc15...b5df31fd1b32cf805d703102d20ae086b9b53cb3

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/-/compare/2cd7620b92fd0b2c09aca491b2e90e77b7d2dc15...b5df31fd1b32cf805d703102d20ae086b9b53cb3
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20200324/c5538438/attachment-0001.html>