[Pkg-nagios-changes] [pkg-pnp4nagios] 03/04: Refreshing patches.

[Bernd Zeimetz]

This is an automated email from the git hooks/post-receive script.

bzed pushed a commit to branch master
in repository pkg-pnp4nagios.

commit 832a9632e3daaf75855619ad2d775739eb4c67e3
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Mon Aug 26 13:28:03 2013 +0200

    Refreshing patches.
---
 debian/patches/adjust-template-path |    3 ++-
 debian/patches/fix-nagios-url       |    2 +-
 debian/patches/fix-path-fpdi        |    2 +-
 debian/patches/format-security      |   18 ------------------
 debian/patches/series               |    1 -
 5 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/debian/patches/adjust-template-path b/debian/patches/adjust-template-path
index 15bcf6a..2e18a6e 100644
--- a/debian/patches/adjust-template-path
+++ b/debian/patches/adjust-template-path
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/sample-config/pnp/config.php.in
 +++ b/sample-config/pnp/config.php.in
-@@ -214,12 +214,18 @@
+@@ -230,13 +230,19 @@ $conf['RRD_DAEMON_OPTS'] = '';
  # Add your own template directories here
  # First match wins!
  #$conf['template_dirs'][] = '/usr/local/check_mk/pnp-templates';
@@ -26,3 +26,4 @@ Forwarded: not-needed
 +$conf['special_template_dir'] = '@sysconfdir@/templates.special';
  
  #
+ # Regex to detect mobile devices
diff --git a/debian/patches/fix-nagios-url b/debian/patches/fix-nagios-url
index 27568d7..84419a4 100644
--- a/debian/patches/fix-nagios-url
+++ b/debian/patches/fix-nagios-url
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/sample-config/pnp/config.php.in
 +++ b/sample-config/pnp/config.php.in
-@@ -73,7 +73,7 @@
+@@ -89,7 +89,7 @@ $conf['temp'] = "/var/tmp";
  #
  # Link back to Nagios or Thruk ( www.thruk.org ) 
  #
diff --git a/debian/patches/fix-path-fpdi b/debian/patches/fix-path-fpdi
index 23bf9d6..c17addb 100644
--- a/debian/patches/fix-path-fpdi
+++ b/debian/patches/fix-path-fpdi
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/share/pnp/application/controllers/pdf.php
 +++ b/share/pnp/application/controllers/pdf.php
-@@ -267,7 +267,7 @@
+@@ -268,7 +268,7 @@ class Pdf_Controller extends System_Cont
  *
  */
  require Kohana::find_file('vendor/fpdf', 'fpdf');
diff --git a/debian/patches/format-security b/debian/patches/format-security
deleted file mode 100644
index 5de4e84..0000000
--- a/debian/patches/format-security
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fixed a missing printf-style format argument.
- This was identified by GCC's format-security check which forbids any non
- string literals to be used as format argument.
-Author: Sebastian Harl <tokkee at debian.org>
-Forwarded: yes
-
-diff a/src/logging.c b/src/logging.c
---- a/src/logging.c
-+++ b/src/logging.c
-@@ -27,7 +27,7 @@ extern int max_logfile_size;
- 
- int do_log(char *message) {
- 	if (use_syslog) {
--		syslog(LOG_NOTICE, message);
-+		syslog(LOG_NOTICE, "%s", message);
- 		return OK;
- 	} else if (use_syslog == FALSE) {
- 		if (write_log(message)==0)
diff --git a/debian/patches/series b/debian/patches/series
index c760587..78f6972 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ apache-fix-path-to-userfile
 fix-npcd-path
 fix-nagios-url
 adjust-template-path
-format-security

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-pnp4nagios.git