diff --git a/.cvsignore b/.cvsignore index 4af27ad..dec5f53 100644 --- a/.cvsignore +++ b/.cvsignore @@ -8,3 +8,4 @@ unbound-1.3.3.tar.gz unbound-1.3.4.tar.gz unbound-1.4.1.tar.gz unbound-1.4.3.tar.gz +unbound-1.4.4.tar.gz diff --git a/sources b/sources index cd5b5a9..591cc97 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 2dffdd42f94b8238447a41835439d129 unbound-1.4.3.tar.gz +c7e6a35b92cbd2c93bc808228aa76725 unbound-1.4.4.tar.gz diff --git a/unbound.init b/unbound.init index 9fb6a8e..b9324b2 100644 --- a/unbound.init +++ b/unbound.init @@ -30,14 +30,9 @@ pidfile="/var/run/unbound/unbound.pid" piddir=`dirname $pidfile` [ -e /etc/sysconfig/unbound ] && . /etc/sysconfig/unbound -[ -e /etc/sysconfig/dnssec ] && . /etc/sysconfig/dnssec lockfile=/var/lock/subsys/unbound -[ -x /usr/sbin/dnssec-configure ] && [ -r "$config" ] && - [ /etc/sysconfig/dnssec -nt "$config" ] && \ - /usr/sbin/dnssec-configure -u --norestart --dnssec="$DNSSEC" --dlv="$DLV" - start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 diff --git a/unbound.spec b/unbound.spec index 0e7e147..00e75d4 100644 --- a/unbound.spec +++ b/unbound.spec @@ -8,8 +8,8 @@ Summary: Validating, recursive, and caching DNS(SEC) resolver Name: unbound -Version: 1.4.3 -Release: 2%{?dist} +Version: 1.4.4 +Release: 1%{?dist} License: BSD Url: http://www.nlnetlabs.nl/unbound/ Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz @@ -18,6 +18,19 @@ Source2: unbound.conf Source3: unbound.munin Source4: dlv.isc.org.key Patch1: unbound-1.2-glob.patch +Patch2: unbound-1.4.4-c2baa7.patch +Patch3: unbound-1.4.4-40d18f.patch +Patch4: unbound-1.4.4-7f27d6.patch +Patch5: unbound-1.4.4-74d75e.patch +Patch6: unbound-1.4.4-374822.patch +Patch7: unbound-1.4.4-00f12c.patch +Patch8: unbound-1.4.4-41b631.patch +Patch9: unbound-1.4.4-5f58ed.patch +Patch10: unbound-1.4.4-d7ef7b.patch +Patch11: unbound-1.4.4-778d4a.patch +Patch12: unbound-1.4.4-5e989a.patch +Patch13: unbound-1.4.4-a6f07b.patch +Patch14: unbound-1.4.4-28093c.patch Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,6 +42,7 @@ BuildRequires: python-devel swig # Required for SVN versions #BuildRequires: bison + Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts @@ -36,6 +50,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. @@ -87,6 +104,20 @@ Python modules and extensions for unbound %prep %setup -q %patch1 -p1 +# svn/git patches +%patch2 -p1 +%patch4 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch3 -p1 +%patch5 -p1 %build %configure --with-ldns= --with-libevent --with-pthreads --with-ssl \ @@ -96,8 +127,8 @@ Python modules and extensions for unbound %if %{with_python} --with-pythonmodule --with-pyunbound \ %endif - --enable-sha2 -%{__make} QUIET=no %{?_smp_mflags} + --enable-sha2 +%{__make} %{?_smp_mflags} %install rm -rf %{buildroot} @@ -191,6 +222,10 @@ fi %postun libs -p /sbin/ldconfig %changelog +* 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 + * Fri Apr 02 2010 Paul Wouters - 1.4.3-2 - Updated unbound.conf with new options - Enabled pre-fetching DNSKEY records (DNSSEC speedup)