rpms/bind/FC-6 bind-chroot-admin.in, 1.13, 1.14 bind.spec, 1.140, 1.141

[fedora-cvs-commits at redhat.com]

Author: stransky

Update of /cvs/dist/rpms/bind/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv9332

Modified Files:
	bind-chroot-admin.in bind.spec 
Log Message:
sync with devel


Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-6/bind-chroot-admin.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bind-chroot-admin.in	3 Nov 2006 15:28:30 -0000	1.13
+++ bind-chroot-admin.in	30 Nov 2006 09:31:59 -0000	1.14
@@ -78,24 +78,24 @@
 	/bin/chmod 0640 /etc/sysconfig/named;
     fi
     /bin/mkdir -p ${BIND_DIR}/{slaves,data};
-    /bin/chown root:named ${BIND_DIR};
-    /bin/chown named:named ${BIND_DIR}/{slaves,data};
-    /bin/chmod 750 ${BIND_DIR}
-    /bin/chmod 770 ${BIND_DIR}/{slaves,data};
+    /bin/chown --preserve-root root:named ${BIND_DIR};
+    /bin/chown --preserve-root named:named ${BIND_DIR}/{slaves,data};
+    /bin/chmod --preserve-root 750 ${BIND_DIR}
+    /bin/chmod --preserve-root 770 ${BIND_DIR}/{slaves,data};
         
     mkdir -p ${BIND_CHROOT_PREFIX}/{etc,dev,var/{run/named,named/{slaves,data}}};
-    /bin/chown root:named ${BIND_CHROOT_PREFIX}/{etc,dev,var/{run,named/}};
-    /bin/chown root:named ${BIND_CHROOT_PREFIX}/var;
-    /bin/chmod 750 ${BIND_CHROOT_PREFIX}/{,etc,dev,var,var/{run,named/}};
-    /bin/chown named:named ${BIND_CHROOT_PREFIX}/var/{run/named,named/{data,slaves}};
-    /bin/chmod 770 ${BIND_CHROOT_PREFIX}/var/{run/named,named/{slaves,data}};        
+    /bin/chown --preserve-root root:named ${BIND_CHROOT_PREFIX}/{etc,dev,var/{run,named/}};
+    /bin/chown --preserve-root root:named ${BIND_CHROOT_PREFIX}/var;
+    /bin/chmod --preserve-root 750 ${BIND_CHROOT_PREFIX}/{,etc,dev,var,var/{run,named/}};
+    /bin/chown --preserve-root named:named ${BIND_CHROOT_PREFIX}/var/{run/named,named/{data,slaves}};
+    /bin/chmod --preserve-root 770 ${BIND_CHROOT_PREFIX}/var/{run/named,named/{slaves,data}};        
     
     [ ! -e "${BIND_CHROOT_PREFIX}/dev/random" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/random" c 1 8 
     [ ! -e "${BIND_CHROOT_PREFIX}/dev/zero" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/zero" c 1 5
     [ ! -e "${BIND_CHROOT_PREFIX}/dev/null" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/null" c 1 3
     [ ! -e "${BIND_CHROOT_PREFIX}/etc/localtime" ] &&  [ -e /etc/localtime ] && /bin/cp -fp /etc/localtime "${BIND_CHROOT_PREFIX}/etc/localtime";
-    chown root:named "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
-    chmod 660 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero};
+    /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 /usr/bin/chcon ]; then       
        for dev in random zero null; do
 	   /usr/bin/chcon --reference=/dev/$dev ${BIND_CHROOT_PREFIX}/dev/$dev;
@@ -321,4 +321,4 @@
     *)
 	usage;
 	exit 1;
-esac
\ No newline at end of file
+esac


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/FC-6/bind.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- bind.spec	21 Nov 2006 12:41:01 -0000	1.140
+++ bind.spec	30 Nov 2006 09:31:59 -0000	1.141
@@ -203,10 +203,13 @@
 Group: System Environment/Daemons
 PreReq:   bind       = %{epoch}:%{version}-%{release}
 Requires: bind-utils = %{epoch}:%{version}-%{release}
+Requires(pre):    /etc/openldap/schema
 Requires(post):   bash, coreutils, sed, grep, mktemp
 Requires(preun):  bash, coreutils, sed, grep
 %if %{selinux}
 Requires(post): policycoreutils
+Conflicts: selinux-policy-strict < 2.2.0
+Conflicts: selinux-policy-targeted < 2.2.0
 %endif
 
 %description sdb
@@ -624,7 +627,7 @@
 %{_sbindir}/zone2ldap
 %{_sbindir}/ldap2zone
 %{_sbindir}/zonetodb
-%defattr(0640,root,named,0755)
+%defattr(0644,root,root,0755)
 %config /etc/openldap/schema/dnszone.schema
 %defattr(0644,root,named,0755)
 %{_mandir}/man1/zone2ldap.1*
@@ -779,6 +782,8 @@
 * Fri Nov 21 2006 Martin Stransky <stransky at redhat.com> - 31:9.3.3-0.1.rc3
 - added back an interval to restart
 - renamed package, it should meet the N-V-R criteria
+- fix for #216185: bind-chroot-admin able to change root mode 750
+- added fix from #215997: incorrect permissions on dnszone.schema
 
 * Mon Oct 30 2006 Martin Stransky <stransky at redhat.com> - 30:9.3.3-6
 - fix for #200465: named-checkzone and co. cannot be run as non-root user