From 968639f4f28926529203f0b2d1f508acd6ab3c95 Mon Sep 17 00:00:00 2001
From: Morten Stevens <mstevens@imt-systems.com>
Date: Mon, 24 Sep 2012 19:36:55 +0200
Subject: [PATCH] fix pdns daemon exit code (rhbz#859898)

---
 pdns-return-exit0.patch | 11 ++++++++++
 pdns.spec               | 45 +++++++++++++++++++++++------------------
 2 files changed, 36 insertions(+), 20 deletions(-)
 create mode 100644 pdns-return-exit0.patch

diff --git a/pdns-return-exit0.patch b/pdns-return-exit0.patch
new file mode 100644
index 0000000..1641e01
--- /dev/null
+++ b/pdns-return-exit0.patch
@@ -0,0 +1,11 @@
+--- pdns-3.1/pdns/receiver.cc.orig	2012-05-04 12:13:23.000000000 +0200
++++ pdns-3.1/pdns/receiver.cc	2012-09-22 01:19:23.081002321 +0200
+@@ -117,7 +117,7 @@ static void takedown(int i)
+   if(cpid) {
+     L<<Logger::Error<<"Guardian is killed, taking down children with us"<<endl;
+     kill(cpid,SIGKILL);
+-    exit(1);
++    exit(0);
+   }
+ }
+ 
diff --git a/pdns.spec b/pdns.spec
index 6cc092d..2808b25 100644
--- a/pdns.spec
+++ b/pdns.spec
@@ -1,25 +1,28 @@
 %global backends %{nil}
 
-Summary:	A modern, advanced and high performance authoritative-only nameserver
-Name:		pdns
-Version:	3.1
-Release:	2%{?dist}
+Summary: A modern, advanced and high performance authoritative-only nameserver
+Name: pdns
+Version: 3.1
+Release: 3%{?dist}
+License: GPLv2
+Group: System Environment/Daemons
+URL: http://powerdns.com
+Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
+Source1: pdns.service
 
-Group:		System Environment/Daemons
-License:	GPLv2
-URL:		http://powerdns.com
-Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
-Source1:	pdns.service
-Patch0:		pdns-mongodb-fix1.patch
-Patch1:		pdns-mongodb-fix2.patch
+# Patches
 
-Requires(pre):	shadow-utils
-Requires(post):	systemd-units, systemd-sysv
-Requires(preun):	systemd-units
-Requires(postun):	systemd-units
+Patch0: pdns-mongodb-fix1.patch
+Patch1: pdns-mongodb-fix2.patch
+Patch2: pdns-return-exit0.patch
 
-BuildRequires:	boost-devel, chrpath, lua-devel, cryptopp-devel, systemd-units
-Provides:	powerdns = %{version}-%{release}
+Requires(pre): shadow-utils
+Requires(post): systemd-units, systemd-sysv
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+
+BuildRequires: boost-devel, chrpath, lua-devel, cryptopp-devel, systemd-units
+Provides: powerdns = %{version}-%{release}
 
 %description
 The PowerDNS Nameserver is a modern, advanced and high performance
@@ -106,6 +109,7 @@ This package contains the MongoDB backend for %{name}
 %setup -q
 %patch0 -p1 -b .fixmongodb1
 %patch1 -p1 -b .fixmongodb2
+%patch2 -p1 -b .return-exit0
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -237,6 +241,10 @@ fi
 
 
 %changelog
+* Mon Sep 24 2012 Morten Stevens <mstevens@imt-systems.com> - 3.1-3
+- Fix pdns daemon exit code (rhbz#859898)
+- Update systemd unit file
+
 * Tue Sep 18 2012 Morten Stevens <mstevens@imt-systems.com> - 3.1-2
 - Fix MongoDB backend
 
@@ -367,6 +375,3 @@ fi
 - Subpackages now require %%{version}-%%{release}
 * Sat Dec 16 2006 <ruben@rubenkerkhof.com> 2.9.20-1
 - Initial import
-
-
-