rpms/bind/F-8 bind.spec,1.233,1.234

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24303

Modified Files:
	bind.spec 
Log Message:
- CVE-2007-6283



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/bind.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- bind.spec	12 Dec 2007 13:28:21 -0000	1.233
+++ bind.spec	19 Dec 2007 15:59:19 -0000	1.234
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	19.2.%{RELEASEVER}%{?dist}
+Release: 	20.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -448,6 +448,9 @@
 	   /bin/sed -i -e 's^@KEY@^'`/usr/sbin/dns-keygen`'^' /etc/rndc.key ;
 	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
+	[ -e /etc/rndc.key] && chown root:named /etc/rndc.key
+	[ -e /etc/rndc.key] && chmod 0640 /etc/rndc.key
 	[ -x /usr/sbin/bind-chroot-admin ] && /usr/sbin/bind-chroot-admin --sync;
 fi
 :;
@@ -493,6 +496,12 @@
 fi
 :;
 
+%triggerpostun -n bind -- bind <= 32:9.5.0-20.b1
+if [ "$1" -gt 0 ]; then
+	[ -e /etc/rndc.key ] && chown root:named /etc/rndc.key
+	[ -e /etc/rndc.key ] && chmod 0640 /etc/rndc.key
+fi
+:;
 
 %post libs -p /sbin/ldconfig
 
@@ -667,6 +676,9 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Dec 19 2007 Adam Tkac <atkac redhat com> 32:9.5.0-20.b1
+- CVE-2007-6283
+
 * Wed Dec 12 2007 Adam Tkac <atkac redhat com> 32:9.5.0-19.2.b1
 - added dst/gssapi.h to -devel subpackage (#419091)
 - improved fix for (#417431)