diff --git a/bind.spec b/bind.spec index fdf66ef..07c4616 100644 --- a/bind.spec +++ b/bind.spec @@ -20,7 +20,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv 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 @@ if [ "$1" -eq 1 ]; then # 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 @@ rm -rf ${RPM_BUILD_ROOT} %ghost %{chroot_prefix}/etc/localtime %changelog +* Tue Mar 10 2009 Adam Tkac 32:9.6.0-10.P1 +- enable DNSSEC only if it is enabled in sysconfig/dnssec + * Mon Mar 09 2009 Adam Tkac 32:9.6.0-9.P1 - add DNSSEC support to initscript, enabled it per default - add requires dnssec-conf diff --git a/libbind.pc b/libbind.pc deleted file mode 100644 index 11c6b93..0000000 --- a/libbind.pc +++ /dev/null @@ -1,6 +0,0 @@ -# pkg-config file for libbind -Name: bind-devel -Description: BIND 8 compatible DNS Resolver Library -Version: 9.3.2 -Libs: -lbind -Cflags: -I/usr/include/bind