[Pkg-nagios-changes] [SCM] Debian packaging for nagios nrpe branch, master, updated. debian/2.12-6-10-gda31b98

[Alexander Wirt]

The following commit has been merged in the master branch:
commit d2e430482b42582ab6c9744c3eeba1f6363bbd05
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Apr 30 09:48:33 2012 +0200

    Refresh patch

diff --git a/debian/patches/01_nodevrandom-and-docoptions.dpatch b/debian/patches/01_nodevrandom-and-docoptions.dpatch
index a659786..a4c012a 100755
--- a/debian/patches/01_nodevrandom-and-docoptions.dpatch
+++ b/debian/patches/01_nodevrandom-and-docoptions.dpatch
@@ -5,58 +5,38 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad nagios-nrpe-2.2~/src/check_nrpe.c nagios-nrpe-2.2/src/check_nrpe.c
---- nagios-nrpe-2.2~/src/check_nrpe.c	2006-01-21 20:23:36.000000000 +0100
-+++ nagios-nrpe-2.2/src/check_nrpe.c	2006-01-24 08:36:39.000000000 +0100
-@@ -93,6 +93,9 @@
- 		printf(" [arglist]  = Optional arguments that should be passed to the command.  Multiple\n");
- 		printf("              arguments should be separated by a space.  If provided, this must be\n");
- 		printf("              the last option supplied on the command line.\n");
-+		printf(" -h,--help    Print this short help.\n");
-+		printf(" -l,--license Print licensing information.\n");
-+		printf(" -n,--no-ssl  Do not initial an ssl handshake with the server, talk in plaintext.\n");
- 		printf("\n");
- 		printf("Note:\n");
- 		printf("This plugin requires that you have the NRPE daemon running on the remote host.\n");
-diff -urNad nagios-nrpe-2.2~/src/nrpe.c nagios-nrpe-2.2/src/nrpe.c
---- nagios-nrpe-2.2~/src/nrpe.c	2006-01-21 20:23:36.000000000 +0100
-+++ nagios-nrpe-2.2/src/nrpe.c	2006-01-24 08:38:30.000000000 +0100
-@@ -120,11 +120,13 @@
- 		printf("Usage: nrpe [-n] -c <config_file> <mode>\n");
- 		printf("\n");
- 		printf("Options:\n");
--		printf(" -n            = Do not use SSL\n");
-+		printf(" -n,--no-ssl   = Do not use SSL\n");
- 		printf(" <config_file> = Name of config file to use\n");
- 		printf(" <mode>        = One of the following two operating modes:\n");  
--		printf("   -i          =    Run as a service under inetd or xinetd\n");
--		printf("   -d          =    Run as a standalone daemon\n");
-+		printf("   -i,--inetd    Run as a service under inetd or xinetd\n");
-+		printf("   -d,--daemon   Run as a standalone daemon\n");
-+		printf("   -h,--help     Print this short help.\n");
-+		printf("   -l,--license  Print licensing information.\n");
- 		printf("\n");
- 		printf("Notes:\n");
- 		printf("This program is designed to process requests from the check_nrpe\n");
-diff -urNad nagios-nrpe-2.2~/src/utils.c nagios-nrpe-2.2/src/utils.c
---- nagios-nrpe-2.2~/src/utils.c	2003-10-16 01:14:27.000000000 +0200
-+++ nagios-nrpe-2.2/src/utils.c	2006-01-24 08:36:39.000000000 +0100
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nrpe~/src/check_nrpe.c pkg-nrpe/src/check_nrpe.c
+--- pkg-nrpe~/src/check_nrpe.c	2012-04-30 09:36:53.000000000 +0200
++++ pkg-nrpe/src/check_nrpe.c	2012-04-30 09:45:36.129684439 +0200
+@@ -96,6 +96,9 @@
+ 		printf(" [arglist]  = Optional arguments that should be passed to the command.  Multiple\n");
+ 		printf("              arguments should be separated by a space.  If provided, this must be\n");
+ 		printf("              the last option supplied on the command line.\n");
++		printf(" -h,--help    Print this short help.\n");
++		printf(" -l,--license Print licensing information.\n");
++		printf(" -n,--no-ssl  Do not initiate an ssl handshake with the server, talk in plaintext.\n");
+ 		printf("\n");
+ 		printf("Note:\n");
+ 		printf("This plugin requires that you have the NRPE daemon running on the remote host.\n");
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nrpe~/src/utils.c pkg-nrpe/src/utils.c
+--- pkg-nrpe~/src/utils.c	2012-04-30 09:36:53.000000000 +0200
++++ pkg-nrpe/src/utils.c	2012-04-30 09:48:03.811163608 +0200
 @@ -90,17 +90,7 @@
- 	   ends and the rest of the buffer (padded randomly) starts.
- 	***************************************************************/
- 
--	/* try to get seed value from /dev/urandom, as its a better source of entropy */
--	fp=fopen("/dev/urandom","r");
--	if(fp!=NULL){
--		seed=fgetc(fp);
--		fclose(fp);
--	        }
--
--	/* else fallback to using the current time as the seed */
--	else
--		seed=(int)time(NULL);
--
-+	seed=(int)time(NULL)*311-getpid()*359+getppid()*383;
- 	srand(seed);
- 	for(x=0;x<buffer_size;x++)
- 		buffer[x]=(int)'0'+(int)(72.0*rand()/(RAND_MAX+1.0));
+ 	   ends and the rest of the buffer (padded randomly) starts.
+ 	***************************************************************/
+ 
+-	/* try to get seed value from /dev/urandom, as its a better source of entropy */
+-	fp=fopen("/dev/urandom","r");
+-	if(fp!=NULL){
+-		seed=fgetc(fp);
+-		fclose(fp);
+-	        }
+-
+-	/* else fallback to using the current time as the seed */
+-	else
+-		seed=(int)time(NULL);
+-
++	seed=(int)time(NULL)*311-getpid()*359+getppid()*383;
+ 	srand(seed);
+ 	for(x=0;x<buffer_size;x++)
+ 		buffer[x]=(int)'0'+(int)(72.0*rand()/(RAND_MAX+1.0));

-- 
Debian packaging for nagios nrpe