[nsd] * Mon Jul 28 2014 Paul Wouters <pwouters at redhat.com> - 3.2.18-1 - Updated to 3.2.18 - improved TXT p

[Paul Wouters]

commit 474991ccb7556a69cc14bca50007199b575e6c8f
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jul 28 10:40:11 2014 -0400

    * Mon Jul 28 2014 Paul Wouters <pwouters at redhat.com> - 3.2.18-1
    - Updated to 3.2.18 - improved TXT parsing, new NSID option

 .gitignore  |    1 +
 nsd.service |    2 +-
 nsd.spec    |    8 ++++++--
 sources     |    2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1cf1275..f4b0ca7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ nsd-3.2.6.tar.gz
 /nsd-3.2.14.tar.gz
 /nsd-3.2.15.tar.gz
 /nsd-3.2.17.tar.gz
+/nsd-3.2.18.tar.gz
diff --git a/nsd.service b/nsd.service
index 03af2c6..3aa7f4b 100644
--- a/nsd.service
+++ b/nsd.service
@@ -7,7 +7,7 @@ Type=simple
 PIDFile=/var/run/nsd/nsd.pid
 EnvironmentFile=-/etc/sysconfig/nsd
 ExecStartPre=/usr/sbin/nsdc -c /etc/nsd/nsd.conf rebuild
-ExecStart=/usr/sbin/nsd -D -c /etc/nsd/nsd.conf $OTHER_NSD_OPTS
+ExecStart=/usr/sbin/nsd -d -c /etc/nsd/nsd.conf $OTHER_NSD_OPTS
 ExecReload=/usr/sbin/nsdc -c /etc/nsd/nsd.conf rebuild
 ExecReload=/usr/sbin/nsdc -c /etc/nsd/nsd.conf reload
 # notify blocks on misconfigurations - but does show it very loudly
diff --git a/nsd.spec b/nsd.spec
index a6a1241..61479a9 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -2,8 +2,8 @@
 
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
-Version: 3.2.17
-Release: 2%{?dist}
+Version: 3.2.18
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -107,6 +107,10 @@ exit 0
 /bin/systemctl try-restart nsd.service >/dev/null 2>&1 || :
 
 %changelog
+* Mon Jul 28 2014 Paul Wouters <pwouters at redhat.com> - 3.2.18-1
+- Updated to 3.2.18 - improved TXT parsing, new NSID option
+- Fix nsd.service daemonize option (rhbz#1089505)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index b1b3ad1..37ae3dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a8efd1a38d958de9cd3e1c077d9818c1  nsd-3.2.17.tar.gz
+454f38f7540c319f5131b67f31a26ae5  nsd-3.2.18.tar.gz