[pdns] - Fix crash on SIGSTOP and SIGCONT, thanks to Anders Kaseorg (#652841)
Ruben Kerkhof
ruben at fedoraproject.org
Tue Dec 14 17:34:10 UTC 2010
commit a09b593a5e663854447009702413763ba13cb4ae
Author: Ruben <ruben at rubenkerkhof.com>
Date: Tue Dec 14 18:33:28 2010 +0100
- Fix crash on SIGSTOP and SIGCONT, thanks to Anders Kaseorg (#652841)
pdns-fix-crash-on-sigstop.patch | 16 ++++++++++++++++
pdns.spec | 7 ++++++-
2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/pdns-fix-crash-on-sigstop.patch b/pdns-fix-crash-on-sigstop.patch
new file mode 100644
index 0000000..56e543d
--- /dev/null
+++ b/pdns-fix-crash-on-sigstop.patch
@@ -0,0 +1,16 @@
+diff -ur pdns-2.9.22.orig/pdns/unix_semaphore.cc pdns-2.9.22/pdns/unix_semaphore.cc
+--- pdns-2.9.22.orig/pdns/unix_semaphore.cc 2010-12-14 17:18:02.667000233 +0100
++++ pdns-2.9.22/pdns/unix_semaphore.cc 2010-12-14 17:18:08.138000485 +0100
+@@ -156,7 +156,11 @@
+
+ int Semaphore::wait()
+ {
+- return sem_wait(m_pSemaphore);
++ int ret;
++ do
++ ret = sem_wait(m_pSemaphore);
++ while (ret == -1 && errno == EINTR);
++ return ret;
+ }
+ int Semaphore::tryWait()
+ {
diff --git a/pdns.spec b/pdns.spec
index 368a795..35347ce 100644
--- a/pdns.spec
+++ b/pdns.spec
@@ -1,7 +1,7 @@
Summary: A modern, advanced and high performance authoritative-only nameserver
Name: pdns
Version: 2.9.22
-Release: 9%{?dist}
+Release: 10%{?dist}
Group: System Environment/Daemons
License: GPLv2
@@ -11,6 +11,7 @@ Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
Patch0: %{name}-fixinit.patch
Patch1: %{name}-gcc44.patch
Patch2: pdns-fix-postgres-detection.patch
+Patch3: pdns-fix-crash-on-sigstop.patch
Requires(post): %{_sbindir}/useradd, /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig
@@ -84,6 +85,7 @@ This package contains the SQLite backend for %{name}
%patch0 -p1 -b .fixinit
%patch1 -p1 -b .gcc44
%patch2 -p1 -b .postgres
+%patch3 -p1 -b .sigstop
%build
export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -182,6 +184,9 @@ fi
%changelog
+* Tue Dec 14 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-10
+- Fix crash on SIGSTOP and SIGCONT, thanks to Anders Kaseorg (#652841)
+
* Thu Jan 14 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-9
- Fix changelog entry
More information about the scm-commits
mailing list