Drop patches integrated upstream
This commit is contained in:
		
							parent
							
								
									ee77d9a19c
								
							
						
					
					
						commit
						b7ffc1d8c7
					
				
					 4 changed files with 0 additions and 116 deletions
				
			
		
							
								
								
									
										23
									
								
								debian/patches/10_check_curl_header
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										23
									
								
								debian/patches/10_check_curl_header
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -1,23 +0,0 @@
 | 
				
			||||||
From f0ac7fcc7c40fab04c00fbbc8c091e89e77b0f74 Mon Sep 17 00:00:00 2001
 | 
					 | 
				
			||||||
From: Barak Shohat <barak@bazzisoft.com>
 | 
					 | 
				
			||||||
Date: Mon, 12 Apr 2021 19:06:27 +0300
 | 
					 | 
				
			||||||
Subject: [PATCH] check_curl: Fix bug where headers beginning with HTTP_ cause
 | 
					 | 
				
			||||||
 the status line parsing to fail.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
---
 | 
					 | 
				
			||||||
 plugins/check_curl.c | 2 +-
 | 
					 | 
				
			||||||
 1 file changed, 1 insertion(+), 1 deletion(-)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
diff --git a/plugins/check_curl.c b/plugins/check_curl.c
 | 
					 | 
				
			||||||
index 99833f6f..3e0a6f94 100644
 | 
					 | 
				
			||||||
--- a/plugins/check_curl.c
 | 
					 | 
				
			||||||
+++ b/plugins/check_curl.c
 | 
					 | 
				
			||||||
@@ -1995,7 +1995,7 @@ curlhelp_parse_statusline (const char *buf, curlhelp_statusline *status_line)
 | 
					 | 
				
			||||||
   char *first_line_buf;
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
   /* find last start of a new header */
 | 
					 | 
				
			||||||
-  start = strrstr2 (buf, "\r\nHTTP");
 | 
					 | 
				
			||||||
+  start = strrstr2 (buf, "\r\nHTTP/");
 | 
					 | 
				
			||||||
   if (start != NULL) {
 | 
					 | 
				
			||||||
     start += 2;
 | 
					 | 
				
			||||||
     buf = start;
 | 
					 | 
				
			||||||
							
								
								
									
										64
									
								
								debian/patches/11_check_icmp_source_ip
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										64
									
								
								debian/patches/11_check_icmp_source_ip
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -1,64 +0,0 @@
 | 
				
			||||||
From 72c51d367e851dc7b6e2f66d89fc118ab72dc356 Mon Sep 17 00:00:00 2001
 | 
					 | 
				
			||||||
From: ghciv6 <ghciv6@localhost>
 | 
					 | 
				
			||||||
Date: Mon, 20 Dec 2021 22:39:57 +0000
 | 
					 | 
				
			||||||
Subject: [PATCH] - delay set_source_ip() until address_family is detected -
 | 
					 | 
				
			||||||
 add a test to check '-s'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
---
 | 
					 | 
				
			||||||
 plugins-root/check_icmp.c   | 5 ++++-
 | 
					 | 
				
			||||||
 plugins-root/t/check_icmp.t | 8 +++++++-
 | 
					 | 
				
			||||||
 2 files changed, 11 insertions(+), 2 deletions(-)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
 | 
					 | 
				
			||||||
index 01ae174ad..f97b0ed7e 100644
 | 
					 | 
				
			||||||
--- a/plugins-root/check_icmp.c
 | 
					 | 
				
			||||||
+++ b/plugins-root/check_icmp.c
 | 
					 | 
				
			||||||
@@ -410,6 +410,7 @@ main(int argc, char **argv)
 | 
					 | 
				
			||||||
 #ifdef SO_TIMESTAMP
 | 
					 | 
				
			||||||
 	int on = 1;
 | 
					 | 
				
			||||||
 #endif
 | 
					 | 
				
			||||||
+	char *source_ip = NULL;
 | 
					 | 
				
			||||||
 	char * opts_str = "vhVw:c:n:p:t:H:s:i:b:I:l:m:64";
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 	setlocale (LC_ALL, "");
 | 
					 | 
				
			||||||
@@ -542,7 +543,7 @@ main(int argc, char **argv)
 | 
					 | 
				
			||||||
 				}
 | 
					 | 
				
			||||||
 				break;
 | 
					 | 
				
			||||||
 			case 's': /* specify source IP address */
 | 
					 | 
				
			||||||
-				set_source_ip(optarg);
 | 
					 | 
				
			||||||
+				source_ip = optarg;
 | 
					 | 
				
			||||||
 				break;
 | 
					 | 
				
			||||||
 			case 'V': /* version */
 | 
					 | 
				
			||||||
 				print_revision (progname, NP_VERSION);
 | 
					 | 
				
			||||||
@@ -597,6 +598,8 @@ main(int argc, char **argv)
 | 
					 | 
				
			||||||
 		sockets |= HAVE_ICMP;
 | 
					 | 
				
			||||||
 	else icmp_sockerrno = errno;
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
+	if( source_ip )
 | 
					 | 
				
			||||||
+		set_source_ip(source_ip);
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 #ifdef SO_TIMESTAMP
 | 
					 | 
				
			||||||
 	if(setsockopt(icmp_sock, SOL_SOCKET, SO_TIMESTAMP, &on, sizeof(on)))
 | 
					 | 
				
			||||||
diff --git a/plugins-root/t/check_icmp.t b/plugins-root/t/check_icmp.t
 | 
					 | 
				
			||||||
index e043d4edd..55edc31b3 100644
 | 
					 | 
				
			||||||
--- a/plugins-root/t/check_icmp.t
 | 
					 | 
				
			||||||
+++ b/plugins-root/t/check_icmp.t
 | 
					 | 
				
			||||||
@@ -12,7 +12,7 @@ my $allow_sudo = getTestParameter( "NP_ALLOW_SUDO",
 | 
					 | 
				
			||||||
 	"no" );
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 if ($allow_sudo eq "yes" or $> == 0) {
 | 
					 | 
				
			||||||
-	plan tests => 16;
 | 
					 | 
				
			||||||
+	plan tests => 18;
 | 
					 | 
				
			||||||
 } else {
 | 
					 | 
				
			||||||
 	plan skip_all => "Need sudo to test check_icmp";
 | 
					 | 
				
			||||||
 }
 | 
					 | 
				
			||||||
@@ -83,3 +83,9 @@ $res = NPTest->testCmd(
 | 
					 | 
				
			||||||
 is( $res->return_code, 2, "One of two host nonresponsive - two required" );
 | 
					 | 
				
			||||||
 like( $res->output, $failureOutput, "Output OK" );
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
+$res = NPTest->testCmd(
 | 
					 | 
				
			||||||
+	"$sudo ./check_icmp -H $host_responsive -s 127.0.15.15 -w 10000ms,100% -c 10000ms,100% -n 1 -m 2"
 | 
					 | 
				
			||||||
+	);
 | 
					 | 
				
			||||||
+is( $res->return_code, 0, "IPv4 source_ip accepted" );
 | 
					 | 
				
			||||||
+like( $res->output, $successOutput, "Output OK" );
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
							
								
								
									
										26
									
								
								debian/patches/12_check_disk_fix_btrfs
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										26
									
								
								debian/patches/12_check_disk_fix_btrfs
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -1,26 +0,0 @@
 | 
				
			||||||
From 23436a18516e66469aeb4d81329d62ee4bfa7a51 Mon Sep 17 00:00:00 2001
 | 
					 | 
				
			||||||
From: Klaus Ethgen <Klaus@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) {
 | 
					 | 
				
			||||||
							
								
								
									
										3
									
								
								debian/patches/series
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								debian/patches/series
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -1,7 +1,4 @@
 | 
				
			||||||
02_check_icmp_links
 | 
					02_check_icmp_links
 | 
				
			||||||
03_epn
 | 
					03_epn
 | 
				
			||||||
# commited upstream
 | 
					# commited upstream
 | 
				
			||||||
10_check_curl_header
 | 
					 | 
				
			||||||
11_check_icmp_source_ip
 | 
					 | 
				
			||||||
12_check_disk_fix_btrfs
 | 
					 | 
				
			||||||
13_check_http_fix_superflous_crlf
 | 
					13_check_http_fix_superflous_crlf
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue