[Pkg-nagios-changes] [pkg-nagios] r624 - in
nagios-nrpe/trunk/debian: . patches
Sean Finney
seanius at costa.debian.org
Tue Jan 24 15:37:50 UTC 2006
Author: seanius
Date: 2006-01-24 15:37:49 +0000 (Tue, 24 Jan 2006)
New Revision: 624
Modified:
nagios-nrpe/trunk/debian/changelog
nagios-nrpe/trunk/debian/nagios-nrpe-server.install
nagios-nrpe/trunk/debian/patches/01_nodevrandom-and-docoptions.dpatch
nagios-nrpe/trunk/debian/patches/02_global-cmd-prefix.dpatch
Log:
new upstream release
Modified: nagios-nrpe/trunk/debian/changelog
===================================================================
--- nagios-nrpe/trunk/debian/changelog 2006-01-24 06:50:05 UTC (rev 623)
+++ nagios-nrpe/trunk/debian/changelog 2006-01-24 15:37:49 UTC (rev 624)
@@ -1,7 +1,13 @@
-nagios-nrpe (2.0-10) unstable; urgency=low
+nagios-nrpe (2.2-1) unstable; urgency=low
+ * new upstream release.
+
[sean finney]
* debian packaging source repository is now migrated to svn.
+ * updated 01_nodevrandom-and-docoptions.dpatch and
+ 02_global-cmd-prefix.dpatch to apply against the latest
+ upstream version.
+ * nrpe.cfg has moved location in the upstream tarball.
-- sean finney <seanius at debian.org> Tue, 24 Jan 2006 07:46:15 +0100
Modified: nagios-nrpe/trunk/debian/nagios-nrpe-server.install
===================================================================
--- nagios-nrpe/trunk/debian/nagios-nrpe-server.install 2006-01-24 06:50:05 UTC (rev 623)
+++ nagios-nrpe/trunk/debian/nagios-nrpe-server.install 2006-01-24 15:37:49 UTC (rev 624)
@@ -1,2 +1,2 @@
src/nrpe usr/sbin
-nrpe.cfg etc/nagios
+sample-config/nrpe.cfg etc/nagios
Modified: nagios-nrpe/trunk/debian/patches/01_nodevrandom-and-docoptions.dpatch
===================================================================
--- nagios-nrpe/trunk/debian/patches/01_nodevrandom-and-docoptions.dpatch 2006-01-24 06:50:05 UTC (rev 623)
+++ nagios-nrpe/trunk/debian/patches/01_nodevrandom-and-docoptions.dpatch 2006-01-24 15:37:49 UTC (rev 624)
@@ -5,55 +5,42 @@
## DP: No description.
@DPATCH@
-diff -urNad sid~/src/check_nrpe.c sid/src/check_nrpe.c
---- sid~/src/check_nrpe.c 2003-09-09 04:52:37.000000000 +0200
-+++ sid/src/check_nrpe.c 2005-10-25 14:17:25.000000000 +0200
-@@ -82,7 +82,7 @@
-
- if(result!=OK || show_help==TRUE){
-
-- printf("Usage: check_nrpe -H <host> [-p <port>] [-t <timeout>] [-c <command>] [-a <arglist...>]\n");
-+ printf("Usage: check_nrpe -H <host> [-p <port>] [-t <timeout>] [-c <command>] [-a <arglist...>] [--no-ssl] [--help] [--license]\n");
- printf("\n");
- printf("Options:\n");
- printf(" <host> = The address of the host running the NRPE daemon\n");
-@@ -92,6 +92,9 @@
+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(" -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 sid~/src/nrpe.c sid/src/nrpe.c
---- sid~/src/nrpe.c 2003-09-09 04:52:37.000000000 +0200
-+++ sid/src/nrpe.c 2005-10-25 14:17:25.000000000 +0200
-@@ -120,13 +120,16 @@
-
- else if(result!=OK || show_help==TRUE){
-
-- printf("Usage: nrpe -c <config_file> <mode>\n");
-+ printf("Usage: nrpe -c <config_file> <mode> [--help] [--license] [--no-ssl]\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(" <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(" <mode> = One of the following two operating modes:\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, --no-ssl Do not initial an ssl handshake with the server, talk in plaintext.\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 sid~/src/utils.c sid/src/utils.c
---- sid~/src/utils.c 2003-06-14 03:29:28.000000000 +0200
-+++ sid/src/utils.c 2005-10-25 14:17:25.000000000 +0200
+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
@@ -90,17 +90,7 @@
ends and the rest of the buffer (padded randomly) starts.
***************************************************************/
Modified: nagios-nrpe/trunk/debian/patches/02_global-cmd-prefix.dpatch
===================================================================
--- nagios-nrpe/trunk/debian/patches/02_global-cmd-prefix.dpatch 2006-01-24 06:50:05 UTC (rev 623)
+++ nagios-nrpe/trunk/debian/patches/02_global-cmd-prefix.dpatch 2006-01-24 15:37:49 UTC (rev 624)
@@ -6,10 +6,10 @@
## DP: No description.
@DPATCH@
-diff -ru ../../ee/nagios-nrpe-2.0/nrpe.cfg.in ./nrpe.cfg.in
---- ../../ee/nagios-nrpe-2.0/nrpe.cfg.in 2003-03-06 05:10:33.000000000 +0100
-+++ ./nrpe.cfg.in 2005-10-05 15:15:44.000000000 +0200
-@@ -80,6 +80,25 @@
+diff -ru ../../ee/nagios-nrpe-2.0/sample-config/nrpe.cfg.in ./sample-config/nrpe.cfg.in
+--- ../../ee/nagios-nrpe-2.0/sample-config/nrpe.cfg.in 2003-03-06 05:10:33.000000000 +0100
++++ ./sample-config/nrpe.cfg.in 2005-10-05 15:15:44.000000000 +0200
+@@ -72,6 +72,25 @@
dont_blame_nrpe=0
@@ -38,7 +38,7 @@
diff -ru ../../ee/nagios-nrpe-2.0/src/nrpe.c ./src/nrpe.c
--- ../../ee/nagios-nrpe-2.0/src/nrpe.c 2003-09-09 04:52:37.000000000 +0200
+++ ./src/nrpe.c 2005-10-05 15:09:25.000000000 +0200
-@@ -60,6 +60,7 @@
+@@ -52,6 +52,7 @@
char server_address[16]="0.0.0.0";
int socket_timeout=DEFAULT_SOCKET_TIMEOUT;
int command_timeout=DEFAULT_COMMAND_TIMEOUT;
@@ -46,7 +46,7 @@
command *command_list=NULL;
-@@ -339,6 +340,8 @@
+@@ -366,6 +367,8 @@
return ERROR;
}
}
@@ -55,15 +55,27 @@
else if(!strcmp(varname,"server_address")){
strncpy(server_address,varvalue,sizeof(server_address) - 1);
-@@ -483,7 +486,7 @@
+@@ -494,6 +494,7 @@
+ /* adds a new command definition from the config file to the list in memory */
+ int add_command(char *command_name, char *command_line){
+ command *new_command;
++ int cmdline_size=0;
+
+ if(command_name==NULL || command_line==NULL)
return ERROR;
+@@ -508,12 +509,14 @@
+ free(new_command);
+ return ERROR;
+ }
+- new_command->command_line=strdup(command_line);
++ cmdline_size=strlen(command_line)+strlen(command_prefix)+1;
++ new_command->command_line=(char*)malloc(sizeof(char)*cmdline_size);
+ if(new_command->command_line==NULL){
+ free(new_command->command_name);
+ free(new_command);
+ return ERROR;
+ }
++ snprintf(new_command->command_line, cmdline_size, "%s%s", command_prefix, command_line);
- strcpy(new_command->command_name,command_name);
-- strcpy(new_command->command_line,command_line);
-+ snprintf(new_command->command_line, MAX_COMMANDLINE_LENGTH, "%s%s", command_prefix, command_line);
-
/* add new command to head of list in memory */
new_command->next=command_list;
-
-
-
More information about the Pkg-nagios-changes
mailing list