rpms/bind/F-8 bind-chroot-admin.in, 1.26, 1.27 bind.spec, 1.229, 1.230 bind-9.5-random_ports.patch, 1.1, NONE

[Adam Tkac (atkac)]

Author: atkac

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

Modified Files:
	bind-chroot-admin.in bind.spec 
Removed Files:
	bind-9.5-random_ports.patch 
Log Message:
- removed bind-9.5-random_ports.patch because upstream doesn't
  like it. query-source{,-v6} is sufficient
- bind-chroot-admin called restorecon on /proc filesystem (#405281)



Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/bind-chroot-admin.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- bind-chroot-admin.in	20 Sep 2007 11:07:30 -0000	1.26
+++ bind-chroot-admin.in	3 Dec 2007 14:42:57 -0000	1.27
@@ -230,7 +230,7 @@
 	done
 	pfx=${BIND_CHROOT_PREFIX}
     else              # chroot is disabled	
-	/usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/named{/*,/data/*,/slaves/*,/dynamic/*}} -maxdepth 0 |
+	/usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/{named{/*,/data/*,/slaves/*,/dynamic/*},log/named.log}} -maxdepth 0 |
 	while read f; 
 	do
 	    if [ ! -d "$f" ]; then
@@ -238,8 +238,6 @@
 		[ ! -e $changed ] && touch $changed;
 	    fi;
 	done
-	[ -L /var/log/named.log ] && rm -f /var/log/named.log
-	[ -e ${BIND_CHROOT_PREFIX}/var/log/named.log ] && mv -f ${BIND_CHROOT_PREFIX}/var/log/named.log /var/log/named.log
     fi;
     if [ ! -e ${pfx}/etc/rndc.key ]; then
 	   echo 'key "rndckey" {
@@ -266,11 +264,15 @@
     chmod 770 ${pfx}/var/named/{data/*/.,slaves/*/.,dynamic/*/.} >/dev/null 2>&1;
     if [ -e $changed ]; then
 	if selinux_enabled && [ -x /sbin/restorecon ]; then
-	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX} >/dev/null 2>&1;
+	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/{dev,etc,var} >/dev/null 2>&1;
 	   /sbin/restorecon /etc/named.*    >/dev/null 2>&1;
 	   /sbin/restorecon /etc/rndc.key   >/dev/null 2>&1;
 	   /sbin/restorecon /etc/rndc.conf  >/dev/null 2>&1;
-	   /sbin/restorecon -R /var/named   >/dev/null 2>&1;
+	   for all in `ls /var/named`; do
+		if [ "x$all" != "xchroot" ]; then
+		    restorecon -R /var/named/"$all" > /dev/null 2>&1;
+		fi
+	   done
 	fi;
 	/sbin/service named try-restart
 	rm -f $changed;


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/bind.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- bind.spec	21 Nov 2007 11:50:12 -0000	1.229
+++ bind.spec	3 Dec 2007 14:42:57 -0000	1.230
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	18.2.%{RELEASEVER}%{?dist}
+Release: 	18.3.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,7 +63,6 @@
 Patch71:	bind-9.5-overflow.patch
 Patch72:	bind-9.5-dlz-64bit.patch
 Patch80:	bind-9.5-edns.patch
-Patch83:	bind-9.5-random_ports.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -257,7 +256,6 @@
 %endif
 %patch73 -p1 -b .libidn
 %patch80 -p1 -b .edns
-%patch83 -p1 -b .ports
 :;
 
 
@@ -665,6 +663,11 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Mon Dec 03 2007 Adam Tkac <atkac redhat com> 32:9.5.0-18.3.a7
+- removed bind-9.5-random_ports.patch because upstream doesn't
+  like it. query-source{,-v6} is sufficient
+- bind-chroot-admin called restorecon on /proc filesystem (#405281)
+
 * Tue Nov 20 2007 Adam Tkac <atkac redhat com> 32:9.5.0-18.2.a7
 - use system port selector instead ISC's (#391931)
 


--- bind-9.5-random_ports.patch DELETED ---