[Pkg-nagios-devel] Bug#976218: nagios-plugins-contrib: diff for NMU version 27.20200511+1+nmu1 (was: Bug#976218: file breaks nagios-plugins-contrib autopkgtest: SSL_CERT UNKNOWN www.debian.org: Unable to fetch a valid certificate issuer certificate.)

[Christoph Biedl]

Control: tags 976218 + patch
Control: tags 976218 + pending

Dear maintainer,

to resolve this issue, I've prepared a NMU for nagios-plugins-contrib
(versioned as 27.20200511+1+nmu1), and uploaded it to DELAYED/5. Please
feel free to tell me if I should delay it longer.

Regards.

    Christop

diff -Nru nagios-plugins-contrib-27.20200511+1/debian/changelog nagios-plugins-contrib-27.20200511+1+nmu1/debian/changelog
--- nagios-plugins-contrib-27.20200511+1/debian/changelog	2020-05-11 17:08:39.000000000 +0200
+++ nagios-plugins-contrib-27.20200511+1+nmu1/debian/changelog	2020-12-06 21:20:03.000000000 +0100
@@ -1,3 +1,10 @@
+nagios-plugins-contrib (27.20200511+1+nmu1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Cherry-pick upstream fix for check_ssl_cert. Closes: #976218
+
+ -- Christoph Biedl <debian.axhn at manchmal.in-ulm.de>  Sun, 06 Dec 2020 21:20:03 +0100
+
 nagios-plugins-contrib (27.20200511+1) unstable; urgency=medium
 
   * [b6d2915] Fixing tests (again)
diff -Nru nagios-plugins-contrib-27.20200511+1/debian/patches/check_ssl_cert/adjust-for-file-5.39 nagios-plugins-contrib-27.20200511+1+nmu1/debian/patches/check_ssl_cert/adjust-for-file-5.39
--- nagios-plugins-contrib-27.20200511+1/debian/patches/check_ssl_cert/adjust-for-file-5.39	1970-01-01 01:00:00.000000000 +0100
+++ nagios-plugins-contrib-27.20200511+1+nmu1/debian/patches/check_ssl_cert/adjust-for-file-5.39	2020-12-06 21:20:03.000000000 +0100
@@ -0,0 +1,20 @@
+Subject: Fixes #212 ("Unable to fetch a valid certificate issuer certificate")
+Origin: v1.119.0 <https://github.com/matteocorti/check_ssl_cert/commit/99673c3>
+Upstream-Author: matteo at corti.li <matteo at corti.li>
+Date: Wed Jul 1 21:35:12 2020 +0200
+Bug-Debian: https://bugs.debian.org/976218
+
+    Root cause: The file(1) program changed the output to "certificate" in
+    versio 5.39
+
+--- a/check_ssl_cert/check_ssl_cert_1.98.0/check_ssl_cert
++++ b/check_ssl_cert/check_ssl_cert_1.98.0/check_ssl_cert
+@@ -2450,7 +2450,7 @@
+             # check the result
+             if ! "${FILE_BIN}" "${ISSUER_CERT_TMP}" | grep -E -q ': (ASCII|PEM)' ; then
+ 
+-                if "${FILE_BIN}" "${ISSUER_CERT_TMP}" | grep -q ': data' ; then
++                if "${FILE_BIN}" "${ISSUER_CERT_TMP}" | grep -E -q '(data|Certificate)' ; then
+ 
+                     if [ -n "${DEBUG}" ] ; then
+                         echo "[DBG] OCSP: converting issuer certificate from DER to PEM"
diff -Nru nagios-plugins-contrib-27.20200511+1/debian/patches/series nagios-plugins-contrib-27.20200511+1+nmu1/debian/patches/series
--- nagios-plugins-contrib-27.20200511+1/debian/patches/series	2020-05-11 17:08:39.000000000 +0200
+++ nagios-plugins-contrib-27.20200511+1+nmu1/debian/patches/series	2020-12-06 21:20:03.000000000 +0100
@@ -54,3 +54,4 @@
 percona-nagios-plugins/python2to3
 check_email_delivery/check_smtp_send-hello
 dsa/python2to3
+check_ssl_cert/adjust-for-file-5.39
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-devel/attachments/20201207/11bf9032/attachment.sig>