Hi fellows,
I've got a 1.9.10 nagvis package ready in salsa[0], that fixes four of
the currently open bugs including this one. I've also manually included
1:1.7.10+dfsg1-3.2, which wasn't present in the salsa repository.
Would you like an actual MR ? I'm also attaching a debdiff of debian/*
to this report, and pasting the corresponding changelog here:
,----
| Source: nagvis
| Version: 1:1.9.10-1
| Distribution: unstable
| Urgency: medium
| Maintainer: Sebastien Delafond <s...@debian.org>
| Timestamp: 1544597179
| Date: Wed, 12 Dec 2018 07:46:19 +0100
| Closes: 858042 893723 903369 903706
| Changes:
| nagvis (1:1.9.10-1) unstable; urgency=medium
| .
| [ Bas Couwenberg ]
| * Team upload.
| * Update watch file for move to GitHub.
| * Bump Standards-Version to 4.2.1, no changes.
| .
| [ Sebastien Delafond ]
| * NMU
| * Imported Debian patch 1:1.7.10+dfsg1-3.2
| * Update php-gettext link
| * Add Files-Excluded to debian/copyright, even though those files are
| gone in 1.9.x: this will make further repacking more straightforward,
| should it be needed
| * Add repacksuffix to debian/watch
| * New upstream version 1.9.10 (Closes: #893723, #903706)
| * Use db_stop at the end of postinst (Closes: #858042)
| * Add pt_BR translation (Closes: #903369)
| * Update Vcs-* URLs to point to salsa
`----
Unless you object, I plan on uploading this to delayed/10 later this
week: the RC bug is 9 months old, and the last uploads of nagvis are all
quite old and were all NMUs as well.
Cheers,
--
Seb
[0] https://salsa.debian.org/seb/pkg-nagvis
diff --git a/debian/changelog b/debian/changelog
index 3d2348a2..bcd3fec8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+nagvis (1:1.9.10-1) unstable; urgency=medium
+
+ [ Bas Couwenberg ]
+ * Team upload.
+ * Update watch file for move to GitHub.
+ * Bump Standards-Version to 4.2.1, no changes.
+
+ [ Sebastien Delafond ]
+ * NMU
+ * Imported Debian patch 1:1.7.10+dfsg1-3.2
+ * Update php-gettext link
+ * Add Files-Excluded to debian/copyright, even though those files are
+ gone in 1.9.x: this will make further repacking more straightforward,
+ should it be needed
+ * Add repacksuffix to debian/watch
+ * New upstream version 1.9.10 (Closes: #893723, #903706)
+ * Use db_stop at the end of postinst (Closes: #858042)
+ * Add pt_BR translation (Closes: #903369)
+ * Update Vcs-* URLs to point to salsa
+
+ -- Sebastien Delafond <s...@debian.org> Wed, 12 Dec 2018 07:46:19 +0100
+
nagvis (1:1.7.10+dfsg1-3.2) UNRELEASED; urgency=medium
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index ea96db7a..3f07e28f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,10 @@ Uploaders: Markus Frosch <mar...@lazyfrosch.de>,
Build-Depends: debhelper (>= 7.0.50~),
quilt,
po-debconf
-Standards-Version: 3.9.5
+Standards-Version: 4.2.1
Homepage: http://www.nagvis.org
-Vcs-Git: git://anonscm.debian.org/pkg-nagios/pkg-nagvis.git
-Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=pkg-nagios/pkg-nagvis.git;a=summary
+Vcs-Git: https://salsa.debian.org/nagios-team/pkg-nagvis.git
+Vcs-Browser: https://salsa.debian.org/nagios-team/pkg-nagvis
Package: nagvis
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 9a80d868..e5d43b49 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: NagVis
Source: http://sourceforge.net/projects/nagvis/files/
+Files-Excluded: uifx share/netmap/shell.html share/netmap/shell.swf
share/netmap/modules/gmap
Files: *
Copyright: Copyright 2007-2013, Lars Michelsen <l...@vertical-visions.de>
diff --git a/debian/nagvis.links b/debian/nagvis.links
index 2a2622e0..f00b2429 100644
--- a/debian/nagvis.links
+++ b/debian/nagvis.links
@@ -3,7 +3,7 @@
/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.9
+/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
diff --git a/debian/nagvis.postinst b/debian/nagvis.postinst
old mode 100644
new mode 100755
index 4220b70e..c5243614
--- a/debian/nagvis.postinst
+++ b/debian/nagvis.postinst
@@ -198,6 +198,8 @@ case "$1" in
;;
esac
+db_stop
+
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
diff --git a/debian/patches/config.patch b/debian/patches/config.patch
index e056f9f6..27cb63af 100644
--- a/debian/patches/config.patch
+++ b/debian/patches/config.patch
@@ -1,12 +1,40 @@
-Description: Change nagvis config paths for Debian
-Author: Alexander Reichle-Schmehl <toli...@debian.org>
+From: Alexander Reichle-Schmehl <toli...@debian.org>
+Date: Wed, 12 Dec 2018 07:53:28 +0100
+Subject: Change nagvis config paths for Debian
+
Reviewed-by: Markus Frosch <mar...@lazyfrosch.de>
Last-Update: 2013-12-12
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ share/server/core/classes/GlobalMainCfg.php | 10 +++++-----
+ 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 {
+ * @author Lars Michelsen <l...@larsmichelsen.com>
+ */
+ 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/perms.db';
+
+ $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
-@@ -79,11 +79,11 @@
+@@ -75,11 +75,11 @@ define('DEBUGFILE', '../../../var/nagvis-debug.log');
// The last value wins.
//
// Path to the main configuration file
@@ -21,20 +49,3 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
// The directory below the NagVis root which is shared by the webserver
define('HTDOCS_DIR', 'share');
---- a/share/server/core/classes/GlobalMainCfg.php
-+++ b/share/server/core/classes/GlobalMainCfg.php
-@@ -1344,10 +1344,10 @@
- * @author Lars Michelsen <l...@vertical-visions.de>
- */
- 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['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['paths']['var']['default'] =
$base.'var/';
- $this->validConfig['paths']['sharedvar']['default'] =
$base.HTDOCS_DIR.'/var/';
diff --git a/debian/patches/privacy-breach b/debian/patches/privacy-breach
deleted file mode 100644
index 862ffe73..00000000
--- a/debian/patches/privacy-breach
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Cleanup for possible privacy breaches
-Author: Markus Frosch <mar...@lazyfrosch.de>
-Last-Update: 2013-12-27
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/docs/de_DE/toc.html
-+++ b/docs/de_DE/toc.html
-@@ -77,7 +77,7 @@
- -->
- <div style="text-align:center;margin-top:20px;">
- <p><a href="http://www.nagvis.org"; style="margin: 0px;"
class="nostyle"><img width="88" height="23" border="0" alt="NagVis Logo"
src="../general/img/logo-88x23.png" style="margin: 0px;" /></a></p>
-- <p><a href="http://sourceforge.net"; style="margin: 0px;"
class="nostyle"><img width="88" height="31" border="0" alt="SourceForge.net
Logo" src="http://sflogo.sourceforge.net/sflogo.php?group_id=132019&type=1";
style="margin: 0px;" /></a></p>
-+ <p><a href="http://sourceforge.net"; style="margin: 0px;"
class="nostyle">SourceForge.net</a></p>
- </div>
- </body>
- </html>
---- a/docs/en_US/toc.html
-+++ b/docs/en_US/toc.html
-@@ -68,7 +68,7 @@
- <p>(<font style="color:#ff0000;">*</font>) New in 1.7</p>
- <div style="text-align:center;margin-top:20px;">
- <p><a href="http://www.nagvis.org"; style="margin: 0px;"
class="nostyle"><img width="88" height="23" border="0" alt="NagVis Logo"
src="../general/img/logo-88x23.png" style="margin: 0px;" /></a></p>
-- <p><a href="http://sourceforge.net"; style="margin: 0px;"
class="nostyle"><img width="88" height="31" border="0" alt="SourceForge.net
Logo" src="http://sflogo.sourceforge.net/sflogo.php?group_id=132019&type=1";
style="margin: 0px;" /></a></p>
-+ <p><a href="http://sourceforge.net"; style="margin: 0px;"
class="nostyle">SourceForge.net</a></p>
- </div>
- </body>
- </html>
diff --git a/debian/patches/remove-shell-swf b/debian/patches/remove-shell-swf
deleted file mode 100644
index f88acec2..00000000
--- a/debian/patches/remove-shell-swf
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Disabling netmap component for Debian
- The component has been removed because it's non-free.
-Author: Alexander Reichle-Schmehl <toli...@debian.org>
-Reviewed-by: Markus Frosch <mar...@lazyfrosch.de>
-Last-Update: 2013-12-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/share/frontend/nagvis-js/js/frontend.js
-+++ b/share/frontend/nagvis-js/js/frontend.js
-@@ -1410,8 +1410,8 @@
- oTr.appendChild(oTd);
-
- // Link
-- var oLink = document.createElement('a');
-- oLink.href = oGeneralProperties.path_base+'/netmap/shell.html';
-+// var oLink = document.createElement('a');
-+// oLink.href = oGeneralProperties.path_base+'/netmap/shell.html';
-
- // Status image
- var oImg = document.createElement('img');
-@@ -1419,17 +1419,17 @@
- oImg.src = oGeneralProperties.path_iconsets+'std_small_unknown.png';
- oImg.alt = 'geomap';
-
-- oLink.appendChild(oImg);
-+// oLink.appendChild(oImg);
- oImg = null;
-
- // Title
- var h2 = document.createElement('h2');
- h2.appendChild(document.createTextNode('Geomap'));
-- oLink.appendChild(h2);
-+// oLink.appendChild(h2);
- h2 = null;
-
- var br = document.createElement('br');
-- oLink.appendChild(br);
-+// oLink.appendChild(br);
- br = null;
-
- // Only show map thumb when configured
-@@ -1442,8 +1442,8 @@
- oImg = null;
- }
-
-- oTd.appendChild(oLink);
-- oLink = null;
-+// oTd.appendChild(oLink);
-+// oLink = null;
-
- oTd = null;
-
diff --git a/debian/patches/series b/debian/patches/series
index bf44efdf..4462183f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
config.patch
-remove-shell-swf
-privacy-breach
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
new file mode 100644
index 00000000..59eba369
--- /dev/null
+++ b/debian/po/pt_BR.po
@@ -0,0 +1,74 @@
+# Debconf translations for nagvis
+# Copyright (C) 2012 THE nagvis'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the nagvis package.
+# Eder L. Marques <e...@edermarques.net>, 2012
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nagvis\n"
+"Report-Msgid-Bugs-To: nag...@packages.debian.org\n"
+"POT-Creation-Date: 2013-12-19 21:38+0100\n"
+"PO-Revision-Date: 2018-07-08 21:27-0300\n"
+"Last-Translator: Eder L. Marques <e...@edermarques.net>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../nagvis.templates:2001
+msgid "other"
+msgstr "outra"
+
+#. Type: select
+#. Description
+#: ../nagvis.templates:2002
+msgid "Monitoring suite used with NagVis:"
+msgstr "Suíte de monitoramento usada com o NagVis:"
+
+#. Type: select
+#. Description
+#: ../nagvis.templates:2002
+msgid ""
+"The NagVis package supports Icinga as well as Nagios, using the check-mk-"
+"live broker backend."
+msgstr ""
+"O pacote NagVis suporta tanto o Icinga quanto o Nagios, usando o backend "
+"broker check-mk-live."
+
+#. Type: select
+#. Description
+#: ../nagvis.templates:2002
+msgid ""
+"If you would like to use NagVis with a different backend or a different "
+"monitoring suite, please choose \"other\". You'll have to configure it "
+"manually."
+msgstr ""
+"Se você quiser usar o NagVis com um backend diferente ou uma suíte de "
+"monitoramento diferente, por favor, escolha \"outra\". Você terá que "
+"configurá-la manualmente."
+
+#. Type: boolean
+#. Description
+#: ../nagvis.templates:3001
+msgid "Delete NagVis data when purging the package?"
+msgstr ""
+"Apagar os dados do NagVis quando remover completamente (\"purge\") o pacote?"
+
+#. Type: boolean
+#. Description
+#: ../nagvis.templates:3001
+msgid ""
+"NagVis creates files in /var/{cache,lib}/nagvis and /etc/nagvis (for "
+"instance background images and map files), including a small database for "
+"authentification. If you don't need any of these files, they can be removed "
+"now, or you may want to keep them and clean up by hand later."
+msgstr ""
+"O NagVis cria arquivos em /var/{cache,lib}/nagvis e /etc/nagvis (por "
+"exemplo, imagens de fundo e arquivos de mapa), incluindo uma pequena base de "
+"dados para autenticação. Se você não precisa de nenhum desses arquivos, eles "
+"podem ser removidos agora, ou você pode querer mantê-los e fazer a limpeza "
+"manualmente depois."
diff --git a/debian/rules b/debian/rules
index 98d7f7b1..c645d895 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ override_dh_install:
# /usr/share/nagvis/share
rm -rf debian/nagvis/usr/share/nagvis/share/userfiles/
# 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.9
+ 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
diff --git a/debian/watch b/debian/watch
index 978841f2..4e98232f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,8 @@
version=3
-opts=dversionmangle=s/\+dfsg\.?\d+$// \
-http://sf.net/nagvis/nagvis-([\d\.]*)\.tar\.gz
+opts=\
+dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;s/\-/\./g,\
+repacksuffix=+dfsg,\
+filenamemangle=s/(?:.*?)?(?:rel|v|nagvis)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/nagvis-$1.$2/
\
+https://github.com/NagVis/nagvis/releases \
+(?:.*?/)?(?:rel|v|nagvis)?[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
