Merge 13_subst.in_again.dpatch and 38_fix_libexec.dpatch
This commit is contained in:
		
							parent
							
								
									54d9c0272d
								
							
						
					
					
						commit
						07d3a62573
					
				
					 4 changed files with 13 additions and 19 deletions
				
			
		
							
								
								
									
										1
									
								
								debian/changelog
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								debian/changelog
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -8,6 +8,7 @@ nagios-plugins (1.4.14-5) UNRELEASED; urgency=low
 | 
			
		|||
    - 27_check_radius_segfault.dpatch: check_radius.c:161 initializes "data" to
 | 
			
		||||
      0 using memset(3) and problem not longer reproducable on amd64 without
 | 
			
		||||
      the patch
 | 
			
		||||
  * Merge 13_subst.in_again.dpatch and 38_fix_libexec.dpatch
 | 
			
		||||
 | 
			
		||||
 -- Jan Wagner <waja@cyconet.org>  Thu, 08 Apr 2010 23:54:05 +0200
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										1
									
								
								debian/patches/00list
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								debian/patches/00list
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -10,7 +10,6 @@
 | 
			
		|||
35_check_http_date.dpatch
 | 
			
		||||
36_check_ldap_empty_base.dpatch
 | 
			
		||||
37_check_radius_nas-ip-address.dpatch
 | 
			
		||||
38_fix_libexec.dpatch
 | 
			
		||||
39_check_ircd_fix_epn.dpatch
 | 
			
		||||
40_check_http_proxy_auth.dpatch
 | 
			
		||||
41_check_ping_detect_args.dpatch
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										12
									
								
								debian/patches/13_subst.in_again.dpatch
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								debian/patches/13_subst.in_again.dpatch
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -23,3 +23,15 @@ diff -urNad nagios-plugins-1.4.13+git200906171200~/plugins-scripts/subst.in nagi
 | 
			
		|||
 }
 | 
			
		||||
 
 | 
			
		||||
 BEGIN {
 | 
			
		||||
diff -urNad nagios-plugins-1.4.12~/contrib/check_linux_raid.pl nagios-plugins-1.4.12/contrib/check_linux_raid.pl
 | 
			
		||||
--- nagios-plugins-1.4.12~/contrib/check_linux_raid.pl	2007-08-28 05:19:45.000000000 +0200
 | 
			
		||||
+++ nagios-plugins-1.4.12/contrib/check_linux_raid.pl	2008-06-06 16:16:23.000000000 +0200
 | 
			
		||||
@@ -23,7 +23,7 @@
 | 
			
		||||
 #	  WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
 | 
			
		||||
 
 | 
			
		||||
 use strict;
 | 
			
		||||
-use lib "/usr/local/nagios/libexec";
 | 
			
		||||
+use lib "/usr/lib/nagios/plugins";
 | 
			
		||||
 use utils qw(%ERRORS);
 | 
			
		||||
 
 | 
			
		||||
 # die with an error if we're not on Linux
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										18
									
								
								debian/patches/38_fix_libexec.dpatch
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								debian/patches/38_fix_libexec.dpatch
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -1,18 +0,0 @@
 | 
			
		|||
#! /bin/sh /usr/share/dpatch/dpatch-run
 | 
			
		||||
## 38_fix_libexec.dpatch by Jan Wagner <waja@cyconet.org>
 | 
			
		||||
##
 | 
			
		||||
## DP: fix library path
 | 
			
		||||
 | 
			
		||||
@DPATCH@
 | 
			
		||||
diff -urNad nagios-plugins-1.4.12~/contrib/check_linux_raid.pl nagios-plugins-1.4.12/contrib/check_linux_raid.pl
 | 
			
		||||
--- nagios-plugins-1.4.12~/contrib/check_linux_raid.pl	2007-08-28 05:19:45.000000000 +0200
 | 
			
		||||
+++ nagios-plugins-1.4.12/contrib/check_linux_raid.pl	2008-06-06 16:16:23.000000000 +0200
 | 
			
		||||
@@ -23,7 +23,7 @@
 | 
			
		||||
 #	  WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
 | 
			
		||||
 
 | 
			
		||||
 use strict;
 | 
			
		||||
-use lib "/usr/local/nagios/libexec";
 | 
			
		||||
+use lib "/usr/lib/nagios/plugins";
 | 
			
		||||
 use utils qw(%ERRORS);
 | 
			
		||||
 
 | 
			
		||||
 # die with an error if we're not on Linux
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue