Merge branch 'master' into f20
This commit is contained in:
commit
46f4eef576
@ -1,8 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Documentation:
|
# See knot.conf(5) manual page for documentation.
|
||||||
# - /usr/share/doc/knot/samples/knot.full.conf
|
|
||||||
# - man knot.conf
|
|
||||||
# - info Knot
|
|
||||||
#
|
#
|
||||||
|
|
||||||
system {
|
system {
|
||||||
|
69
knot.spec
69
knot.spec
@ -1,9 +1,13 @@
|
|||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||||
|
|
||||||
|
# TODO:
|
||||||
|
# - split into subpackages
|
||||||
|
# - documentation building
|
||||||
|
|
||||||
Summary: An authoritative DNS daemon
|
Summary: An authoritative DNS daemon
|
||||||
Name: knot
|
Name: knot
|
||||||
Version: 1.4.7
|
Version: 1.5.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv3
|
License: GPLv3
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -14,13 +18,12 @@ Source2: %{name}.conf
|
|||||||
Source3: %{name}.tmpfiles
|
Source3: %{name}.tmpfiles
|
||||||
|
|
||||||
BuildRequires: flex bison openssl-devel userspace-rcu-devel libcap-ng-devel libidn-devel
|
BuildRequires: flex bison openssl-devel userspace-rcu-devel libcap-ng-devel libidn-devel
|
||||||
BuildRequires: texinfo
|
|
||||||
BuildRequires: systemd-units
|
BuildRequires: systemd-units
|
||||||
# ragel is optional, required only if .rl source files are modified
|
# ragel is optional, required only if .rl source files are modified
|
||||||
#BuildRequires: ragel
|
#BuildRequires: ragel
|
||||||
|
|
||||||
Requires(post): systemd info
|
Requires(post): systemd
|
||||||
Requires(preun): systemd info
|
Requires(preun): systemd
|
||||||
Requires(postun): systemd
|
Requires(postun): systemd
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -38,9 +41,6 @@ make %{?_smp_mflags}
|
|||||||
%install
|
%install
|
||||||
make install DESTDIR=%{buildroot}
|
make install DESTDIR=%{buildroot}
|
||||||
|
|
||||||
# info database is updated at install time
|
|
||||||
rm %{buildroot}%{_datadir}/info/dir
|
|
||||||
|
|
||||||
# install customized configuration file
|
# install customized configuration file
|
||||||
rm %{buildroot}%{_sysconfdir}/%{name}/*
|
rm %{buildroot}%{_sysconfdir}/%{name}/*
|
||||||
install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
|
install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
|
||||||
@ -57,10 +57,16 @@ install -d -m 0750 %{buildroot}%{_sharedstatedir}/%{name}/keys
|
|||||||
|
|
||||||
# install config samples into docdir
|
# install config samples into docdir
|
||||||
install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples
|
install -d -m 0755 %{buildroot}%{_pkgdocdir}/samples
|
||||||
for sample_file in knot.full.conf knot.keys.conf example.com.zone; do
|
for sample_file in knot.sample.conf example.com.zone; do
|
||||||
install -p -m 0644 samples/${sample_file} %{buildroot}%{_pkgdocdir}/samples
|
install -p -m 0644 samples/${sample_file} %{buildroot}%{_pkgdocdir}/samples
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# remove libarchive files
|
||||||
|
rm %{buildroot}%{_libdir}/*.la
|
||||||
|
|
||||||
|
# remove .so files, the headers are not available
|
||||||
|
rm %{buildroot}%{_libdir}/*.so
|
||||||
|
|
||||||
%check
|
%check
|
||||||
make check
|
make check
|
||||||
|
|
||||||
@ -72,16 +78,14 @@ useradd -r -g knot -d %{_sysconfdir}/knot -s /sbin/nologin \
|
|||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
|
/sbin/ldconfig
|
||||||
%systemd_post knot.service
|
%systemd_post knot.service
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%systemd_preun knot.service
|
%systemd_preun knot.service
|
||||||
if [ $1 -eq 0 ] ; then
|
|
||||||
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
|
|
||||||
fi
|
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
|
/sbin/ldconfig
|
||||||
%systemd_postun
|
%systemd_postun
|
||||||
|
|
||||||
%files
|
%files
|
||||||
@ -95,12 +99,51 @@ fi
|
|||||||
%{_tmpfilesdir}/%{name}.conf
|
%{_tmpfilesdir}/%{name}.conf
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%{_sbindir}/*
|
%{_sbindir}/*
|
||||||
|
%{_libdir}/libknot.so.*
|
||||||
|
%{_libdir}/libzscanner.so.*
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
%{_mandir}/man5/*
|
%{_mandir}/man5/*
|
||||||
%{_mandir}/man8/*
|
%{_mandir}/man8/*
|
||||||
%doc %{_infodir}/%{name}.info.gz
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 10 2014 Jan Vcelak <jvcelak@fedoraproject.org> 1.5.0-1
|
||||||
|
- update to 1.5.0
|
||||||
|
+ reimplemented DDNS forwarding
|
||||||
|
+ transfer sizes logged in bytes
|
||||||
|
+ logging of outgoing/incoming NOTIFY messages
|
||||||
|
+ zone flush planning after bootstrap
|
||||||
|
+ DDNS signing changes freeing
|
||||||
|
+ knotc key handling
|
||||||
|
|
||||||
|
* Wed Jun 18 2014 Jan Vcelak <jvcelak@fedoraproject.org> 1.5.0-0.3.rc2
|
||||||
|
- update to 1.5.0-rc2
|
||||||
|
+ edns-client-subnet support in kdig
|
||||||
|
+ optional asynchronous startup (config 'asynchronous-start')
|
||||||
|
+ preempt task queue for faster reload
|
||||||
|
+ lazy zone file write after zone transfer (config 'zonefile-sync')
|
||||||
|
+ close zone transfer after SERVFAIL response
|
||||||
|
+ incremental to full zone transfer fallback, wrong log message
|
||||||
|
+ zone events corner cases, reload replanning
|
||||||
|
|
||||||
|
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-0.2.rc1
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jun 04 2014 Jan Vcelak <jvcelak@fedoraproject.org> 1.5.0-0.1.rc1
|
||||||
|
- update to 1.5.0-rc1
|
||||||
|
+ Pluggable query processing modules
|
||||||
|
+ Synthetic IPv4/IPv6 reverse/forward records (optional module)
|
||||||
|
+ Dnstap support in both utilities & server (optional module)
|
||||||
|
+ NOTIFY message support and new TSIG section in kdig
|
||||||
|
+ Multi-master support
|
||||||
|
+ Query processing and core functionality overhaul
|
||||||
|
+ Performance and reduced memory footprint
|
||||||
|
+ Faster zone events scheduling
|
||||||
|
+ RFC compliant queries/responses in some corner cases
|
||||||
|
+ Log messages
|
||||||
|
+ New documentation (Sphinx)
|
||||||
|
- enabled dynamic linking
|
||||||
|
- removed info pages
|
||||||
|
|
||||||
* Wed Jun 18 2014 Jan Vcelak <jvcelak@fedoraproject.org> 1.4.7-1
|
* Wed Jun 18 2014 Jan Vcelak <jvcelak@fedoraproject.org> 1.4.7-1
|
||||||
- update to 1.4.7
|
- update to 1.4.7
|
||||||
+ Fixed DDNS corner cases
|
+ Fixed DDNS corner cases
|
||||||
|
Loading…
Reference in New Issue
Block a user