update to 1.3.0-rc3

- update to 1.3.0-rc3
- update configuration
- disable assertions in the code (define NDEBUG)
- enable unit tests as a part of RPM build process
- enable fast zone parser
- fix wrong dates in changelog

knot.conf

@@ -1,16 +1,32 @@
+#
+# Documentation:
+# - /usr/share/doc/knot-*/samples/knot.full.conf
+# - man knot.conf
+# - info Knot
+#
+
 system {
 	storage "/var/lib/knot";
-  pidfile "/var/run/knot.pid";
+	rundir "/var/run/knot";
 }
 
 interfaces {
-  my-lo {
+	local {
 		address 127.0.0.1;
 		port 53;
 	}
 }
 
+control {
+	listen-on "knot.sock";
+}
+
 log {
 	syslog { any warning, error; }
 }
 
+zones {
+#	example.com {
+#		file "example.com.zone";
+#	}
+}

knot.service

@@ -3,11 +3,9 @@ Description=Knot DNS server daemon
 After=syslog.target network.target auditd.service
 
 [Service]
-#EnvironmentFile=/etc/sysconfig/knot
+ExecStart=/usr/sbin/knotd
-ExecStart=/usr/sbin/knotd $OPTIONS
 ExecReload=/usr/sbin/knotc reload
 Restart=on-abort
 
 [Install]
 WantedBy=multi-user.target
-

knot.spec

@@ -1,44 +1,61 @@
 %global _hardened_build 1
+%global alphatag rc3
 
 Summary: An authoritative DNS daemon
 Name: knot
-Version: 1.2.0
+Version: 1.3.0
-Release: 1%{?dist}
+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
 
-BuildRequires: flex userspace-rcu-devel openssl-devel
+BuildRequires: flex bison ragel openssl-devel userspace-rcu-devel libcap-ng-devel
-BuildRequires: bison systemd-units libcap-ng-devel
 BuildRequires: texinfo
+BuildRequires: systemd-units
 
 Requires(post): systemd info
 Requires(preun): systemd info
 Requires(postun): systemd
 
 %description
-KNOT DNS is a high-performance authoritative DNS server implementation.
+Knot DNS is a high-performance authoritative DNS server implementation.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-%{alphatag}
 
 %build
-export CFLAGS="%{optflags} -fPIC -Wall -lgcc_eh" CXXFLAGS="%{optflags} -lgcc_eh"
+# disable debug code (causes unused warnings)
-export DFLAGS="$RPM_OPT_FLAGS -g "
+CFLAGS="%{optflags} -DNDEBUG -Wno-unused"
-export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
+%configure --sysconfdir=%{_sysconfdir}/%{name} --enable-fastparser
-%configure --sysconfdir=%{_sysconfdir}/%{name} --libexecdir=%{_libexecdir}/%{name}
 make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot}
-rm %{buildroot}/%{_datadir}/info/dir
+
-install -d %{buildroot}/%{_sharedstatedir}/%{name}
+# info database is updated at install time
-install -d %{buildroot}/%{_unitdir}
+rm %{buildroot}%{_datadir}/info/dir
-install -p -m644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}.service
+
-install -p -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf
+# install customized configuration file
+rm %{buildroot}%{_sysconfdir}/%{name}/*
+install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
+
+# install service file and create rundir
+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}
+
+# install config samples into docdir
+install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version}/samples
+for sample_file in knot.full.conf knot.keys.conf example.com.zone; do
+	install -p -m 0644 samples/${sample_file} %{buildroot}%{_docdir}/%{name}-%{version}/samples
+done
+
+%check
+make check
 
 %pre
 getent group knot >/dev/null || groupadd -r knot
@@ -61,24 +78,29 @@ fi
 %systemd_postun
 
 %files
-%defattr(-,root,root)
+%doc COPYING AUTHORS NEWS README THANKS
-%dir %attr(750,root,root) %{_sysconfdir}/%{name}
+%dir %attr(750,root,knot) %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%config(noreplace) %attr(640,root,knot) %{_sysconfdir}/%{name}/%{name}.conf
-%exclude %{_sysconfdir}/%{name}/example.com.zone
+%dir %attr(-,knot,knot) %{_sharedstatedir}/%{name}
-%exclude %{_sysconfdir}/%{name}/knot.sample.conf
+%dir %attr(-,knot,knot) %{_localstatedir}/run/%{name}
-%{_sbindir}/*
-%{_libexecdir}/%{name}
-%exclude %{_libexecdir}/%{name}/unittests*
-%{_mandir}/man8/%{name}*.8*
-%{_mandir}/man5/%{name}*.5*
 %{_unitdir}/%{name}.service
-%dir %{_sharedstatedir}/%{name}
+%{_tmpfilesdir}/%{name}.conf
-%doc COPYING AUTHORS RELNOTES KNOWN_ISSUES README
+%{_bindir}/*
-%doc samples/bogus25.com.zone samples/example.com.zone.signed samples/knot.full.conf
+%{_sbindir}/*
-%doc samples/example.com.zone samples/example.com.zone.signed.nsec3 samples/knot.min.conf
+%{_mandir}/man1/*
-%doc %{_infodir}/knot.info.gz
+%{_mandir}/man5/*
+%{_mandir}/man8/*
+%doc %{_infodir}/%{name}.info.gz
 
 %changelog
+* Wed Jul 03 2013 Jan Vcelak <jvcelak@fedoraproject.org> 1.3.0-0.1.rc3
+- update to 1.3.0-rc3
+- update configuration
+- disable assertions in the code (define NDEBUG)
+- enable unit tests as a part of RPM build process
+- enable fast zone parser
+- fix wrong dates in changelog
+
 * Fri Apr 05 2013 Paul Wouters <pwouters@redhat.com> - 1.2.0-1
 - Updated to 1.2.0-1
 - Enabled hardening/relro/pie protection

knot.sysconfig

@@ -1,4 +0,0 @@
-# Settings for the KNOT DNS daemon.
-# KNOTARGS= :  any extra command-line startup arguments for knot dns
-KNOTARGS=""
-

knot.tmpfiles

@@ -0,0 +1,2 @@
+# Knot DNS runtime directory
+d /var/run/knot 0755 knot knot -