diff --git a/.cvsignore b/.cvsignore index 4728cea..e0f22d2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -bind-9.7.1rc1.tar.gz +bind-9.7.1.tar.gz config-7.tar.bz2 diff --git a/bind.spec b/bind.spec index 5213768..21d0489 100644 --- a/bind.spec +++ b/bind.spec @@ -3,10 +3,10 @@ # #%define PATCHVER P2 -#%define VERSION %{version} -%define PREVER rc1 +#%define PREVER rc1 #%define VERSION %{version}-%{PATCHVER} -%define VERSION %{version}%{PREVER} +#%define VERSION %{version}%{PREVER} +%define VERSION %{version} %{?!SDB: %define SDB 1} %{?!test: %define test 0} @@ -21,7 +21,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.7.1 -Release: 0.2.%{PREVER}%{?dist} +Release: 1%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -458,7 +458,7 @@ fi # Automatically update configuration from "dnssec-conf-based" to "BIND-based" %triggerpostun -n bind -- dnssec-conf -[ -r '/etc/named.conf' ] || exit 0 +if [ -r '/etc/named.conf' ]; then cp -fp /etc/named.conf /etc/named.conf.rpmsave if grep -Eq '/etc/(named.dnssec.keys|pki/dnssec-keys)' /etc/named.conf; then if grep -q 'dlv.isc.org.conf' /etc/named.conf; then @@ -471,6 +471,23 @@ managed-keys-directory "\/var\/named\/dynamic";/' /etc/named.conf /etc/named.conf /sbin/service named try-restart > /dev/null 2>&1 || :; fi +fi + +# Ditto for chroot +if [ -r '/var/named/chroot/etc/named.conf' ]; then +cp -fp /var/named/chroot/etc/named.conf /var/named/chroot/etc/named.conf.rpmsave +if grep -Eq '/etc/(named.dnssec.keys|pki/dnssec-keys)' /var/named/chroot/etc/named.conf; then + if grep -q 'dlv.isc.org.conf' /var/named/chroot/etc/named.conf; then + # DLV is configured, reconfigure it to new configuration + sed -i -e 's/.*dnssec-lookaside.*dlv\.isc\.org\..*/dnssec-lookaside auto;\ +bindkeys-file "\/etc\/named.iscdlv.key";\ +managed-keys-directory "\/var\/named\/dynamic";/' /var/named/chroot/etc/named.conf + fi + sed -i -e '/.*named\.dnssec\.keys.*/d' -e '/.*pki\/dnssec-keys.*/d' \ + /var/named/chroot/etc/named.conf + /sbin/service named try-restart > /dev/null 2>&1 || :; +fi +fi %post chroot if [ "$1" -gt 0 ]; then @@ -665,6 +682,10 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Mon Jun 28 2010 Adam Tkac 32:9.7.1-1 +- update to 9.7.1 +- improve the "dnssec-conf" trigger + * Wed Jun 09 2010 Adam Tkac 32:9.7.1-0.2.rc1 - update to 9.7.1rc1 - patches merged diff --git a/sources b/sources index fe35608..8b52db6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -fcc7006fa3b89cf01f099d5b43e969a5 bind-9.7.1rc1.tar.gz +712c425e59cb4aa9309bc4716283742f bind-9.7.1.tar.gz 2c02006a58d9b9bb9e758816750b0014 config-7.tar.bz2