[pkg-nagios-changes] [Git][nagios-team/pkg-nagvis][master] 7 commits: Update my maintainer mail address
Markus Frosch
gitlab at salsa.debian.org
Fri Jan 25 19:28:07 GMT 2019
Markus Frosch pushed to branch master at Debian Nagios Maintainer Group / pkg-nagvis
Commits:
809595de by Markus Frosch at 2019-01-25T18:14:59Z
Update my maintainer mail address
- - - - -
dd9327f9 by Markus Frosch at 2019-01-25T18:23:02Z
Update debhelper compat to 9
- - - - -
66ea38a6 by Markus Frosch at 2019-01-25T18:27:50Z
Update priority to optional
- - - - -
9b75bfcd by Markus Frosch at 2019-01-25T18:32:37Z
Minor fixes to README.Debian
Git-Dch: ignore
- - - - -
b2703e74 by Markus Frosch at 2019-01-25T18:53:32Z
Include missing sources or document them
- - - - -
9189b838 by Markus Frosch at 2019-01-25T19:05:14Z
Update copyright
- - - - -
214e2e54 by Markus Frosch at 2019-01-25T19:16:23Z
Use libjs-jquery package instead for templates
- - - - -
15 changed files:
- debian/README.Debian
- debian/compat
- debian/control
- debian/copyright
- + debian/missing-sources/ExtStacktrace.js
- + debian/missing-sources/ExtStacktrace.txt
- + debian/missing-sources/jquery-3.2.1.js
- + debian/missing-sources/jquery-3.2.1.min.map
- + debian/missing-sources/select2.js
- debian/nagvis.links
- debian/nagvis.lintian-overrides
- + debian/patches/jquery_path.patch
- debian/patches/series
- debian/rules
- + debian/source/lintian-overrides
Changes:
=====================================
debian/README.Debian
=====================================
@@ -12,18 +12,15 @@ and running:
1) Actiate the check-mk-livestatus backend (if not already done).
2) Grant the www-data User Access to the check-mk-livestatus socket.
-See sections bellow for details.
-
+See sections below for details.
Passwords
=========
-After successfull installation you should be able to access NagVis via
+After successful installation you should be able to access NagVis via
http://$host/nagvis/. To login you can use the user accoung "admin"
(password "admin") or "guest" (with password "guest").
-
-
Using NagVis with Icinga:
=========================
=====================================
debian/compat
=====================================
@@ -1 +1 @@
-7
+9
=====================================
debian/control
=====================================
@@ -1,11 +1,11 @@
Source: nagvis
Section: net
-Priority: extra
+Priority: optional
Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
-Uploaders: Markus Frosch <markus at lazyfrosch.de>,
+Uploaders: Markus Frosch <lazyfrosch at debian.org>,
Alexander Wirt <formorer at debian.org>,
Jan Wagner <waja at cyconet.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 9),
quilt,
po-debconf
Standards-Version: 4.3.0
@@ -23,7 +23,8 @@ Depends: ${misc:Depends},
graphviz,
php-sqlite3,
php-net-socket,
- php-php-gettext
+ php-php-gettext,
+ libjs-jquery
Suggests: check-mk-livestatus, nagvis-demos
Description: visualization addon for Nagios or Icinga
NagVis can be used to visualize Nagios or Icinga data, for instance
=====================================
debian/copyright
=====================================
@@ -14,13 +14,13 @@ Copyright: Copyright 2007-2012, Debian Nagios Maintainer Group <pkg-nagios-devel
Copyright 2009, Alexander Wirt <formorer at debian.org>
Copyright 2009, Jan Wagner <waja at debian.org>
Copyright 2011-2012, Alexander Reichle-Schmehl <tolimar at debian.org>
- Copyright 2013, Markus Frosch <markus at lazyfrosch.de>
+ Copyright 2013, 2019, Markus Frosch <lazyfrosch at debian.org>
and contributors
License: GPL-2+
-Files: share/frontend/nagvis-js/ext/dwoo-1.1.0/*
+Files: share/frontend/nagvis-js/ext/dwoo-*
Copyright: (c) 2008, Jordi Boggiano
-License: BSD
+License: BSD-3-Clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
@@ -44,39 +44,72 @@ License: BSD
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Files: share/netmap/library/Zend/*
-Copyright: (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
-License: BSD
- Redistribution and use in source and binary forms, with or without modification,
+Files: share/server/core/ext/php-gettext-*
+Copyright: 2005 Steven Armstrong <sa at c-area dot ch>
+ 2003, 2005, 2006, 2009 Danilo Segan <danilo at kvota.net>
+ 2005 Nico Kaiser <nico at siriux.net>
+License: GPL-2+
+
+Files: share/userfiles/templates/jquery*
+Copyright: 2018 JS Foundation and other contributors
+License: MIT
+
+Files: share/userfiles/templates/select2* debian/missing-sources/select2*
+Copyright: 2012-2017 Kevin Brown, Igor Vaynberg, and Select2 contributors
+License: MIT
+
+Files: share/frontend/nagvis-js/js/ExtStacktrace.js debian/missing-sources/ExtStacktrace.js
+Copyright: Eric Wendelin http://eriwen.com/ (2008)
+ Luke Smith http://lucassmith.name/ (2008)
+ Loic Dachary <loic at dachary.org> (2008)
+ Johan Euphrosine <proppy at aminche.com> (2008)
+ Øyvind Sean Kinsey http://kinsey.no/blog (2010)
+License: public-domain with BSD-3-Clause exception
+ Domain Public by Eric Wendelin http://eriwen.com/ (2008)
+ Luke Smith http://lucassmith.name/ (2008)
+ Loic Dachary <loic at dachary.org> (2008)
+ Johan Euphrosine <proppy at aminche.com> (2008)
+ Øyvind Sean Kinsey http://kinsey.no/blog (2010)
+ .
+ Information and discussions
+ http://jspoker.pokersource.info/skin/test-printstacktrace.html
+ http://eriwen.com/javascript/js-stack-trace/
+ http://eriwen.com/javascript/stacktrace-update/
+ http://pastie.org/253058
+ http://browsershots.org/http://jspoker.pokersource.info/skin/test-printstacktrace.html
+ .
+ guessFunctionNameFromLines comes from firebug
+ .
+ Software License Agreement (BSD License)
+ .
+ Copyright (c) 2007, Parakey Inc.
+ All rights reserved.
+ .
+ Redistribution and use of this software in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
.
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
+ * Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the
+ following disclaimer.
.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
.
- * Neither the name of Zend Technologies USA, Inc. nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
+ * Neither the name of Parakey Inc. nor the names of its
+ contributors may be used to endorse or promote products
+ derived from this software without specific prior
+ written permission of Parakey Inc.
.
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: share/server/core/ext/php-gettext-1.0.9/*
-Copyright: 2005 Steven Armstrong <sa at c-area dot ch>
- 2003, 2005, 2006, 2009 Danilo Segan <danilo at kvota.net>
- 2005 Nico Kaiser <nico at siriux.net>
-License: GPL-2+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
License: GPL-2+
This package is free software; you can redistribute it and/or modify
@@ -91,3 +124,22 @@ License: GPL-2+
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2"
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
=====================================
debian/missing-sources/ExtStacktrace.js
=====================================
@@ -0,0 +1,300 @@
+// Domain Public by Eric Wendelin http://eriwen.com/ (2008)
+// Luke Smith http://lucassmith.name/ (2008)
+// Loic Dachary <loic at dachary.org> (2008)
+// Johan Euphrosine <proppy at aminche.com> (2008)
+// Øyvind Sean Kinsey http://kinsey.no/blog (2010)
+//
+// Information and discussions
+// http://jspoker.pokersource.info/skin/test-printstacktrace.html
+// http://eriwen.com/javascript/js-stack-trace/
+// http://eriwen.com/javascript/stacktrace-update/
+// http://pastie.org/253058
+// http://browsershots.org/http://jspoker.pokersource.info/skin/test-printstacktrace.html
+//
+
+//
+// guessFunctionNameFromLines comes from firebug
+//
+// Software License Agreement (BSD License)
+//
+// Copyright (c) 2007, Parakey Inc.
+// All rights reserved.
+//
+// Redistribution and use of this software in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above
+// copyright notice, this list of conditions and the
+// following disclaimer.
+//
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the
+// following disclaimer in the documentation and/or other
+// materials provided with the distribution.
+//
+// * Neither the name of Parakey Inc. nor the names of its
+// contributors may be used to endorse or promote products
+// derived from this software without specific prior
+// written permission of Parakey Inc.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/**
+ *
+ * @cfg {Error} e The error to create a stacktrace from (optional)
+ * @cfg {Boolean} guess If we should try to resolve the names of anonymous functions
+ */
+function printStackTrace(options) {
+ var ex = (options && options.e) ? options.e : null;
+ var guess = options ? !!options.guess : true;
+
+ var p = new printStackTrace.implementation();
+ var result = p.run(ex);
+ return (guess) ? p.guessFunctions(result) : result;
+}
+
+printStackTrace.implementation = function() {};
+
+printStackTrace.implementation.prototype = {
+ run: function(ex) {
+ // Use either the stored mode, or resolve it
+ var mode = this._mode || this.mode();
+ if (mode === 'other') {
+ return this.other(arguments.callee);
+ } else {
+ ex = ex ||
+ (function() {
+ try {
+ (0)();
+ } catch (e) {
+ return e;
+ }
+ })();
+ return this[mode](ex);
+ }
+ },
+
+ mode: function() {
+ try {
+ (0)();
+ } catch (e) {
+ if (e.arguments) {
+ return (this._mode = 'chrome');
+ } else if (window.opera && e.stacktrace) {
+ return (this._mode = 'opera10');
+ } else if (e.stack) {
+ return (this._mode = 'firefox');
+ } else if (window.opera && !('stacktrace' in e)) { //Opera 9-
+ return (this._mode = 'opera');
+ }
+ }
+ return (this._mode = 'other');
+ },
+
+ chrome: function(e) {
+ return e.stack.replace(/^.*?\n/, '').
+ replace(/^.*?\n/, '').
+ replace(/^.*?\n/, '').
+ replace(/^[^\(]+?[\n$]/gm, '').
+ replace(/^\s+at\s+/gm, '').
+ replace(/^Object.<anonymous>\s*\(/gm, '{anonymous}()@').
+ split('\n');
+ },
+
+ firefox: function(e) {
+ return e.stack.replace(/^.*?\n/, '').
+ replace(/(?:\n@:0)?\s+$/m, '').
+ replace(/^\(/gm, '{anonymous}(').
+ split('\n');
+ },
+
+ opera10: function(e) {
+ var stack = e.stacktrace;
+ var lines = stack.split('\n'), ANON = '{anonymous}',
+ lineRE = /.*?line (\d+), column (\d+) in ((<anonymous function\:?\s*(\S+))|([^\(]+)\([^\)]*\))(?: in )?(.*)\s*$/i, i, j, len;
+ for (i = 2, j = 0, len = lines.length; i < len - 2; i++) {
+ if (lineRE.test(lines[i])) {
+ var location = RegExp.$6 + ':' + RegExp.$1 + ':' + RegExp.$2;
+ var fnName = RegExp.$3;
+ fnName = fnName.replace(/<anonymous function\s?(\S+)?>/g, ANON);
+ lines[j++] = fnName + '@' + location;
+ }
+ }
+
+ lines.splice(j, lines.length - j);
+ return lines;
+ },
+
+ // Opera 7.x-9.x only!
+ opera: function(e) {
+ var lines = e.message.split('\n'), ANON = '{anonymous}',
+ lineRE = /Line\s+(\d+).*?script\s+(http\S+)(?:.*?in\s+function\s+(\S+))?/i, i, j, len;
+
+ for (i = 4, j = 0, len = lines.length; i < len; i += 2) {
+ if (lineRE.test(lines[i])) {
+ lines[j++] = (RegExp.$3 ? RegExp.$3 + '()@' + RegExp.$2 + RegExp.$1 : ANON + '()@' + RegExp.$2 + ':' + RegExp.$1) + ' -- ' + lines[i + 1].replace(/^\s+/, '');
+ }
+ }
+
+ lines.splice(j, lines.length - j);
+ return lines;
+ },
+
+ // Safari, IE, and others
+ other: function(curr) {
+ var ANON = '{anonymous}', fnRE = /function\s*([\w\-$]+)?\s*\(/i, stack = [], j = 0, fn, args;
+
+ var maxStackSize = 10;
+ while (curr && stack.length < maxStackSize) {
+ fn = fnRE.test(curr.toString()) ? RegExp.$1 || ANON : ANON;
+ args = Array.prototype.slice.call(curr['arguments']);
+ stack[j++] = fn + '(' + printStackTrace.implementation.prototype.stringifyArguments(args) + ')';
+ curr = curr.caller;
+ }
+ return stack;
+ },
+
+ /**
+ * @return given arguments array as a String, subsituting type names for non-string types.
+ */
+ stringifyArguments: function(args) {
+ for (var i = 0; i < args.length; ++i) {
+ var arg = args[i];
+ if (arg === undefined) {
+ args[i] = 'undefined';
+ } else if (arg === null) {
+ args[i] = 'null';
+ } else if (arg.constructor) {
+ if (arg.constructor === Array) {
+ if (arg.length < 3) {
+ args[i] = '[' + this.stringifyArguments(arg) + ']';
+ } else {
+ args[i] = '[' + this.stringifyArguments(Array.prototype.slice.call(arg, 0, 1)) + '...' + this.stringifyArguments(Array.prototype.slice.call(arg, -1)) + ']';
+ }
+ } else if (arg.constructor === Object) {
+ args[i] = '#object';
+ } else if (arg.constructor === Function) {
+ args[i] = '#function';
+ } else if (arg.constructor === String) {
+ args[i] = '"' + arg + '"';
+ }
+ }
+ }
+ return args.join(',');
+ },
+
+ sourceCache: {},
+
+ /**
+ * @return the text from a given URL.
+ */
+ ajax: function(url) {
+ var req = this.createXMLHTTPObject();
+ if (!req) {
+ return;
+ }
+ req.open('GET', url, false);
+ req.setRequestHeader('User-Agent', 'XMLHTTP/1.0');
+ req.send('');
+ return req.responseText;
+ },
+
+ createXMLHTTPObject: function() {
+ // Try XHR methods in order and store XHR factory
+ var xmlhttp, XMLHttpFactories = [
+ function() {
+ return new XMLHttpRequest();
+ }, function() {
+ return new ActiveXObject('Msxml2.XMLHTTP');
+ }, function() {
+ return new ActiveXObject('Msxml3.XMLHTTP');
+ }, function() {
+ return new ActiveXObject('Microsoft.XMLHTTP');
+ }
+ ];
+ for (var i = 0; i < XMLHttpFactories.length; i++) {
+ try {
+ xmlhttp = XMLHttpFactories[i]();
+ // Use memoization to cache the factory
+ this.createXMLHTTPObject = XMLHttpFactories[i];
+ return xmlhttp;
+ } catch (e) {}
+ }
+ },
+
+ /**
+ * Given a URL, check if it is in the same domain (so we can get the source via Ajax).
+ *
+ * @param url <String> source url
+ * @return False if we need a cross-domain request
+ */
+ isSameDomain: function(url) {
+ return url.indexOf(location.hostname) !== -1;
+ },
+
+ /**
+ * Get source code from given URL if in the same domain.
+ *
+ * @param url <String> JS source URL
+ * @return <String> Source code
+ */
+ getSource: function(url) {
+ if (!(url in this.sourceCache)) {
+ this.sourceCache[url] = this.ajax(url).split('\n');
+ }
+ return this.sourceCache[url];
+ },
+
+ guessFunctions: function(stack) {
+ for (var i = 0; i < stack.length; ++i) {
+ var reStack = /{anonymous}\(.*\)@(\w+:\/\/([-\w\.]+)+(:\d+)?[^:]+):(\d+):?(\d+)?/;
+ var frame = stack[i], m = reStack.exec(frame);
+ if (m) {
+ var file = m[1], lineno = m[4]; //m[7] is character position in Chrome
+ if (file && this.isSameDomain(file) && lineno) {
+ var functionName = this.guessFunctionName(file, lineno);
+ stack[i] = frame.replace('{anonymous}', functionName);
+ }
+ }
+ }
+ return stack;
+ },
+
+ guessFunctionName: function(url, lineNo) {
+ try {
+ return this.guessFunctionNameFromLines(lineNo, this.getSource(url));
+ } catch (e) {
+ return 'getSource failed with url: ' + url + ', exception: ' + e.toString();
+ }
+ },
+
+ guessFunctionNameFromLines: function(lineNo, source) {
+ var reFunctionArgNames = /function ([^(]*)\(([^)]*)\)/;
+ var reGuessFunction = /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*(function|eval|new Function)/;
+ // Walk backwards from the first line in the function until we find the line which
+ // matches the pattern above, which is the function definition
+ var line = "", maxLines = 10;
+ for (var i = 0; i < maxLines; ++i) {
+ line = source[lineNo - i] + line;
+ if (line !== undefined) {
+ var m = reGuessFunction.exec(line);
+ if (m && m[1]) {
+ return m[1];
+ } else {
+ m = reFunctionArgNames.exec(line);
+ if (m && m[1]) {
+ return m[1];
+ }
+ }
+ }
+ }
+ return '(?)';
+ }
+};
=====================================
debian/missing-sources/ExtStacktrace.txt
=====================================
@@ -0,0 +1 @@
+From https://github.com/stacktracejs/stacktrace.js/blob/4644ca2eda286ba5fe35d972d06b3f139460b69a/stacktrace.js
=====================================
debian/missing-sources/jquery-3.2.1.js
=====================================
The diff for this file was not included because it is too large.
=====================================
debian/missing-sources/jquery-3.2.1.min.map
=====================================
The diff for this file was not included because it is too large.
=====================================
debian/missing-sources/select2.js
=====================================
The diff for this file was not included because it is too large.
=====================================
debian/nagvis.links
=====================================
@@ -7,3 +7,6 @@
/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
+usr/share/javascript/jquery/jquery.js var/lib/nagvis/userfiles/templates/jquery.js
+usr/share/javascript/jquery/jquery.min.js var/lib/nagvis/userfiles/templates/jquery.min.js
+usr/share/javascript/jquery/jquery.min.map var/lib/nagvis/userfiles/templates/jquery.min.map
=====================================
debian/nagvis.lintian-overrides
=====================================
@@ -3,3 +3,6 @@
apache2-reverse-dependency-calls-invoke-rc.d postrm
apache2-reverse-dependency-calls-wrapper-script postinst a2enmod
apache2-reverse-dependency-calls-invoke-rc.d postinst
+
+# user and group
+spelling-error-in-readme-debian nagios nagios (duplicate word) nagios
=====================================
debian/patches/jquery_path.patch
=====================================
@@ -0,0 +1,15 @@
+Description: Remove version from jquery.min.js filename
+ So we can use a symlink to libjs-jquery
+Author: Markus Frosch <lazyfrosch at debian.org>
+Last-Update: 2019-01-25
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/share/userfiles/templates/on-demand-filter.header.html
++++ b/share/userfiles/templates/on-demand-filter.header.html
+@@ -1,5 +1,5 @@
+ <script type="text/javascript" src="{$pathTemplates}default.header.js"></script>
+-<script type="text/javascript" src="{$pathTemplates}jquery-3.2.1.min.js"></script>
++<script type="text/javascript" src="{$pathTemplates}jquery.min.js"></script>
+ <script type="text/javascript" src="{$pathTemplates}select2.min.js"></script>
+ <link href="{$pathTemplates}select2.min.css" rel="stylesheet" />
+ <script type="text/javascript">
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
config.patch
+jquery_path.patch
=====================================
debian/rules
=====================================
@@ -18,6 +18,8 @@ override_dh_install:
# they are installed by the more general copy of the content of
# /usr/share/nagvis/share
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
=====================================
debian/source/lintian-overrides
=====================================
@@ -0,0 +1,2 @@
+# see share/frontend/nagvis-js/js/ExtLeaflet-src.js
+source-is-missing share/frontend/nagvis-js/js/ExtLeaflet.js line length is 32126 characters (>512)
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/compare/0887b4b4608b7dcad9aed17503e7991844cde85d...214e2e548238879da85a77d7186c57e545eca0a3
--
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagvis/compare/0887b4b4608b7dcad9aed17503e7991844cde85d...214e2e548238879da85a77d7186c57e545eca0a3
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/20190125/d0f3a31a/attachment-0001.html>
More information about the pkg-nagios-changes
mailing list