[Pkg-nagios-changes] [pkg-nsca] 04/05: Add upstream patch to fix reserved identifier violation.

Bas Couwenberg sebastic at debian.org
Mon Dec 5 20:30:09 UTC 2016


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

sebastic pushed a commit to branch master
in repository pkg-nsca.

commit ca849ffe5caaaf8f35c86134531c5e9e065bc53f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Dec 5 21:15:57 2016 +0100

    Add upstream patch to fix reserved identifier violation.
---
 debian/changelog                                      |  1 +
 debian/patches/09_reserved-identifier-violation.patch | 18 ++++++++++++++++++
 debian/patches/series                                 |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2f05828..a4d2f9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ nsca (2.9.1-4) UNRELEASED; urgency=medium
     (closes: #743493)
   * Add upstream patch to fix race condition when opening command file.
     (closes: #663047)
+  * Add upstream patch to fix reserved identifier violation.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 04 Dec 2016 00:04:22 +0100
 
diff --git a/debian/patches/09_reserved-identifier-violation.patch b/debian/patches/09_reserved-identifier-violation.patch
new file mode 100644
index 0000000..57314eb
--- /dev/null
+++ b/debian/patches/09_reserved-identifier-violation.patch
@@ -0,0 +1,18 @@
+Description: Reserved identifier violation.
+ Standardization of header fenced per http://tracker.nagios.org/view.php?id=326
+Author: John C. Frickson <jfrickson at nagios.com>
+Origin: https://github.com/NagiosEnterprises/nsca/commit/984196686b01a23fc7e3a0da6169f10068e858a5
+
+--- a/include/utils.h
++++ b/include/utils.h
+@@ -28,8 +28,8 @@
+  *
+  ********************************************************************************/
+ 
+-#ifndef _UTILS_H
+-#define _UTILS_H
++#ifndef NSCA_UTILS_H_INCLUDED
++#define NSCA_UTILS_H_INCLUDED
+ 
+ #include "config.h"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 6e502cd..0e571b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 06_open-arguments.patch
 07_signal-handler.patch
 08_race-condition-when-opening-command-file.patch
+09_reserved-identifier-violation.patch

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



More information about the Pkg-nagios-changes mailing list