rpms/pdns
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix pdns daemon exit code (rhbz#859898)

Browse Source
This commit is contained in:
Morten Stevens 2012-09-24 19:36:55 +02:00
parent 8819ec1633
commit 968639f4f2
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pdns-return-exit0.patch Normal file
View File

@ -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);
}
}

17
pdns.spec
View File

@ -3,15 +3,18 @@
Summary: A modern, advanced and high performance authoritative-only nameserver Summary: A modern, advanced and high performance authoritative-only nameserver
Name: pdns Name: pdns
Version: 3.1 Version: 3.1
Release: 2%{?dist} Release: 3%{?dist}
Group: System Environment/Daemons
License: GPLv2 License: GPLv2
Group: System Environment/Daemons
URL: http://powerdns.com URL: http://powerdns.com
Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
Source1: pdns.service Source1: pdns.service
# Patches
Patch0: pdns-mongodb-fix1.patch Patch0: pdns-mongodb-fix1.patch
Patch1: pdns-mongodb-fix2.patch Patch1: pdns-mongodb-fix2.patch
Patch2: pdns-return-exit0.patch
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires(post): systemd-units, systemd-sysv Requires(post): systemd-units, systemd-sysv
@ -106,6 +109,7 @@ This package contains the MongoDB backend for %{name}
%setup -q %setup -q
%patch0 -p1 -b .fixmongodb1 %patch0 -p1 -b .fixmongodb1
%patch1 -p1 -b .fixmongodb2 %patch1 -p1 -b .fixmongodb2
%patch2 -p1 -b .return-exit0
%build %build
export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}" export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@ -237,6 +241,10 @@ fi
%changelog %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 * Tue Sep 18 2012 Morten Stevens <mstevens@imt-systems.com> - 3.1-2
- Fix MongoDB backend - Fix MongoDB backend
@ -367,6 +375,3 @@ fi
- Subpackages now require %%{version}-%%{release} - Subpackages now require %%{version}-%%{release}
* Sat Dec 16 2006 <ruben@rubenkerkhof.com> 2.9.20-1 * Sat Dec 16 2006 <ruben@rubenkerkhof.com> 2.9.20-1
- Initial import - Initial import