rpms/bind/devel bind.spec,1.305,1.306 libbind.pc,1.4,NONE

[Adam Tkac]

Author: atkac

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

Modified Files:
	bind.spec 
Removed Files:
	libbind.pc 
Log Message:
- enable DNSSEC only if it is enabled in sysconfig/dnssec



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- bind.spec	9 Mar 2009 20:35:34 -0000	1.305
+++ bind.spec	10 Mar 2009 11:53:41 -0000	1.306
@@ -20,7 +20,7 @@
 Name:     bind
 License:  ISC
 Version:  9.6.0
-Release:  9.%{PATCHVER}%{?dist}
+Release:  10.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -377,9 +377,14 @@
   # rndc.key has to have correct perms and ownership, CVE-2007-6283
   [ -e /etc/rndc.key ] && chown root:named /etc/rndc.key
   [ -e /etc/rndc.key ] && chmod 0640 /etc/rndc.key
-  # Enable DNSSEC per default
-  [ -x /usr/sbin/dnssec-configure ] && \
-    dnssec-configure -b --norestart --dnssec=on --dlv=off > /dev/null 2>&1
+
+  # Check DNSSEC settings if this is a fresh install
+  if [ -r /etc/sysconfig/dnssec ]; then
+    . /etc/sysconfig/dnssec
+    [ -x /usr/sbin/dnssec-configure ] && \
+      dnssec-configure -b --norestart --dnssec="$DNSSEC" --dlv="$DLV" > \
+        /dev/null 2>&1
+  fi;
 fi
 :;
 
@@ -564,6 +569,9 @@
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Tue Mar 10 2009 Adam Tkac <atkac redhat com> 32:9.6.0-10.P1
+- enable DNSSEC only if it is enabled in sysconfig/dnssec
+
 * Mon Mar 09 2009 Adam Tkac <atkac redhat com> 32:9.6.0-9.P1
 - add DNSSEC support to initscript, enabled it per default
 - add requires dnssec-conf


--- libbind.pc DELETED ---