Removed Fedora specific systemd patch

This commit is contained in:
Morten Stevens 2017-10-23 15:55:22 +02:00
parent 79d38387ee
commit a752f93ac5
2 changed files with 6 additions and 25 deletions

View File

@ -1,20 +0,0 @@
--- pdns-4.1.0-rc1/pdns/pdns.service.in.orig 2017-08-31 10:52:49.000000000 +0200
+++ pdns-4.1.0-rc1/pdns/pdns.service.in 2017-10-15 19:42:44.268439749 +0200
@@ -7,14 +7,15 @@ After=network-online.target mysqld.servi
[Service]
Type=notify
-ExecStart=@sbindir@/pdns_server --guardian=no --daemon=no --disable-syslog --write-pid=no
+ExecStart=@sbindir@/pdns_server --guardian=no --daemon=no --write-pid=no
Restart=on-failure
RestartSec=1
StartLimitInterval=0
PrivateTmp=true
PrivateDevices=true
CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_CHOWN CAP_SYS_CHROOT
-NoNewPrivileges=true
+# Disabled NoNewPrivileges (#1305522)
+# NoNewPrivileges=true
# ProtectSystem=full will disallow write access to /etc and /usr, possibly
# not being able to write slaved-zones into sqlite3 or zonefiles.
ProtectSystem=full

View File

@ -4,15 +4,14 @@
Name: pdns
Version: 4.1.0
Release: 0.3.%{?prever}%{?dist}
Release: 0.4.%{?prever}%{?dist}
Summary: A modern, advanced and high performance authoritative-only nameserver
Group: System Environment/Daemons
License: GPLv2
URL: http://powerdns.com
Source0: http://downloads.powerdns.com/releases/%{name}-%{version}-%{?prever}.tar.bz2
Patch0: pdns-disable-secpoll.patch
Patch1: pdns-systemd.patch
Patch2: pdns-mysql.patch
Patch1: pdns-mysql.patch
Requires(pre): shadow-utils
Requires(post): systemd-units
@ -157,8 +156,7 @@ This package contains the TinyDNS backend for %{name}
%prep
%setup -q -n %{name}-%{version}-%{?prever}
%patch0 -p1 -b .disable-secpoll
%patch1 -p1 -b .systemd
%patch2 -p1 -b .mysql
%patch1 -p1 -b .mysql
%build
export CPPFLAGS="-DLDAP_DEPRECATED"
@ -324,6 +322,9 @@ exit 0
%{_libdir}/%{name}/libtinydnsbackend.so
%changelog
* Mon Oct 23 2017 Morten Stevens <mstevens@fedoraproject.org> - 4.1.0-0.4.rc1
- Removed Fedora specific systemd patch
* Sun Oct 15 2017 Morten Stevens <mstevens@fedoraproject.org> - 4.1.0-0.3.rc1
- Added Fedora specific systemd patch
- Added upstream patch to fix an issue with MariaDB 10.2