From: Wouter Wijngaards Date: Wed, 7 Sep 2011 05:34:22 +0000 (+0000) Subject: fedora specfile updated (from Paul Wouters). X-Git-Tag: release-1.4.13rc2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70c8f304c242fa35490a179bfc12846cb89c163e;p=thirdparty%2Funbound.git fedora specfile updated (from Paul Wouters). git-svn-id: file:///svn/unbound/trunk@2486 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/contrib/unbound.spec_fedora b/contrib/unbound.spec_fedora index d3035162a..6e02a0964 100644 --- a/contrib/unbound.spec_fedora +++ b/contrib/unbound.spec_fedora @@ -8,7 +8,7 @@ Summary: Validating, recursive, and caching DNS(SEC) resolver Name: unbound -Version: 1.4.2 +Version: 1.4.13 Release: 1%{?dist} License: BSD Url: http://www.nlnetlabs.nl/unbound/ @@ -16,16 +16,20 @@ Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz Source1: unbound.init Source2: unbound.conf Source3: unbound.munin -Source4: dlv.isc.org.key +Source4: unbound_munin_ +Source5: root.key +Source6: dlv.isc.org.key Patch1: unbound-1.2-glob.patch Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, openssl-devel , ldns-devel >= 1.5.0, -BuildRequires: libevent-devel +BuildRequires: libevent-devel expat-devel %if %{with_python} -BuildRequires: python-devel +BuildRequires: python-devel swig %endif +# Required for SVN versions +# BuildRequires: bison Requires(post): chkconfig Requires(preun): chkconfig @@ -34,6 +38,9 @@ Requires(postun): initscripts Requires: ldns >= 1.5.0 Requires(pre): shadow-utils +Obsoletes: dnssec-conf < 1.27-2 +Provides: dnssec-conf = 1.27-1 + %description Unbound is a validating, recursive, and caching DNS(SEC) resolver. @@ -67,7 +74,7 @@ Summary: Libraries used by the unbound server and client applications Group: Applications/System Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Requires: openssl >= 0.9.8g-12 +Requires: openssl %description libs Contains libraries used by the unbound server and client applications @@ -88,14 +95,14 @@ Python modules and extensions for unbound %build %configure --with-ldns= --with-libevent --with-pthreads --with-ssl \ - --disable-rpath --enable-debug --disable-static \ + --disable-rpath --disable-static \ --with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \ --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid \ %if %{with_python} --with-pythonmodule --with-pyunbound \ %endif - --enable-sha2 -%{__make} + --enable-sha2 --disable-gost +%{__make} %{?_smp_mflags} %install rm -rf %{buildroot} @@ -107,16 +114,19 @@ install -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/unbound install -d 0755 %{buildroot}%{_sysconfdir}/munin/plugin-conf.d install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/munin/plugin-conf.d/unbound install -d 0755 %{buildroot}%{_datadir}/munin/plugins/ -install -m 0755 contrib/unbound_munin_ %{buildroot}%{_datadir}/munin/plugins/unbound +install -m 0755 %{SOURCE4} %{buildroot}%{_datadir}/munin/plugins/unbound for plugin in unbound_munin_hits unbound_munin_queue unbound_munin_memory unbound_munin_by_type unbound_munin_by_class unbound_munin_by_opcode unbound_munin_by_rcode unbound_munin_by_flags unbound_munin_histogram; do ln -s unbound %{buildroot}%{_datadir}/munin/plugins/$plugin done -# install DLV key -install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/unbound/ +# install root and DLV key +install -m 0644 %{SOURCE5} %{SOURCE6} %{buildroot}%{_sysconfdir}/unbound/ # remove static library from install (fedora packaging guidelines) -rm -rf %{buildroot}%{_libdir}/*.la +rm %{buildroot}%{_libdir}/*.la +%if %{with_python} +rm %{buildroot}%{python_sitearch}/*.la +%endif mkdir -p %{buildroot}%{_localstatedir}/run/unbound @@ -128,15 +138,19 @@ rm -rf ${RPM_BUILD_ROOT} %doc doc/README doc/CREDITS doc/LICENSE doc/FEATURES %attr(0755,root,root) %{_initrddir}/%{name} %attr(0755,root,root) %dir %{_sysconfdir}/%{name} -%attr(0755,unbound,unbound) %dir %{_localstatedir}/run/%{name} +%ghost %attr(0755,unbound,unbound) %dir %{_localstatedir}/run/%{name} %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/unbound.conf %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/dlv.isc.org.key +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/root.key %{_sbindir}/* %{_mandir}/*/* %if %{with_python} %files python -%{python_sitelib}/* +%defattr(-,root,root,-) +%{python_sitearch}/* +%doc libunbound/python/examples/* +%doc pythonmod/examples/* %endif %files munin @@ -186,10 +200,90 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Tue Sep 06 2011 Paul Wouters - 1.4.13-1 +- Updated to 1.4.13 +- Fix install location of pythonmod from sitelib to sitearch +- Removed patches merged in by upstream +- Removed versioned openssl dep, it differs per branch + +* Mon Aug 08 2011 Paul Wouters - 1.4.12-3 +- Added pythonmod docs and examples +- Fix for python module load in the server (Tom Hendrikx) +- No longer enable --enable-debug as it causes degraded performance + under load. + +* Mon Jul 18 2011 Paul Wouters - 1.4.12-1 +- Updated to 1.4.12 + +* Sun Jul 03 2011 Paul Wouters - 1.4.11-1 +- Updated to 1.4.11 +- removed integrated CVE patch +- updated stock unbound.conf for new options introduced + +* Mon Jun 06 2011 Paul Wouters - 1.4.10-1 +- Added ghost for /var/run/unbound (bz#656710) + +* Mon Jun 06 2011 Paul Wouters - 1.4.9-3 +- rebuilt + +* Wed May 25 2011 Paul Wouters - 1.4.9-2 +- Applied patch for CVE-2011-1922 DoS vulnerability + +* Sun Mar 27 2011 Paul Wouters - 1.4.9-1 +- Updated to 1.4.9 + +* Sat Feb 12 2011 Paul Wouters - 1.4.8-2 +- rebuilt + +* Tue Jan 25 2011 Paul Wouters - 1.4.8-1 +- Updated to 1.4.8 +- Enable root key for DNSSEC +- Fix unbound-munin to use proper file (could cause excessive logging) +- Build unbound-python per default +- Disable gost as Fedora/EPEL does not allow ECC and has mangled openssl + +* Tue Oct 26 2010 Paul Wouters - 1.4.5-4 +- Revert last build - it was on the wrong branch + +* Tue Oct 26 2010 Paul Wouters - 1.4.5-3 +- Disable do-ipv6 per default - causes severe degradation on non-ipv6 machines + (see comments in inbound.conf) + +* Tue Jun 15 2010 Paul Wouters - 1.4.5-2 +- Bump release - forgot to upload the new tar ball. + +* Tue Jun 15 2010 Paul Wouters - 1.4.5-1 +- Upgraded to 1.4.5 + +* Mon May 31 2010 Paul Wouters - 1.4.4-2 +- Added accidentally omitted svn patches to cvs + +* Mon May 31 2010 Paul Wouters - 1.4.4-1 +- Upgraded to 1.4.4 with svn patches +- Obsolete dnssec-conf to ensure it is de-installed + +* Thu Mar 11 2010 Paul Wouters - 1.4.3-1 +- Update to 1.4.3 that fixes 64bit crasher + +* Tue Mar 09 2010 Paul Wouters - 1.4.2-1 +- Updated to 1.4.2 +- Updated unbound.conf with new options +- Enabled pre-fetching DNSKEY records (DNSSEC speedup) +- Enabled re-fetching popular records before they expire +- Enabled logging of DNSSEC validation errors + +* Mon Mar 01 2010 Paul Wouters - 1.4.1-5 +- Overriding -D_GNU_SOURCE is no longer needed. This fixes DSO issues + with pthreads + +* Wed Feb 24 2010 Paul Wouters - 1.4.1-3 +- Change make/configure lines to attempt to fix -lphtread linking issue + * Thu Feb 18 2010 Paul Wouters - 1.4.1-2 - Removed dependancy for dnssec-conf - Added ISC DLV key (formerly in dnssec-conf) - Fixup old DLV locations in unbound.conf file via %%post +- Fix parent child disagreement handling and no-ipv6 present [svn r1953] * Tue Jan 05 2010 Paul Wouters - 1.4.1-1 - Updated to 1.4.1 diff --git a/doc/Changelog b/doc/Changelog index 3ffc540ba..ea54e9d86 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +6 September 2011: Wouter + - fedora specfile updated. + 5 September 2011: Wouter - tag 1.4.13rc1