[maradns/f19] refresh systemd patch, introduce deps on network-online
Tomasz Torcz
ttorcz at fedoraproject.org
Mon Oct 14 11:02:37 UTC 2013
commit e5ed4487cfa658de254b139471cb0f97d54ee73c
Author: Tomasz Torcz <tomek at pipebreaker.pl>
Date: Sun Oct 13 22:31:49 2013 +0200
refresh systemd patch, introduce deps on network-online
...ch => maradns-0001-add-systemd-unit-files.patch | 42 +++++++++++--------
maradns.spec | 7 ++-
2 files changed, 29 insertions(+), 20 deletions(-)
---
diff --git a/maradns-0001-add-systemd-unit-files-Fedora-15-and-later-RHEL7.patch b/maradns-0001-add-systemd-unit-files.patch
similarity index 71%
rename from maradns-0001-add-systemd-unit-files-Fedora-15-and-later-RHEL7.patch
rename to maradns-0001-add-systemd-unit-files.patch
index 39634a0..7cfac5a 100644
--- a/maradns-0001-add-systemd-unit-files-Fedora-15-and-later-RHEL7.patch
+++ b/maradns-0001-add-systemd-unit-files.patch
@@ -1,14 +1,14 @@
-From d82391b6f2c2a3632d3a6bfea91e120d8694bbb4 Mon Sep 17 00:00:00 2001
+From 2ea5f0753eeb928e7fce815c8bc20430807b5fb6 Mon Sep 17 00:00:00 2001
From: Tomasz Torcz <tomek at pipebreaker.pl>
-Date: Mon, 16 Jul 2012 16:04:59 +0200
-Subject: [PATCH] add systemd unit files (Fedora 15 and later, RHEL7)
+Date: Sun, 13 Oct 2013 22:19:43 +0200
+Subject: [PATCH] add systemd unit files
---
- build/install.sh | 10 ++++++++++
- build/maradns-deadwood.service | 11 +++++++++++
- build/maradns-zoneserver.service | 11 +++++++++++
- build/maradns.service | 11 +++++++++++
- 4 files changed, 43 insertions(+)
+ build/install.sh | 10 ++++++++++
+ build/maradns-deadwood.service | 13 +++++++++++++
+ build/maradns-zoneserver.service | 13 +++++++++++++
+ build/maradns.service | 13 +++++++++++++
+ 4 files changed, 49 insertions(+)
create mode 100644 build/maradns-deadwood.service
create mode 100644 build/maradns-zoneserver.service
create mode 100644 build/maradns.service
@@ -33,14 +33,16 @@ index 2e81170..fabc4f6 100755
+
diff --git a/build/maradns-deadwood.service b/build/maradns-deadwood.service
new file mode 100644
-index 0000000..db822fb
+index 0000000..9f2a522
--- /dev/null
+++ b/build/maradns-deadwood.service
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,13 @@
+[Unit]
+Description=MaraDNS secure Domain Name Server (DNS) recursive resolver
+Documentation=man:Deadwood(1)
-+Requires=network.target
++Requires=network-online.target
++After=network-online.target
++After=network.service
+
+[Service]
+ExecStart=/usr/sbin/Deadwood
@@ -50,14 +52,16 @@ index 0000000..db822fb
+WantedBy=multi-user.target
diff --git a/build/maradns-zoneserver.service b/build/maradns-zoneserver.service
new file mode 100644
-index 0000000..12ca8f2
+index 0000000..6516a02
--- /dev/null
+++ b/build/maradns-zoneserver.service
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,13 @@
+[Unit]
+Description=MaraDNS Zoneserver handles DNS zone transfers and any TCP DNS queries
+Documentation=man:zoneserver(8)
-+Requires=network.target
++Requires=network-online.target
++After=network-online.target
++After=network.service
+
+[Service]
+ExecStart=/usr/sbin/zoneserver -f /etc/mararc
@@ -67,14 +71,16 @@ index 0000000..12ca8f2
+WantedBy=multi-user.target
diff --git a/build/maradns.service b/build/maradns.service
new file mode 100644
-index 0000000..8e3a1ff
+index 0000000..a838a2e
--- /dev/null
+++ b/build/maradns.service
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,13 @@
+[Unit]
+Description=MaraDNS secure Domain Name Server (DNS)
+Documentation=man:maradns(8)
-+Requires=network.target
++Requires=network-online.target
++After=network-online.target
++After=network.service
+
+[Service]
+ExecStart=/usr/sbin/maradns -f /etc/mararc
@@ -83,5 +89,5 @@ index 0000000..8e3a1ff
+[Install]
+WantedBy=multi-user.target
--
-1.7.10.4
+1.8.3.1
diff --git a/maradns.spec b/maradns.spec
index 5876b32..b0fcecc 100644
--- a/maradns.spec
+++ b/maradns.spec
@@ -1,13 +1,13 @@
Name: maradns
Version: 2.0.07c
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Authoritative and recursive DNS server made with security in mind
# recursive resolver is shipped in versioned directory
%global dwood_ver 3.2.03c
Source0: http://www.maradns.org/download/2.0/%{version}/%{name}-%{version}.tar.bz2
# submitted upstream: http://woodlane.webconquest.com/pipermail/list/2012-July/001123.html
-Patch0: %{name}-0001-add-systemd-unit-files-Fedora-15-and-later-RHEL7.patch
+Patch0: %{name}-0001-add-systemd-unit-files.patch
License: BSD
URL: http://www.maradns.org/
@@ -164,6 +164,9 @@ fi
%changelog
+* Sun Oct 13 2013 Tomasz Torcz <ttorcz at fedoraproject.org> - 2.0.07c-2
+- refresh systemd patch, introduce additional deps on network-online (#1015282)
+
* Sat Sep 21 2013 Tomasz Torcz <ttorcz at fedoraproject.org> - 2.0.07c-1
- new upstream version
More information about the scm-commits
mailing list