rpms/bind/F-13 bind97-compat-default-keysdir.patch, NONE, 1.1 .cvsignore, 1.66, 1.67 bind.spec, 1.345, 1.346 sources, 1.75, 1.76 bind97-managed-keyfile.patch, 1.1, NONE bind97-rh554316.patch, 1.1, NONE
Adam Tkac
atkac at fedoraproject.org
Mon Jun 28 11:23:00 UTC 2010
- Previous message: rpms/alsa-utils/devel .cvsignore, 1.30, 1.31 alsa-utils.spec, 1.90, 1.91 sources, 1.35, 1.36 alsactl-init-fix-headphone2.patch, 1.1, NONE
- Next message: rpms/libguestfs/devel libguestfs.spec,1.205,1.206
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: atkac
Update of /cvs/pkgs/rpms/bind/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32078
Modified Files:
.cvsignore bind.spec sources
Added Files:
bind97-compat-default-keysdir.patch
Removed Files:
bind97-managed-keyfile.patch bind97-rh554316.patch
Log Message:
- update to 9.7.1
- patches merged
- bind97-managed-keyfile.patch
- bind97-rh554316.patch
- improve the "dnssec-conf" trigger
- set "managed-keys-directory" to /var/named/dynamic to avoid incompatibility
in the stable Fedora release
bind97-compat-default-keysdir.patch:
server.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE bind97-compat-default-keysdir.patch ---
diff -up bind-9.7.1/bin/named/server.c.compat-default-keysdir bind-9.7.1/bin/named/server.c
--- bind-9.7.1/bin/named/server.c.compat-default-keysdir 2010-06-28 13:05:21.109461735 +0200
+++ bind-9.7.1/bin/named/server.c 2010-06-28 13:05:36.228734577 +0200
@@ -734,7 +734,7 @@ configure_view_dnsseckeys(dns_view_t *vi
*/
obj = NULL;
(void)ns_config_get(maps, "managed-keys-directory", &obj);
- directory = obj != NULL ? cfg_obj_asstring(obj) : NULL;
+ directory = obj != NULL ? cfg_obj_asstring(obj) : "/var/named/dynamic";
CHECK(add_keydata_zone(view, directory, ns_g_mctx));
cleanup:
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-13/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore 20 May 2010 12:00:36 -0000 1.66
+++ .cvsignore 28 Jun 2010 11:23:00 -0000 1.67
@@ -1,2 +1,2 @@
-bind-9.7.0-P2.tar.gz
+bind-9.7.1.tar.gz
config-6.tar.bz2
Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-13/bind.spec,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -p -r1.345 -r1.346
--- bind.spec 20 May 2010 12:00:36 -0000 1.345
+++ bind.spec 28 Jun 2010 11:23:00 -0000 1.346
@@ -2,11 +2,11 @@
# Red Hat BIND package .spec file
#
-%define PATCHVER P2
-#%define VERSION %{version}
+#%define PATCHVER P2
#%define PREVER rc2
#%define VERSION %{version}%{PREVER}
-%define VERSION %{version}-%{PATCHVER}
+#%define VERSION %{version}-%{PATCHVER}
+%define VERSION %{version}
%{?!SDB: %define SDB 1}
%{?!test: %define test 0}
@@ -20,8 +20,8 @@
Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
Name: bind
License: ISC
-Version: 9.7.0
-Release: 10.%{PATCHVER}%{?dist}
+Version: 9.7.1
+Release: 1%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,10 +57,9 @@ Patch101:bind-96-old-api.patch
Patch102:bind-95-rh452060.patch
Patch106:bind93-rh490837.patch
Patch107:bind97-dist-pkcs11.patch
-Patch108:bind97-managed-keyfile.patch
Patch109:bind97-rh478718.patch
Patch110:bind97-rh507429.patch
-Patch111:bind97-rh554316.patch
+Patch111:bind97-compat-default-keysdir.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -193,7 +192,7 @@ Based on the code from Jan "Yenya" Kaspr
%patch10 -p1 -b .PIE
%patch16 -p1 -b .redhat_doc
%patch104 -p1 -b .dyndb
-%patch108 -p1 -b .managed-keyfile
+%patch111 -p1 -b .compat-default-keysdir
%if %{SDB}
%patch101 -p1 -b .old-api
mkdir bin/named-sdb
@@ -244,7 +243,6 @@ mkdir m4
%patch107 -p1 -b .dist-pkcs11
%patch109 -p1 -b .rh478718
%patch110 -p1 -b .rh507429
-%patch111 -p1 -b .rh554316
# Sparc and s390 arches need to use -fPIE
%ifarch sparcv9 sparc64 s390 s390x
@@ -462,18 +460,36 @@ 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
# 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";/' /etc/named.conf
+bindkeys-file "\/etc\/named.iscdlv.key";\
+managed-keys-directory "\/var\/named\/dynamic";/' /etc/named.conf
fi
sed -i -e '/.*named\.dnssec\.keys.*/d' -e '/.*pki\/dnssec-keys.*/d' \
/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
@@ -668,6 +684,15 @@ 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
+- patches merged
+ - bind97-managed-keyfile.patch
+ - bind97-rh554316.patch
+- improve the "dnssec-conf" trigger
+- set "managed-keys-directory" to /var/named/dynamic to avoid incompatibility
+ in the stable Fedora release
+
* Thu May 20 2010 Adam Tkac <atkac redhat com> 32:9.7.0-10.P2
- update to 9.7.0-P2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-13/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources 20 May 2010 12:00:37 -0000 1.75
+++ sources 28 Jun 2010 11:23:00 -0000 1.76
@@ -1,2 +1,2 @@
-47fc341901f00c1d815bef12ab4533de bind-9.7.0-P2.tar.gz
+712c425e59cb4aa9309bc4716283742f bind-9.7.1.tar.gz
90bd7f32fd5717b8294313b6b5ccc742 config-6.tar.bz2
--- bind97-managed-keyfile.patch DELETED ---
--- bind97-rh554316.patch DELETED ---
- Previous message: rpms/alsa-utils/devel .cvsignore, 1.30, 1.31 alsa-utils.spec, 1.90, 1.91 sources, 1.35, 1.36 alsactl-init-fix-headphone2.patch, 1.1, NONE
- Next message: rpms/libguestfs/devel libguestfs.spec,1.205,1.206
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list