rpms/unbound/devel unbound.init,1.6,1.7 unbound.spec,1.22,1.23

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/unbound/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7491

Modified Files:
	unbound.init unbound.spec 
Log Message:
- add DNSSEC support to initscript, enabled it per default
- add requires dnssec-conf



Index: unbound.init
===================================================================
RCS file: /cvs/pkgs/rpms/unbound/devel/unbound.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- unbound.init	26 Jan 2009 23:02:22 -0000	1.6
+++ unbound.init	9 Mar 2009 20:36:02 -0000	1.7
@@ -28,9 +28,14 @@
 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


Index: unbound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unbound/devel/unbound.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- unbound.spec	25 Feb 2009 22:57:23 -0000	1.22
+++ unbound.spec	9 Mar 2009 20:36:02 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
@@ -18,6 +18,7 @@
 Requires(postun): initscripts
 Requires: ldns >= 1.5.0
 Requires(pre): shadow-utils
+Requires: dnssec-conf
 # Is this obsolete?
 #Provides: caching-nameserver
 
@@ -125,12 +126,16 @@
 -c "Unbound DNS resolver" unbound
 exit 0
 
-%post 
+%post
+# Enable DNSSEC per default
+if [ "$1" -eq 1 ]; then
+    [ -x /usr/sbin/dnssec-configure ] && \
+	dnssec-configure -u --norestart --dnssec=on --dlv=off > /dev/null 2>&1
+fi
 /sbin/chkconfig --add %{name}
 
 %post libs -p /sbin/ldconfig
 
-
 %preun
 if [ "$1" -eq 0 ]; then
         /sbin/service %{name} stop >/dev/null 2>&1
@@ -145,6 +150,10 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Mon Mar 09 2009 Adam Tkac <atkac redhat com> - 1.2.1-3
+- add DNSSEC support to initscript and enabled it per default
+- add requires dnssec-conf
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild