rpms/bind/devel bind.spec, 1.267, 1.268 named.conf.sample, 1.3, 1.4 keygen.c, 1.3, NONE
Adam Tkac (atkac)
fedora-extras-commits at redhat.com
Mon Jun 2 12:13:26 UTC 2008
- Previous message (by thread): rpms/man/devel man-1.6f-tty.patch,NONE,1.1 man.spec,1.65,1.66
- Next message (by thread): rpms/nss/devel .cvsignore, 1.17, 1.18 nss.spec, 1.44, 1.45 sources, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: atkac
Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28414
Modified Files:
bind.spec named.conf.sample
Removed Files:
keygen.c
Log Message:
- removed dns-keygen utility in favour of rndc-confgen -a (#449287)
- some minor sample fixes (#449274)
Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- bind.spec 29 May 2008 17:49:23 -0000 1.267
+++ bind.spec 2 Jun 2008 12:12:39 -0000 1.268
@@ -16,7 +16,7 @@
Name: bind
License: ISC
Version: 9.5.0
-Release: 36%{dist}
+Release: 36.1%{dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,7 +26,6 @@
Source1: named.sysconfig
Source2: named.init
Source3: named.logrotate
-Source4: keygen.c
Source5: rfc1912.txt
Source6: bind-chroot.tar.bz2
Source7: bind-9.3.1rc1-sdb_tools-Makefile.in
@@ -353,7 +352,6 @@
install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/etc/rc.d/init.d/named
install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named
touch ${RPM_BUILD_ROOT}%{_sysconfdir}/rndc.key
-%{__cc} $RPM_OPT_FLAGS -o ${RPM_BUILD_ROOT}%{_sbindir}/dns-keygen %{SOURCE4}
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named
%if %{SDB}
@@ -411,12 +409,6 @@
echo '@ in soa localhost. root 1 3H 15M 1W 1D
ns localhost.' > sample/var/named/$f;
done
-/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id$/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
- *\
- * NOTE: you only need to create this file if it is to\
- * differ from the following default contents:
-;d}' > sample/etc/rndc.conf;
-#
:;
%pre
@@ -430,16 +422,8 @@
/sbin/ldconfig
/sbin/chkconfig --add named
if [ "$1" -eq 1 ]; then
- # no more named.boot autoconversion! No-one should be using BIND-4 anymore.
if [ ! -e /etc/rndc.key ]; then
- # create the rndc.key file:
- echo 'key "rndckey" {
- algorithm hmac-md5;
- secret "'`/usr/sbin/dns-keygen`'";
-};' > /etc/rndc.key;
- elif /bin/egrep -q '@KEY@' /etc/rndc.key; then
- # fix potential problem with older versions
- /bin/sed -i -e 's^@KEY@^'`/usr/sbin/dns-keygen`'^' /etc/rndc.key ;
+ /usr/sbin/rndc-confgen -a > /dev/null 2>&1
fi
[ -x /sbin/restorecon ] && /sbin/restorecon /etc/rndc.* /etc/named.* >/dev/null 2>&1 ;
# rndc.key has to have correct perms and ownership, CVE-2007-6283
@@ -536,7 +520,6 @@
%{_sysconfdir}/rc.d/init.d/named
%{_sbindir}/dnssec*
%{_sbindir}/named-check*
-%{_sbindir}/dns-keygen
%{_sbindir}/lwresd
%{_sbindir}/named
%{_sbindir}/named-bootconf
@@ -651,6 +634,10 @@
%{_sbindir}/bind-chroot-admin
%changelog
+* Mon Jun 02 2008 Adam Tkac <atkac redhat com> 32:9.5.0-36.1
+- removed dns-keygen utility in favour of rndc-confgen -a (#449287)
+- some minor sample fixes (#449274)
+
* Wed May 29 2008 Adam Tkac <atkac redhat com> 32:9.5.0-36
- updated to 9.5.0 final
- use getifaddrs to find available interfaces
Index: named.conf.sample
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/named.conf.sample,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- named.conf.sample 2 Apr 2008 12:43:33 -0000 1.3
+++ named.conf.sample 2 Jun 2008 12:12:39 -0000 1.4
@@ -64,7 +64,7 @@
match-clients { localnets; };
recursion yes;
// all views must contain the root hints zone:
- include "/etc/named.root.hints";
+ include "named.ca";
/* these are zones that contain definitions for all the localhost
@@ -96,7 +96,7 @@
key ddns_key
{
algorithm hmac-md5;
- secret "use /usr/sbin/dns-keygen to generate TSIG keys";
+ secret "use /usr/sbin/dnssec-keygen to generate TSIG keys";
};
view "external"
{
@@ -110,7 +110,7 @@
// end up providing free DNS service to all takers
// all views must contain the root hints zone:
- include "/etc/named.root.hints";
+ include "named.ca";
// These are your "authoritative" external zones, and would probably
// contain entries for just your web and mail servers:
--- keygen.c DELETED ---
- Previous message (by thread): rpms/man/devel man-1.6f-tty.patch,NONE,1.1 man.spec,1.65,1.66
- Next message (by thread): rpms/nss/devel .cvsignore, 1.17, 1.18 nss.spec, 1.44, 1.45 sources, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list