[Pkg-nagios-changes] [pkg-icinga2] 05/06: pipe_ENOSYS.patch is now upstream

[Alexander Wirt]

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

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

commit e5709e4a3e6722d2eab01cdbbb3c78b4f8a72dc3
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Sep 18 07:08:26 2014 +0200

    pipe_ENOSYS.patch is now upstream
---
 debian/patches/pipe_ENOSYS.patch | 89 ----------------------------------------
 debian/patches/series            |  1 -
 2 files changed, 90 deletions(-)

diff --git a/debian/patches/pipe_ENOSYS.patch b/debian/patches/pipe_ENOSYS.patch
deleted file mode 100644
index 353262f..0000000
--- a/debian/patches/pipe_ENOSYS.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-commit 039a13cf88a597050215541d65272c4784423b1a
-Author: Gunnar Beutner <gunnar at beutner.name>
-Date:   Wed Sep 3 08:10:55 2014 +0200
-
-    Implement support for systems where pipe2 returns ENOSYS
-    
-    fixes #7065
-    fixes #6696
-
-diff --git a/lib/base/process.cpp b/lib/base/process.cpp
-index 46de696..96efbb0 100644
---- a/lib/base/process.cpp
-+++ b/lib/base/process.cpp
-@@ -71,23 +71,24 @@ void Process::StaticInitialize(void)
- #else /* _WIN32 */
- #	ifdef HAVE_PIPE2
- 		if (pipe2(l_EventFDs[tid], O_CLOEXEC) < 0) {
--			BOOST_THROW_EXCEPTION(posix_error()
--				<< boost::errinfo_api_function("pipe2")
--				<< boost::errinfo_errno(errno));
--		}
--#	else /* HAVE_PIPE2 */
--		if (pipe(l_EventFDs[tid]) < 0) {
--			BOOST_THROW_EXCEPTION(posix_error()
--				<< boost::errinfo_api_function("pipe")
--				<< boost::errinfo_errno(errno));
--		}
--
--		Utility::SetCloExec(l_EventFDs[tid][0]);
--		Utility::SetCloExec(l_EventFDs[tid][1]);
-+			if (errno == ENOSYS) {
- #	endif /* HAVE_PIPE2 */
-+				if (pipe(l_EventFDs[tid]) < 0) {
-+					BOOST_THROW_EXCEPTION(posix_error()
-+					    << boost::errinfo_api_function("pipe")
-+					    << boost::errinfo_errno(errno));
-+				}
- 
--		Utility::SetNonBlocking(l_EventFDs[tid][0]);
--		Utility::SetNonBlocking(l_EventFDs[tid][1]);
-+				Utility::SetCloExec(l_EventFDs[tid][0]);
-+				Utility::SetCloExec(l_EventFDs[tid][1]);
-+#	ifdef HAVE_PIPE2
-+			} else {
-+				BOOST_THROW_EXCEPTION(posix_error()
-+					<< boost::errinfo_api_function("pipe2")
-+					<< boost::errinfo_errno(errno));
-+			}
-+		}
-+#	endif /* HAVE_PIPE2 */
- #endif /* _WIN32 */
- 	}
- }
-@@ -444,19 +445,23 @@ void Process::Run(const boost::function<void(const ProcessResult&)>& callback)
- 
- #ifdef HAVE_PIPE2
- 	if (pipe2(fds, O_CLOEXEC) < 0) {
--		BOOST_THROW_EXCEPTION(posix_error()
--			<< boost::errinfo_api_function("pipe2")
--			<< boost::errinfo_errno(errno));
--	}
--#else /* HAVE_PIPE2 */
--	if (pipe(fds) < 0) {
--		BOOST_THROW_EXCEPTION(posix_error()
--			<< boost::errinfo_api_function("pipe")
--			<< boost::errinfo_errno(errno));
--	}
-+		if (errno == ENOSYS) {
-+#endif /* HAVE_PIPE2 */
-+			if (pipe(fds) < 0) {
-+				BOOST_THROW_EXCEPTION(posix_error()
-+				    << boost::errinfo_api_function("pipe")
-+				    << boost::errinfo_errno(errno));
-+			}
- 
--	Utility::SetCloExec(fds[0]);
--	Utility::SetCloExec(fds[1]);
-+			Utility::SetCloExec(fds[0]);
-+			Utility::SetCloExec(fds[1]);
-+#ifdef HAVE_PIPE2
-+		} else {
-+			BOOST_THROW_EXCEPTION(posix_error()
-+				<< boost::errinfo_api_function("pipe2")
-+				<< boost::errinfo_errno(errno));
-+		}
-+	}
- #endif /* HAVE_PIPE2 */
- 
- 	// build argv
diff --git a/debian/patches/series b/debian/patches/series
index efdccde..e1c16fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-pipe_ENOSYS.patch
 21_config_changes

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