rpms/bind/devel .cvsignore, 1.68, 1.69 bind.spec, 1.354, 1.355 sources, 1.77, 1.78
Adam Tkac
atkac at fedoraproject.org
Mon Jun 28 11:23:34 UTC 2010
Author: atkac
Update of /cvs/pkgs/rpms/bind/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32282
Modified Files:
.cvsignore bind.spec sources
Log Message:
- update to 9.7.1
- improve the "dnssec-conf" trigger
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore 9 Jun 2010 10:32:54 -0000 1.68
+++ .cvsignore 28 Jun 2010 11:23:33 -0000 1.69
@@ -1,2 +1,2 @@
-bind-9.7.1rc1.tar.gz
+bind-9.7.1.tar.gz
config-7.tar.bz2
Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -p -r1.354 -r1.355
--- bind.spec 9 Jun 2010 10:29:52 -0000 1.354
+++ bind.spec 28 Jun 2010 11:23:33 -0000 1.355
@@ -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 Dom
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\/dy
/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 <atkac redhat com> 32:9.7.1-1
+- update to 9.7.1
+- improve the "dnssec-conf" trigger
+
* Wed Jun 09 2010 Adam Tkac <atkac redhat com> 32:9.7.1-0.2.rc1
- update to 9.7.1rc1
- patches merged
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- sources 9 Jun 2010 10:32:54 -0000 1.77
+++ sources 28 Jun 2010 11:23:34 -0000 1.78
@@ -1,2 +1,2 @@
-fcc7006fa3b89cf01f099d5b43e969a5 bind-9.7.1rc1.tar.gz
+712c425e59cb4aa9309bc4716283742f bind-9.7.1.tar.gz
2c02006a58d9b9bb9e758816750b0014 config-7.tar.bz2
More information about the scm-commits
mailing list