[Pkg-nagios-changes] [SCM] Debian packaging for Nagios3 branch, master, updated. debian/3.2.3-3-17-g05584c8
Alexander Wirt
formorer at debian.org
Fri Jun 15 08:27:30 UTC 2012
The following commit has been merged in the master branch:
commit 05584c8f2e9532234ac8883d8bec8d8274ffa195
Author: Alexander Wirt <formorer at debian.org>
Date: Mon May 7 22:34:03 2012 +0200
Refresh patches
diff --git a/debian/patches/10_p1_pl_shebang.dpatch b/debian/patches/10_p1_pl_shebang.dpatch
index 0bc53da..9eef93c 100755
--- a/debian/patches/10_p1_pl_shebang.dpatch
+++ b/debian/patches/10_p1_pl_shebang.dpatch
@@ -6,13 +6,13 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nagios3~/p1.pl pkg-nagios3/p1.pl
---- pkg-nagios3~/p1.pl 2011-07-29 15:56:26.000000000 +0200
-+++ pkg-nagios3/p1.pl 2012-05-05 13:19:18.290984896 +0200
+--- pkg-nagios3~/p1.pl 2012-05-07 20:43:10.000000000 +0200
++++ pkg-nagios3/p1.pl 2012-05-07 20:48:31.118953001 +0200
@@ -1,4 +1,6 @@
-- package Embed::Persistent;
-+#!/usr/bin/perl
-+
-+package Embed::Persistent;
-
- # p1.pl for Nagios
-
+- package Embed::Persistent;
++#!/usr/bin/perl
++
++package Embed::Persistent;
+
+ # p1.pl for Nagios
+
diff --git a/debian/patches/30_fix_p1_debug_path.dpatch b/debian/patches/30_fix_p1_debug_path.dpatch
index 07ed8ae..e33d59e 100755
--- a/debian/patches/30_fix_p1_debug_path.dpatch
+++ b/debian/patches/30_fix_p1_debug_path.dpatch
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad nagios3-3.0.1~/p1.pl nagios3-3.0.1/p1.pl
---- nagios3-3.0.1~/p1.pl 2007-12-26 18:52:04.000000000 +0100
-+++ nagios3-3.0.1/p1.pl 2008-05-04 12:55:48.000000000 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nagios3~/p1.pl pkg-nagios3/p1.pl
+--- pkg-nagios3~/p1.pl 2012-05-07 20:43:10.000000000 +0200
++++ pkg-nagios3/p1.pl 2012-05-07 20:50:14.000000000 +0200
@@ -16,7 +16,7 @@
# use constant DEBUG_LEVEL => LEAVE_MSG | CACHE_DUMP ;
# use constant DEBUG_LEVEL => LEAVE_MSG | CACHE_DUMP | PLUGIN_DUMP ;
diff --git a/debian/patches/40_fix_spurious_dollar_signs_added_to_command_lines.dpatch b/debian/patches/40_fix_spurious_dollar_signs_added_to_command_lines.dpatch
index c06ad24..5ebee82 100755
--- a/debian/patches/40_fix_spurious_dollar_signs_added_to_command_lines.dpatch
+++ b/debian/patches/40_fix_spurious_dollar_signs_added_to_command_lines.dpatch
@@ -6,15 +6,15 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nagios3~/common/macros.c pkg-nagios3/common/macros.c
---- pkg-nagios3~/common/macros.c 2011-07-29 15:56:26.000000000 +0200
-+++ pkg-nagios3/common/macros.c 2012-05-05 13:26:59.858996712 +0200
+--- pkg-nagios3~/common/macros.c 2012-05-07 20:43:10.000000000 +0200
++++ pkg-nagios3/common/macros.c 2012-05-07 21:51:23.191049586 +0200
@@ -185,7 +185,8 @@
- *output_buffer = (char *)realloc(*output_buffer, strlen(*output_buffer) + strlen(temp_buffer) + 3);
- strcat(*output_buffer, "$");
- strcat(*output_buffer, temp_buffer);
-- strcat(*output_buffer, "$");
-+ if (buf_ptr!=NULL)
-+ strcat(*output_buffer,"$");
- }
-
- /* insert macro */
+ *output_buffer = (char *)realloc(*output_buffer, strlen(*output_buffer) + strlen(temp_buffer) + 3);
+ strcat(*output_buffer, "$");
+ strcat(*output_buffer, temp_buffer);
+- strcat(*output_buffer, "$");
++ if (buf_ptr!=NULL)
++ strcat(*output_buffer,"$");
+ }
+
+ /* insert macro */
diff --git a/debian/patches/55_strip_logarchivepath.dpatch b/debian/patches/55_strip_logarchivepath.dpatch
index 6e4b8e5..8954a7c 100755
--- a/debian/patches/55_strip_logarchivepath.dpatch
+++ b/debian/patches/55_strip_logarchivepath.dpatch
@@ -5,14 +5,14 @@
## DP: stripping the log_archive_path value from cgi.cfg (#578232)
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nagios3~/cgi/cgiutils.c pkg-nagios3/cgi/cgiutils.c
---- pkg-nagios3~/cgi/cgiutils.c 2011-07-29 15:56:26.000000000 +0200
-+++ pkg-nagios3/cgi/cgiutils.c 2012-05-05 13:32:59.823005928 +0200
-@@ -489,7 +489,7 @@
- temp_buffer = strtok(NULL, "\n");
- strncpy(log_archive_path, (temp_buffer == NULL) ? "" : temp_buffer, sizeof(log_archive_path));
- log_archive_path[sizeof(log_archive_path)-1] = '\x0';
-- strip(physical_html_path);
-+ strip(log_archive_path);
- if(log_archive_path[strlen(log_archive_path)-1] != '/' && (strlen(log_archive_path) < sizeof(log_archive_path) - 1))
- strcat(log_archive_path, "/");
- }
+--- pkg-nagios3~/cgi/cgiutils.c 2012-05-07 20:43:10.000000000 +0200
++++ pkg-nagios3/cgi/cgiutils.c 2012-05-07 22:00:06.155062976 +0200
+@@ -500,7 +500,7 @@
+ temp_buffer = strtok(NULL, "\n");
+ strncpy(log_archive_path, (temp_buffer == NULL) ? "" : temp_buffer, sizeof(log_archive_path));
+ log_archive_path[sizeof(log_archive_path) - 1] = '\x0';
+- strip(physical_html_path);
++ strip(log_archive_path);
+ if(log_archive_path[strlen(log_archive_path) - 1] != '/' && (strlen(log_archive_path) < sizeof(log_archive_path) - 1))
+ strcat(log_archive_path, "/");
+ }
diff --git a/debian/patches/60_fix_p1.pl_patch_mini_epn.dpatch b/debian/patches/60_fix_p1.pl_patch_mini_epn.dpatch
index 56616d0..3e1fb56 100755
--- a/debian/patches/60_fix_p1.pl_patch_mini_epn.dpatch
+++ b/debian/patches/60_fix_p1.pl_patch_mini_epn.dpatch
@@ -6,14 +6,14 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nagios3~/contrib/mini_epn.c pkg-nagios3/contrib/mini_epn.c
---- pkg-nagios3~/contrib/mini_epn.c 2012-05-05 13:37:37.000000000 +0200
-+++ pkg-nagios3/contrib/mini_epn.c 2012-05-05 13:39:01.183015186 +0200
+--- pkg-nagios3~/contrib/mini_epn.c 2012-05-07 20:43:10.000000000 +0200
++++ pkg-nagios3/contrib/mini_epn.c 2012-05-07 22:06:49.835073313 +0200
@@ -19,7 +19,7 @@
- #endif
- */
-
-- char *embedding[] = { "", "p1.pl" };
-+ char *embedding[] = { "", "/usr/lib/nagios3/p1.pl" };
- char *plugin_output ;
- char fname[MAX_INPUT_CHARS];
- char *args[] = {"", "0", "", "", NULL };
+ #endif
+ */
+
+- char *embedding[] = { "", "p1.pl" };
++ char *embedding[] = { "", "/usr/lib/nagios3/p1.pl" };
+ char *plugin_output ;
+ char fname[MAX_INPUT_CHARS];
+ char *args[] = {"", "0", "", "", NULL };
--
Debian packaging for Nagios3
More information about the Pkg-nagios-changes
mailing list