rpms/bind/devel bind97-keysdir.patch, NONE, 1.1 .cvsignore, 1.66, 1.67 bind.spec, 1.352, 1.353 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 May 31 16:51:40 UTC 2010
Author: atkac
Update of /cvs/pkgs/rpms/bind/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32256
Modified Files:
.cvsignore bind.spec sources
Added Files:
bind97-keysdir.patch
Removed Files:
bind97-managed-keyfile.patch bind97-rh554316.patch
Log Message:
- update to 9.7.1b1
- make /var/named/dynamic as a default directory for managed DNSSEC keys
- add patch to get "managed-keys-directory" option working
- patches merged
- bind97-managed-keyfile.patch
- bind97-rh554316.patch
bind97-keysdir.patch:
namedconf.c | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE bind97-keysdir.patch ---
diff -up bind-9.7.1b1/lib/isccfg/namedconf.c.keysdir bind-9.7.1b1/lib/isccfg/namedconf.c
--- bind-9.7.1b1/lib/isccfg/namedconf.c.keysdir 2010-05-21 14:53:47.547846620 +0200
+++ bind-9.7.1b1/lib/isccfg/namedconf.c 2010-05-21 14:55:37.587846690 +0200
@@ -849,6 +849,7 @@ options_clauses[] = {
{ "interface-interval", &cfg_type_uint32, 0 },
{ "listen-on", &cfg_type_listenon, CFG_CLAUSEFLAG_MULTI },
{ "listen-on-v6", &cfg_type_listenon, CFG_CLAUSEFLAG_MULTI },
+ { "managed-keys-directory", &cfg_type_qstring, 0 },
{ "match-mapped-addresses", &cfg_type_boolean, 0 },
{ "memstatistics-file", &cfg_type_qstring, 0 },
{ "memstatistics", &cfg_type_boolean, 0 },
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore 20 May 2010 11:58:03 -0000 1.66
+++ .cvsignore 31 May 2010 16:51:39 -0000 1.67
@@ -1,2 +1,2 @@
-config-6.tar.bz2
-bind-9.7.0-P2.tar.gz
+bind-9.7.1b1.tar.gz
+config-7.tar.bz2
Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -p -r1.352 -r1.353
--- bind.spec 21 May 2010 15:32:09 -0000 1.352
+++ bind.spec 31 May 2010 16:51:39 -0000 1.353
@@ -2,11 +2,11 @@
# Red Hat BIND package .spec file
#
-%define PATCHVER P2
+#%define PATCHVER P2
#%define VERSION %{version}
-#%define PREVER rc2
-#%define VERSION %{version}%{PREVER}
-%define VERSION %{version}-%{PATCHVER}
+%define PREVER b1
+#%define VERSION %{version}-%{PATCHVER}
+%define VERSION %{version}%{PREVER}
%{?!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: 11.%{PATCHVER}%{?dist}
+Version: 9.7.1
+Release: 0.1.%{PREVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,7 +38,7 @@ Source8: dnszone.schema
Source12: README.sdb_pgsql
Source21: Copyright.caching-nameserver
Source25: named.conf.sample
-Source28: config-6.tar.bz2
+Source28: config-7.tar.bz2
Source30: ldap2zone.c
Source31: ldap2zone.1
Source32: named-sdb.8
@@ -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-keysdir.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -193,7 +192,6 @@ 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
%if %{SDB}
%patch101 -p1 -b .old-api
mkdir bin/named-sdb
@@ -244,7 +242,7 @@ mkdir m4
%patch107 -p1 -b .dist-pkcs11
%patch109 -p1 -b .rh478718
%patch110 -p1 -b .rh507429
-%patch111 -p1 -b .rh554316
+%patch111 -p1 -b .keysdir
# Sparc and s390 arches need to use -fPIE
%ifarch sparcv9 sparc64 s390 s390x
@@ -468,7 +466,8 @@ if grep -Eq '/etc/(named.dnssec.keys|pki
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
@@ -668,6 +667,14 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Mon May 31 2010 Adam Tkac <atkac redhat com> 32:9.7.1-0.1.b1
+- update to 9.7.1b1
+- make /var/named/dynamic as a default directory for managed DNSSEC keys
+- add patch to get "managed-keys-directory" option working
+- patches merged
+ - bind97-managed-keyfile.patch
+ - bind97-rh554316.patch
+
* Fri May 21 2010 Adam Tkac <atkac redhat com> 32:9.7.0-11.P2
- update dnssec-conf Obsoletes/Provides
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources 20 May 2010 11:58:03 -0000 1.75
+++ sources 31 May 2010 16:51:40 -0000 1.76
@@ -1,2 +1,2 @@
-90bd7f32fd5717b8294313b6b5ccc742 config-6.tar.bz2
-47fc341901f00c1d815bef12ab4533de bind-9.7.0-P2.tar.gz
+c5adb6cd318a4ff6e6b5468f47056597 bind-9.7.1b1.tar.gz
+2c02006a58d9b9bb9e758816750b0014 config-7.tar.bz2
--- bind97-managed-keyfile.patch DELETED ---
--- bind97-rh554316.patch DELETED ---
More information about the scm-commits
mailing list