[Pkg-nagios-changes] [pkg-icinga2] 01/01: Add patch for a crash with GCC 4.7 in Process::IOThreadProc

Alexander Wirt formorer at debian.org
Wed Nov 18 09:29:24 UTC 2015


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

formorer pushed a commit to branch master
in repository pkg-icinga2.

commit fdc67b061c3c238bb732d349466ae36084c7ac06
Author: Alexander Wirt <formorer at debian.org>
Date:   Wed Nov 18 10:28:32 2015 +0100

    Add patch for a crash with GCC 4.7 in Process::IOThreadProc
---
 debian/patches/30_fix_Process_IOThreadProc_gcc47 | 29 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 30 insertions(+)

diff --git a/debian/patches/30_fix_Process_IOThreadProc_gcc47 b/debian/patches/30_fix_Process_IOThreadProc_gcc47
new file mode 100644
index 0000000..f43e14e
--- /dev/null
+++ b/debian/patches/30_fix_Process_IOThreadProc_gcc47
@@ -0,0 +1,29 @@
+From b75aa74cbdc86f0a41c1f05938f25f414df06a7c Mon Sep 17 00:00:00 2001
+From: Gunnar Beutner <gunnar at beutner.name>
+Date: Tue, 17 Nov 2015 22:04:50 +0100
+Subject: [PATCH] Fix crash in Process::IOThreadProc when building Icinga 2
+ with GCC 4.7.2
+
+fixes #10648
+---
+ lib/base/process.cpp |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/base/process.cpp b/lib/base/process.cpp
+index 089e41d..37ca629 100644
+--- a/lib/base/process.cpp
++++ b/lib/base/process.cpp
+@@ -199,8 +199,8 @@ void Process::IOThreadProc(int tid)
+ #endif /* _WIN32 */
+ 
+ 			int i = 1;
+-			std::pair<ProcessHandle, Process::Ptr> kv;
+-			BOOST_FOREACH(kv, l_Processes[tid]) {
++			typedef std::pair<ProcessHandle, Process::Ptr> kv_pair;
++			BOOST_FOREACH(const kv_pair& kv, l_Processes[tid]) {
+ 				const Process::Ptr& process = kv.second;
+ #ifdef _WIN32
+ 				handles[i] = kv.first;
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index e1c16fd..e4b9670 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 21_config_changes
+30_fix_Process_IOThreadProc_gcc47

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



More information about the Pkg-nagios-changes mailing list