[pkg-nagios-changes] [Git][nagios-team/pkg-monitoring-plugins][master] 2 commits: Adding debian/patches/12_check_disk_fix_btrfs (Closes: #800345)

[Jan Wagner (@waja)]

Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / pkg-monitoring-plugins


Commits:
8b63362d by Jan Wagner at 2022-01-30T11:19:50+01:00
Adding debian/patches/12_check_disk_fix_btrfs (Closes: #800345)

- - - - -
eb27aa76 by Jan Wagner at 2022-01-30T11:30:56+01:00
Adding d/p/13_check_http_fix_superflous_crlf (Closes: #913142)

- - - - -


3 changed files:

- + debian/patches/12_check_disk_fix_btrfs
- + debian/patches/13_check_http_fix_superflous_crlf
- debian/patches/series


Changes:

=====================================
debian/patches/12_check_disk_fix_btrfs
=====================================
@@ -0,0 +1,26 @@
+From 23436a18516e66469aeb4d81329d62ee4bfa7a51 Mon Sep 17 00:00:00 2001
+From: Klaus Ethgen <Klaus at Ethgen.de>
+Date: Wed, 28 Oct 2015 00:38:47 +0100
+Subject: [PATCH] Fixing the stuff that is broken on btrfs
+
+(Closes #1357)
+---
+ plugins/check_disk.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/plugins/check_disk.c b/plugins/check_disk.c
+index 874a0ee0c..b3386842c 100644
+--- a/plugins/check_disk.c
++++ b/plugins/check_disk.c
+@@ -1038,10 +1038,7 @@ get_stats (struct parameter_list *p, struct fs_usage *fsp) {
+ 
+ void
+ get_path_stats (struct parameter_list *p, struct fs_usage *fsp) {
+-  /* 2007-12-08 - Workaround for Gnulib reporting insanely high available
+-  * space on BSD (the actual value should be negative but fsp->fsu_bavail
+-  * is unsigned) */
+-  p->available = fsp->fsu_bavail > fsp->fsu_bfree ? 0 : fsp->fsu_bavail;
++  p->available = fsp->fsu_bavail;
+   p->available_to_root = fsp->fsu_bfree;
+   p->used = fsp->fsu_blocks - fsp->fsu_bfree;
+   if (freespace_ignore_reserved) {


=====================================
debian/patches/13_check_http_fix_superflous_crlf
=====================================
@@ -0,0 +1,32 @@
+From 8543f8e2cd72cbdd3aa8469c86ead50824fd88a6 Mon Sep 17 00:00:00 2001
+From: rincewind <rincewind at vulgrim.de>
+Date: Tue, 20 Apr 2021 12:15:27 +0200
+Subject: [PATCH] Remove superflous CRLF in HTTP-Requests in check_http
+
+---
+ plugins/check_http.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/check_http.c b/plugins/check_http.c
+index 0b712665a..676cf6445 100644
+--- a/plugins/check_http.c
++++ b/plugins/check_http.c
+@@ -948,8 +948,7 @@ check_http (void)
+     }
+     asprintf (&buf, "%sProxy-Connection: keep-alive\r\n", buf);
+     asprintf (&buf, "%sHost: %s\r\n", buf, host_name);
+-    /* we finished our request, send empty line with CRLF */
+-    asprintf (&buf, "%s%s", buf, CRLF);
++
+     if (verbose) printf ("%s\n", buf);
+     send(sd, buf, strlen (buf), 0);
+     buf[0]='\0';
+@@ -1050,7 +1049,7 @@ check_http (void)
+     }
+ 
+     xasprintf (&buf, "%sContent-Length: %i\r\n\r\n", buf, (int)strlen (http_post_data));
+-    xasprintf (&buf, "%s%s%s", buf, http_post_data, CRLF);
++    xasprintf (&buf, "%s%s", buf, http_post_data);
+   }
+   else {
+     /* or just a newline so the server knows we're done with the request */


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,5 @@
 # commited upstream
 10_check_curl_header
 11_check_icmp_source_ip
+12_check_disk_fix_btrfs
+13_check_http_fix_superflous_crlf



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins/-/compare/9e92541924767e7a213842c547be6ab7be923571...eb27aa76f345601ea19493071990f8720cb2f33b

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins/-/compare/9e92541924767e7a213842c547be6ab7be923571...eb27aa76f345601ea19493071990f8720cb2f33b
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/20220130/c32c2dd8/attachment-0001.htm>