[knot] update to 1.4.0-rc1

[jvcelak]

commit 996ed11186cb1d6d4d9b00e6db9596cdea2b16e1
Author: Jan Vcelak <jvcelak at fedoraproject.org>
Date:   Tue Nov 26 21:44:24 2013 +0100

    update to 1.4.0-rc1
    
    - update sources, remove old patches
    - create directory for DNSSEC keys
    - update configuration file

 0001-update-wire-read-write-tests.patch |  126 -------------------------------
 knot.conf                               |   11 ++-
 knot.spec                               |   25 ++++--
 sources                                 |    1 +
 4 files changed, 23 insertions(+), 140 deletions(-)
---
diff --git a/knot.conf b/knot.conf
index 26b9d2e..ee8b888 100644
--- a/knot.conf
+++ b/knot.conf
@@ -1,6 +1,6 @@
 #
 # Documentation:
-# - /usr/share/doc/knot-*/samples/knot.full.conf
+# - /usr/share/doc/knot/samples/knot.full.conf
 # - man knot.conf
 # - info Knot
 #
@@ -11,10 +11,8 @@ system {
 }
 
 interfaces {
-	local {
-		address 127.0.0.1;
-		port 53;
-	}
+	local_ipv4 { address 127.0.0.1 at 53; }
+	local_ipv6 { address ::1 at 53; }
 }
 
 control {
@@ -26,6 +24,9 @@ log {
 }
 
 zones {
+	dnssec-keydir "keys";
+	dnssec-enable off;
+
 #	example.com {
 #		file "example.com.zone";
 #	}
diff --git a/knot.spec b/knot.spec
index af6f510..4314be4 100644
--- a/knot.spec
+++ b/knot.spec
@@ -1,20 +1,19 @@
 %global _hardened_build 1
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+%global alphatag rc1
 
 Summary: An authoritative DNS daemon
 Name: knot
-Version: 1.3.2
-Release: 2%{?dist}
+Version: 1.4.0
+Release: 0.1.%{alphatag}%{?dist}
 License: GPLv3
 Group: System Environment/Daemons
 URL: http://www.knot-dns.cz
-Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}.tar.gz
+Source0: http://public.nic.cz/files/knot-dns/%{name}-%{version}-%{alphatag}.tar.gz
 Source1: %{name}.service
 Source2: %{name}.conf
 Source3: %{name}.tmpfiles
 
-Patch1: 0001-update-wire-read-write-tests.patch
-
 BuildRequires: flex bison ragel openssl-devel userspace-rcu-devel libcap-ng-devel
 BuildRequires: texinfo
 BuildRequires: systemd-units
@@ -27,13 +26,12 @@ Requires(postun): systemd
 Knot DNS is a high-performance authoritative DNS server implementation.
 
 %prep
-%setup -q
-%patch1 -p1
+%setup -q -n %{name}-%{version}-%{alphatag}
 
 %build
 # disable debug code (causes unused warnings)
 CFLAGS="%{optflags} -DNDEBUG -Wno-unused"
-%configure --enable-fastparser
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -51,6 +49,11 @@ install -p -m 0644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
 install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}
 
+# create storage dir and key dir
+mkdir -p %{buildroot}%{_sharedstatedir}
+install -d -m 0775 %{buildroot}%{_sharedstatedir}/%{name}
+install -d -m 0750 %{buildroot}%{_sharedstatedir}/%{name}/keys
+
 # install config samples into docdir
 install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples
 for sample_file in knot.full.conf knot.keys.conf example.com.zone; do
@@ -84,7 +87,8 @@ fi
 %doc COPYING AUTHORS NEWS README THANKS
 %dir %attr(750,root,knot) %{_sysconfdir}/%{name}
 %config(noreplace) %attr(640,root,knot) %{_sysconfdir}/%{name}/%{name}.conf
-%dir %attr(-,knot,knot) %{_sharedstatedir}/%{name}
+%dir %attr(775,root,knot) %{_sharedstatedir}/%{name}
+%dir %attr(750,root,knot) %{_sharedstatedir}/%{name}/keys
 %dir %attr(-,knot,knot) %{_localstatedir}/run/%{name}
 %{_unitdir}/%{name}.service
 %{_tmpfilesdir}/%{name}.conf
@@ -96,6 +100,9 @@ fi
 %doc %{_infodir}/%{name}.info.gz
 
 %changelog
+* Tue Nov 26 2013 Jan Vcelak <jvcelak at fedoraproject.org> 1.4.0-0.1.rc1
+- update to 1.4.0-rc1
+
 * Tue Oct 08 2013 Jan Vcelak <jvcelak at fedoraproject.org> 1.3.2-2
 - fix failing wire reading/writing tests on big endian (#1015976)
 
diff --git a/sources b/sources
index aada82e..5037b05 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 0c49d0ab18b975132c138db6e4cf9f66  knot-1.3.2.tar.gz
+314d441162540bc2b3dd6cc7e8a35503  knot-1.4.0-rc1.tar.gz