rpms/bind/F-11 bind.spec,1.321,1.322 named.init,1.74,1.75

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8781

Modified Files:
	bind.spec named.init 
Log Message:
- determine file size via `stat` instead of `ls` (#523682)



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-11/bind.spec,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -r1.321 -r1.322
--- bind.spec	15 Sep 2009 15:35:28 -0000	1.321
+++ bind.spec	21 Sep 2009 10:52:09 -0000	1.322
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  5.%{PATCHVER}%{?dist}
+Release:  6.%{PATCHVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -588,6 +588,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Mon Sep 21 2009 Adam Tkac <atkac redhat com> 32:9.6.1-6.P1
+- determine file size via `stat` instead of `ls` (#523682)
+
 * Thu Sep 15 2009 Adam Tkac <atkac redhat com> 32:9.6.1-5.P1
 - fix libs postun section again (#514728)
 - improve chroot related documentation (#507795)


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-11/named.init,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- named.init	15 Sep 2009 15:35:28 -0000	1.74
+++ named.init	21 Sep 2009 10:52:09 -0000	1.75
@@ -76,8 +76,7 @@ mount_chroot_conf()
       # If mount source is a file
       if ! [ -d "$all" ]; then
         # mount it only if it is not present in chroot or it is empty
-        if ! [ -e "$ROOTDIR$all" ] ||
-           [ `ls -s "$ROOTDIR$all" | awk '{ print $1 };'` -eq 0 ]; then
+        if ! [ -e "$ROOTDIR$all" ] || [ `stat -c'%s' "$ROOTDIR$all"` -eq 0 ]; then
           touch "$ROOTDIR$all"
           mount --bind "$all" "$ROOTDIR$all"
         fi