rpms/bind/devel bind-chroot-admin.in, 1.29, 1.30 bind.spec, 1.245, 1.246 named.init, 1.66, 1.67

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27210

Modified Files:
	bind-chroot-admin.in bind.spec named.init 
Log Message:
- reverted 9.5.0-25.1.b1 changes



Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-chroot-admin.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- bind-chroot-admin.in	8 Feb 2008 10:23:00 -0000	1.29
+++ bind-chroot-admin.in	11 Feb 2008 15:47:01 -0000	1.30
@@ -97,6 +97,11 @@
     [ ! -e "${BIND_CHROOT_PREFIX}/etc/localtime" ] &&  [ -e /etc/localtime ] && /bin/cp -fp /etc/localtime "${BIND_CHROOT_PREFIX}/etc/localtime";
     /bin/chown --preserve-root root:named "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
     /bin/chmod --preserve-root 660 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
+    if selinux_enabled && [ -x /sbin/restorecon ]; then       
+       for dev in random zero null; do
+	   /sbin/restorecon ${BIND_CHROOT_PREFIX}/dev/$dev;
+       done
+    fi;
 }
 
 check_dirs;
@@ -259,8 +264,7 @@
     chmod 770 ${pfx}/var/named/{data/*/.,slaves/*/.,dynamic/*/.} >/dev/null 2>&1;
     if [ -e $changed ]; then
 	if selinux_enabled && [ -x /sbin/restorecon ]; then
-# XXX Do not restorecon ${chroot}/dev/*, done in initscript (#431202)
-	   /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/{etc,var} >/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;


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- bind.spec	8 Feb 2008 10:23:00 -0000	1.245
+++ bind.spec	11 Feb 2008 15:47:01 -0000	1.246
@@ -20,7 +20,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	25.1.%{RELEASEVER}%{?dist}
+Release: 	25.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -253,7 +253,7 @@
 %patch85 -p1 -b .libidn3
 %patch86 -p0 -b .CVE-2008-0122
 %patch87 -p1 -b .parallel
-#%patch88 -p1 -b .transfer-segv
+%patch88 -p1 -b .transfer-segv
 :;
 
 
@@ -654,11 +654,6 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
-* Fri Feb 08 2008 Adam Tkac <atkac redhat com> 32:9.5.0-25.1.b1
-- reverted patch for #400461 (not correct)
-- fixed wrong %{chroot}/dev/* labelling during fresh system installation
-  (#431202)
-
 * Mon Feb 04 2008 Adam Tkac <atkac redhat com> 32:9.5.0-25.b1
 - fixed segfault during sending notifies (#400461)
 - rebuild with gcc 4.3 series


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/named.init,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- named.init	8 Feb 2008 10:23:01 -0000	1.66
+++ named.init	11 Feb 2008 15:47:01 -0000	1.67
@@ -81,13 +81,6 @@
 
   ckcf_options='-z'; # enable named-checkzone for each zone (9.3.1+) !
   if [ -n "${ROOTDIR}" -a "x${ROOTDIR}" != "x/" ]; then
-# XXX There's no way how label devs correctly during installation because
-#     bind-chroot is installed before selinux-policy-targeted (#431202)
-    if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && [ -x /sbin/restorecon ]; then
-       for dev in random zero null; do
-           /sbin/restorecon ${ROOTDIR}/dev/$dev;
-       done
-    fi;
     OPTIONS="${OPTIONS} -t ${ROOTDIR}"
     ckcf_options="$ckcf_options -t ${ROOTDIR}";
     [ -s /etc/localtime ] && cp -fp /etc/localtime ${ROOTDIR}/etc/localtime;