Your message dated Sun, 14 Mar 2021 13:10:35 +0000
with message-id <[email protected]>
and subject line unblock nagios-check-xmppng
has caused the Debian Bug report #985145,
regarding unblock: nagios-check-xmppng/0.3.2-3
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
985145: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=985145
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package nagios-check-xmppng
I am upstream of the packaged plugin and received a bug report [1] just
a few days before the end of the soft freeze. The bugfix is quite
minimal and just removes a certificate statistic check. I tested the
plugin against a set of XMPP servers with the Python version in testing
and it worked fine.
[1] https://git.dittberner.info/jan/check_xmppng/issues/2
[ Reason ]
The package that is currently in testing still has the bug and only
works on XMPP servers that allow non TLS connections. The new version
fixes the broken TLS handling.
[ Impact ]
The users will have a version of the plugin that will not be usable to
check working TLS functionality of their XMPP servers.
[ Tests ]
I tested against a set of XMPP servers (my own one and the server of the
upstream bug reporter). Piuparts is happy and I tested the package
installation on a workstation machine that uses Debian testing.
[ Risks ]
Code changes are quite trivial, the risk is minimal from my point of
view and will only affect the package itself.
[ Checklist ]
[X] all changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in testing
[ Other info ]
-
unblock nagios-check-xmppng/0.3.2-3
diff -Nru nagios-check-xmppng-0.3.0/changes.md
nagios-check-xmppng-0.3.2/changes.md
--- nagios-check-xmppng-0.3.0/changes.md 2016-06-18 21:24:23.000000000
+0200
+++ nagios-check-xmppng-0.3.2/changes.md 2021-03-07 14:14:06.000000000
+0100
@@ -1,5 +1,13 @@
# change log
+## version 0.3.2 2021-03-07
+
+* remove brokebn CA certificate statistics
+
+## version 0.3.1 2019-06-23
+
+* move to new project location
+
## version 0.3.0 2016-06-18
* add alternative --hostname parameter to make check_xmpp compatible with
diff -Nru nagios-check-xmppng-0.3.0/check_xmppng
nagios-check-xmppng-0.3.2/check_xmppng
--- nagios-check-xmppng-0.3.0/check_xmppng 2016-06-18 21:24:23.000000000
+0200
+++ nagios-check-xmppng-0.3.2/check_xmppng 2021-03-07 14:14:06.000000000
+0100
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
# Nagios compatible check for XMPP servers.
-# Copyright (C) 2015-2016 Jan Dittberner
+# Copyright (C) 2015-2021 Jan Dittberner
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
import nagiosplugin
__author__ = "Jan Dittberner"
-__version__ = "0.2"
+__version__ = "0.3.2"
NS_IETF_XMPP_SASL = 'urn:ietf:params:xml:ns:xmpp-sasl'
@@ -335,14 +335,6 @@
context.load_verify_locations(**kwargs)
else:
context.load_default_certs()
- stats = context.cert_store_stats()
- if stats['x509_ca'] == 0:
- _LOG.info(
- "tried to load CA certificates from default locations, but"
- " could not find any CA certificates.")
- raise XmppException('no CA certificates found')
- else:
- _LOG.debug('certificate store statistics: %s', stats)
return context
def initiate_tls(self):
diff -Nru nagios-check-xmppng-0.3.0/debian/changelog
nagios-check-xmppng-0.3.2/debian/changelog
--- nagios-check-xmppng-0.3.0/debian/changelog 2021-01-05 18:30:11.000000000
+0100
+++ nagios-check-xmppng-0.3.2/debian/changelog 2021-03-08 18:24:39.000000000
+0100
@@ -1,9 +1,30 @@
-nagios-check-xmppng (0.3.0-1.1) unstable; urgency=medium
+nagios-check-xmppng (0.3.2-3) unstable; urgency=medium
- * Non maintainer upload by the Reproducible Builds team.
- * No source change upload to rebuild on buildd with .buildinfo files.
+ * Source only upload for migration to testing
- -- Holger Levsen <[email protected]> Tue, 05 Jan 2021 18:30:11 +0100
+ -- Jan Dittberner <[email protected]> Mon, 08 Mar 2021 18:24:39 +0100
+
+nagios-check-xmppng (0.3.2-2) unstable; urgency=medium
+
+ * Re-upload to unstable
+
+ -- Jan Dittberner <[email protected]> Sun, 07 Mar 2021 15:17:20 +0100
+
+nagios-check-xmppng (0.3.2-1) experimental; urgency=medium
+
+ * New upstream version
+ * debian/control:
+ - Change priority from deprecated extra to optional
+ - Switch VCS-URL and VCS-Browser to new URLs
+ - Bump Standards-Version to 4.5.1
+ - Update to debhelper 12
+ * add debian/watch
+ * Fix "Don't depend on nagios3 which has been removed from unstable"
+ by dropping the nagios3 suggests (Closes: #846873)
+ * Fix "Change icinga dependency to icinga2" by dropping the icinga suggests
+ (Closes: #933258)
+
+ -- Jan Dittberner <[email protected]> Sun, 07 Mar 2021 15:00:32 +0100
nagios-check-xmppng (0.3.0-1) unstable; urgency=medium
diff -Nru nagios-check-xmppng-0.3.0/debian/compat
nagios-check-xmppng-0.3.2/debian/compat
--- nagios-check-xmppng-0.3.0/debian/compat 2016-06-18 22:37:30.000000000
+0200
+++ nagios-check-xmppng-0.3.2/debian/compat 2021-03-08 18:24:39.000000000
+0100
@@ -1 +1 @@
-9
+12
diff -Nru nagios-check-xmppng-0.3.0/debian/control
nagios-check-xmppng-0.3.2/debian/control
--- nagios-check-xmppng-0.3.0/debian/control 2016-06-18 22:37:30.000000000
+0200
+++ nagios-check-xmppng-0.3.2/debian/control 2021-03-08 18:24:39.000000000
+0100
@@ -1,12 +1,12 @@
Source: nagios-check-xmppng
Section: net
-Priority: extra
+Priority: optional
Maintainer: Jan Dittberner <[email protected]>
Homepage: https://exchange.icinga.org/jandd/check_xmppng
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.8
-Vcs-Browser: https://git.dittberner.info/?p=check_xmpp.git
-Vcs-Git: https://git.dittberner.info/check_xmpp.git -b debian
+Build-Depends: debhelper (>= 12)
+Standards-Version: 4.5.1
+Vcs-Browser: https://git.dittberner.info/jan/check_xmppng
+Vcs-Git: https://git.dittberner.info/jan/check_xmpp.git -b debian
Package: nagios-check-xmppng
Architecture: all
@@ -14,7 +14,7 @@
python3-defusedxml (>= 0.4.1),
python3-nagiosplugin (>= 1.2.2),
${misc:Depends}
-Suggests: icinga | icinga2 | nagios3
+Suggests: icinga2
Description: monitoring plugin to check XMPP servers
a nagios compatible check plugin for XMPP servers implementing the XMPP
protocol as specified in RFC 6120.
diff -Nru nagios-check-xmppng-0.3.0/debian/watch
nagios-check-xmppng-0.3.2/debian/watch
--- nagios-check-xmppng-0.3.0/debian/watch 1970-01-01 01:00:00.000000000
+0100
+++ nagios-check-xmppng-0.3.2/debian/watch 2021-03-08 18:24:39.000000000
+0100
@@ -0,0 +1,3 @@
+version=4
+https://git.dittberner.info/jan/check_xmppng/releases \
+ /jan/check_xmppng/archive/([\d\.]+)\.tar\.gz
diff -Nru nagios-check-xmppng-0.3.0/icingaexchange.yml
nagios-check-xmppng-0.3.2/icingaexchange.yml
--- nagios-check-xmppng-0.3.0/icingaexchange.yml 2016-06-18
21:24:23.000000000 +0200
+++ nagios-check-xmppng-0.3.2/icingaexchange.yml 2021-03-07
14:14:06.000000000 +0100
@@ -1,16 +1,63 @@
name: check_xmppng
description: "file:///README.md"
-url: "https://git.dittberner.info/?p=check_xmpp.git";
+url: "https://git.dittberner.info/jan/check_xmppng";
tags: XMPP, X.509
vendor:
target: Messaging
type: Plugin
license: gplv3
releases:
+ - name: 0.3.2
+ description: "fix CA certificate check"
+ files:
+ -
+ name: check_xmppng
+ url: "file:///check_xmppng"
+ description: "Check command"
+ checksum: e0ded038e79a2538d3b0c99cdc599810
+ -
+ name: COPYING
+ url: "file:///COPYING"
+ description: "GPL 3.0 license text"
+ checksum: d32239bcb673463ab874e80d47fae504
+ -
+ name: README.md
+ url: "file:///README.md"
+ description: "documentation"
+ checksum: 701ad7a882406a1f552a118d471a0b45
+ -
+ name: changes.md
+ url: "file:///changes.md"
+ description: "change log"
+ checksum: 60adfa1bf31c5a5fefb57ca55d186c7b
+ - name: 0.3.1
+ description: "new project home"
+ files:
+ -
+ name: check_xmppng
+ url: "file:///check_xmppng"
+ description: "Check command"
+ checksum: 3ba088ad712e7eff3897b0be70dc5437
+ -
+ name: COPYING
+ url: "file:///COPYING"
+ description: "GPL 3.0 license text"
+ checksum: d32239bcb673463ab874e80d47fae504
+ -
+ name: README.md
+ url: "file:///README.md"
+ description: "documentation"
+ checksum: 1e6f6632b12e4ef5fc4f02c3ea65da8a
+ -
+ name: changes.md
+ url: "file:///changes.md"
+ description: "change log"
+ checksum: df32115e17a931a083c2c9065c998147
- name: 0.3.0
description: "add --hostname option"
files:
- - name: check_xmppng
+ -
+ name: check_xmppng
url: "file:///check_xmppng"
description: "Check command"
checksum: 9774a26db6c54af4a51902b90ffe13bc
diff -Nru nagios-check-xmppng-0.3.0/README.md
nagios-check-xmppng-0.3.2/README.md
--- nagios-check-xmppng-0.3.0/README.md 2016-06-18 21:24:23.000000000 +0200
+++ nagios-check-xmppng-0.3.2/README.md 2021-03-07 14:14:06.000000000 +0100
@@ -1,4 +1,4 @@
-# check_xmppng - check plugin for XMPP
+# `check_xmppng` - check plugin for XMPP
This program implements a nagios check plugin for XMPP servers implementing the
XMPP protocol as specified in [RFC 6120](http://tools.ietf.org/html/rfc6120).
@@ -10,8 +10,9 @@
* support STARTTLS as specified in RFC 6120 section 5.
* check the validity of the server certificate presented by the XMPP server
-The plugin has been implemented because of insufficiencies in check_ssl_cert
-and the existing [check_xmpp](https://exchange.icinga.org/exchange/check_xmpp).
+The plugin has been implemented because of insufficiencies in `check_ssl_cert`
+and the existing
+[`check_xmpp`](https://exchange.icinga.org/exchange/check_xmpp).
Maximum acceptable timeouts as well as minimum acceptable number of days the
server certificate needs to be valid can be specified as command line
@@ -30,14 +31,14 @@
The software has been developed and tested with the following versions:
-* Python 3.4.2
-* defusedxml 0.4.1
-* nagiosplugin 1.2.2
+* Python 3.7.3
+* defusedxml 0.5.0
+* nagiosplugin 1.2.4
## License
-check_xmppng is free software: you can redistribute it and/or modify it under
+`check_xmppng` is free software: you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation, either version 3 of the License, or (at your option) any later
version.
@@ -54,10 +55,10 @@
## Usage
```
-usage: check_xmpp [-h] -H HOST_ADDRESS [-p PORT] [--s2s | --c2s] [-4 | -6]
- [--servername SERVERNAME] [--starttls] [-w SECONDS]
- [-c SECONDS] [--no-check-certificates] [-r CAROOTS]
- [--warn-days WARNDAYS] [--crit-days CRITDAYS] [-v]
+usage: check_xmppng [-h] -H HOST_ADDRESS [-p PORT] [--s2s | --c2s] [-4 | -6]
+ [--servername SERVERNAME] [--starttls] [-w SECONDS]
+ [-c SECONDS] [--no-check-certificates] [-r CAROOTS]
+ [--warn-days WARNDAYS] [--crit-days CRITDAYS] [-v]
Check XMPP services
@@ -95,5 +96,6 @@
## Contact
-If you want to provide feedback or bug reports please send me a mail to
-jan (at) dittberner [dot] info.
+If you want to provide feedback or bug reports please use the [bug
+tracker](https://git.dittberner.info/jan/check_xmppng/issues) or send me an
+email to jan (at) dittberner [dot] info.
--- End Message ---
--- Begin Message ---
Unblocked.
--- End Message ---
