Control: retitle -1 unblock: nagstamon/2.0.1-5
Hi everyone,
I changed the patch to kind of the reverse: It now explicitly does not
call disable_warnings.
Regards,
Moritz
Attached nagstamon_2.0.1-5.debdiff
unblock nagstamon/2.0.1-5
On 03.05.2017 10:13, Moritz Schlarb wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian....@packages.debian.org
> Usertags: unblock
>
> Please unblock package nagstamon
>
> Hi there,
>
> nagstamon/2.0.1-4, which just got uploaded to unstable fixes #861152, which is
> release critical and #774002, which just adds a Recommends for convenience - I
> hope this doesn't prevent the unblock.
>
> Thank you.
>
> Attached nagstamon_2.0.1-4.debdiff
>
> unblock nagstamon/2.0.1-4
>
> -- System Information:
> Debian Release: 8.7
> APT prefers stable-updates
> APT policy: (700, 'stable-updates'), (700, 'stable'), (60, 'testing')
> Architecture: amd64 (x86_64)
> Foreign Architectures: i386
>
> Kernel: Linux 4.9.0-0.bpo.2-amd64 (SMP w/8 CPU cores)
> Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
>
diff -Nru nagstamon-2.0.1/debian/README.debian
nagstamon-2.0.1/debian/README.debian
--- nagstamon-2.0.1/debian/README.debian 1970-01-01 01:00:00.000000000
+0100
+++ nagstamon-2.0.1/debian/README.debian 2017-04-28 21:23:58.000000000
+0200
@@ -0,0 +1,17 @@
+Nagstamon for Debian
+--------------------
+
+Please note that not to verify server certificates is a deliberate decision
+made by upstream (although there is an open issue to make it configurable
+per server) that is shared by the current package maintainers.
+The rationale for this is that monitoring servers are typically not
+intended for broad public access but for a limited group of technically
+trained users. (#861152)
+
+If you see "ImportError: No module named secretstorage" while starting:
+This non-critical message will occur when the recommended package
+python3-secretstorage is not installed. Nagstamon will work regardless,
+but please be aware that your server credentials will be stored
+in plaintext in the config files. (#774002)
+
+ -- Moritz Schlarb <schla...@uni-mainz.de> Fri, 28 Apr 2017 21:06:17 +0200
diff -Nru nagstamon-2.0.1/debian/changelog nagstamon-2.0.1/debian/changelog
--- nagstamon-2.0.1/debian/changelog 2017-01-12 11:27:30.000000000 +0100
+++ nagstamon-2.0.1/debian/changelog 2017-05-03 14:48:11.000000000 +0200
@@ -1,3 +1,25 @@
+nagstamon (2.0.1-5) unstable; urgency=medium
+
+ * Don't disable InsecureRequestWarning warnings from urllib3
+ Closes: #861152
+
+ -- Moritz Schlarb <schla...@uni-mainz.de> Wed, 03 May 2017 14:47:04 +0200
+
+nagstamon (2.0.1-4) unstable; urgency=medium
+
+ * Add Recommends for python3-secretstorage to debian/control
+ Closes: #774002
+ * Fix code for disabling InsecureRequestWarning warnings
+ Closes: #861152
+
+ -- Moritz Schlarb <schla...@uni-mainz.de> Fri, 28 Apr 2017 21:16:17 +0200
+
+nagstamon (2.0.1-1~bpo8+1) jessie-backports; urgency=medium
+
+ * jessie-backports rebuild
+
+ -- Christoph Martin <mar...@uni-mainz.de> Tue, 24 Jan 2017 12:31:59 +0100
+
nagstamon (2.0.1-1) unstable; urgency=medium
[ Moritz Schlarb ]
diff -Nru nagstamon-2.0.1/debian/control nagstamon-2.0.1/debian/control
--- nagstamon-2.0.1/debian/control 2017-01-12 11:27:30.000000000 +0100
+++ nagstamon-2.0.1/debian/control 2017-04-28 11:09:23.000000000 +0200
@@ -16,6 +16,7 @@
Depends: ${python3:Depends}, ${misc:Depends}, python3-pkg-resources,
python3-bs4,
python3-pyqt5, python3-pyqt5.qtsvg, python3-pyqt5.qtmultimedia,
libqt5multimedia5-plugins,
python3-requests, python3-psutil, python3-dbus.mainloop.pyqt5
+Recommends: python3-secretstorage
Description: Nagios status monitor which takes place in systray or on desktop
Nagstamon is a Nagios status monitor which takes place in systray or
on desktop (GNOME, KDE) as floating statusbar to inform you in
diff -Nru nagstamon-2.0.1/debian/patches/not-disable-warnings.patch
nagstamon-2.0.1/debian/patches/not-disable-warnings.patch
--- nagstamon-2.0.1/debian/patches/not-disable-warnings.patch 1970-01-01
01:00:00.000000000 +0100
+++ nagstamon-2.0.1/debian/patches/not-disable-warnings.patch 2017-05-03
14:46:11.000000000 +0200
@@ -0,0 +1,23 @@
+Description: Don't disable InsecureRequestWarning warnings
+Author: Moritz Schlarb <schla...@uni-mainz.de>
+Bug-Debian: https://bugs.debian.org/861152
+Bug-Debian: https://bugs.debian.org/861725
+
+diff --git a/Nagstamon/Servers/Generic.py b/Nagstamon/Servers/Generic.py
+index dd9dcb1..17ebf17 100644
+--- a/Nagstamon/Servers/Generic.py
++++ b/Nagstamon/Servers/Generic.py
+@@ -18,13 +18,6 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA
+
+ import requests
+-# disable annoying InsecureRequestWarning warnings
+-try:
+- requests.packages.urllib3.disable_warnings()
+-except:
+- # older requests version might not have the packages submodule
+- # for example the one in Ubuntu 14.04
+- pass
+
+ import sys
+ import socket
diff -Nru nagstamon-2.0.1/debian/patches/series
nagstamon-2.0.1/debian/patches/series
--- nagstamon-2.0.1/debian/patches/series 2017-01-12 11:27:30.000000000
+0100
+++ nagstamon-2.0.1/debian/patches/series 2017-05-03 14:43:41.000000000
+0200
@@ -1,3 +1,4 @@
+not-disable-warnings.patch
check-for-new-version.patch
no-QtCore-in-setup-py.patch
spelling-error-in-manpage.patch
