[pkg-nagios-changes] [Git][nagios-team/pkg-nsca-ng][master] 3 commits: Add upstream patch to close FIFO in test_nsca.

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Sat May 14 06:55:59 BST 2022



Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / pkg-nsca-ng


Commits:
86caf3f6 by Bas Couwenberg at 2022-05-14T07:40:57+02:00
Add upstream patch to close FIFO in test_nsca.

- - - - -
dc31ee80 by Bas Couwenberg at 2022-05-14T07:48:11+02:00
Disable parallel tests.

- - - - -
7afbc176 by Bas Couwenberg at 2022-05-14T07:52:04+02:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/0001-tests-test_nsca.c-Don-t-forget-to-close-FIFO.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,16 +1,19 @@
-nsca-ng (1.6-5) UNRELEASED; urgency=medium
+nsca-ng (1.6-5) unstable; urgency=medium
 
-  [ Bas Couwenberg ]
   * Team upload.
+
+  [ Bas Couwenberg ]
   * Bump Standards-Version to 4.6.0, no changes.
   * Update watch file for GitHub URL changes.
+  * Add upstream patch to close FIFO in test_nsca.
+  * Disable parallel tests.
 
   [ Debian Janitor ]
   * Remove constraints unnecessary since buster:
     + nsca-ng-client: Drop versioned constraint on nsca in Replaces.
     + nsca-ng-client: Drop versioned constraint on nsca in Breaks.
 
- -- Bas Couwenberg <sebastic at debian.org>  Sat, 28 Nov 2020 14:37:12 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 14 May 2022 07:51:47 +0200
 
 nsca-ng (1.6-4) unstable; urgency=medium
 


=====================================
debian/patches/0001-tests-test_nsca.c-Don-t-forget-to-close-FIFO.patch
=====================================
@@ -0,0 +1,28 @@
+Description: tests/test_nsca.c: Don't forget to close FIFO
+ Discovered by Coverity Scan.
+From: Holger Weiß <holger at weiss.in-berlin.de>
+Origin: https://github.com/weiss/nsca-ng/commit/11b42fa5d75f58b1e6c6ac5687e38eff18380903
+Forwarded: not-needed
+
+--- a/tests/test_nsca.c
++++ b/tests/test_nsca.c
+@@ -242,7 +242,7 @@ static void
+ cat_fifo(long n_lines)
+ {
+ 	FILE *fifo;
+-	int c;
++	int c, error;
+ 	enum {
+ 		STATE_EAT_TIMESTAMP,
+ 		STATE_PRINT_COMMAND
+@@ -271,7 +271,9 @@ cat_fifo(long n_lines)
+ 			}
+ 		}
+ 	}
+-	if (ferror(fifo))
++	error = ferror(fifo);
++	(void)close(fifo);
++	if (error)
+ 		die("Cannot read %s: %s", COMMAND_FILE,
+ 		    got_signal ? "Interrupted" : strerror(errno));
+ }


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 nsca-ng.cfg_debian_config
+0001-tests-test_nsca.c-Don-t-forget-to-close-FIFO.patch


=====================================
debian/rules
=====================================
@@ -22,6 +22,9 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	dh_auto_configure  -- --enable-server
 
+override_dh_auto_test:
+	dh_auto_test --no-parallel
+
 override_dh_auto_install:
 	dh_auto_install
 



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nsca-ng/-/compare/567175707e18d32186faf4cbad09077127d9c4c3...7afbc176c37e510ae0fcafa93af418cec155f6de

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nsca-ng/-/compare/567175707e18d32186faf4cbad09077127d9c4c3...7afbc176c37e510ae0fcafa93af418cec155f6de
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/20220514/e2f7a7de/attachment-0001.htm>


More information about the pkg-nagios-changes mailing list