rpms/knot
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update to 1.3.0-rc3

Browse Source 
- 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
This commit is contained in:
Jan Vcelak 2013-07-03 13:00:25 +02:00
parent 025b2fd7d6
commit 56367262d1
5 changed files with 79 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
knot.conf
View File

@ -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";
storage "/var/lib/knot";
rundir "/var/run/knot";
}
interfaces {
my-lo {
address 127.0.0.1;
port 53;
}
local {
address 127.0.0.1;
port 53;
}
}
control {
listen-on "knot.sock";
}
log {
syslog { any warning, error; }
syslog { any warning, error; }
}
zones {
# example.com {
# file "example.com.zone";
# }
}

4
knot.service
View File

@ -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 $OPTIONS
ExecStart=/usr/sbin/knotd
ExecReload=/usr/sbin/knotc reload
Restart=on-abort
[Install]
WantedBy=multi-user.target

84
knot.spec
View File

@ -1,44 +1,61 @@
%global _hardened_build 1
%global alphatag rc3
Summary: An authoritative DNS daemon
Name: knot
Version: 1.2.0
Release: 1%{?dist}
Version: 1.3.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
BuildRequires: flex userspace-rcu-devel openssl-devel
BuildRequires: bison systemd-units libcap-ng-devel
BuildRequires: flex bison ragel openssl-devel userspace-rcu-devel 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"
export DFLAGS="$RPM_OPT_FLAGS -g "
export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
%configure --sysconfdir=%{_sysconfdir}/%{name} --libexecdir=%{_libexecdir}/%{name}
# disable debug code (causes unused warnings)
CFLAGS="%{optflags} -DNDEBUG -Wno-unused"
%configure --sysconfdir=%{_sysconfdir}/%{name} --enable-fastparser
make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
rm %{buildroot}/%{_datadir}/info/dir
install -d %{buildroot}/%{_sharedstatedir}/%{name}
install -d %{buildroot}/%{_unitdir}
install -p -m644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}.service
install -p -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf
# info database is updated at install time
rm %{buildroot}%{_datadir}/info/dir
# 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)
%dir %attr(750,root,root) %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%exclude %{_sysconfdir}/%{name}/example.com.zone
%exclude %{_sysconfdir}/%{name}/knot.sample.conf
%{_sbindir}/*
%{_libexecdir}/%{name}
%exclude %{_libexecdir}/%{name}/unittests*
%{_mandir}/man8/%{name}*.8*
%{_mandir}/man5/%{name}*.5*
%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(-,knot,knot) %{_localstatedir}/run/%{name}
%{_unitdir}/%{name}.service
%dir %{_sharedstatedir}/%{name}
%doc COPYING AUTHORS RELNOTES KNOWN_ISSUES README
%doc samples/bogus25.com.zone samples/example.com.zone.signed samples/knot.full.conf
%doc samples/example.com.zone samples/example.com.zone.signed.nsec3 samples/knot.min.conf
%doc %{_infodir}/knot.info.gz
%{_tmpfilesdir}/%{name}.conf
%{_bindir}/*
%{_sbindir}/*
%{_mandir}/man1/*
%{_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

4
knot.sysconfig
View File

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

2
knot.tmpfiles Normal file
View File

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