rpms/bind/F-10 bind-chroot-admin.in, 1.30, 1.31 bind.spec, 1.284, 1.285 named.init, 1.68, 1.69

[Adam Tkac]

Author: atkac

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

Modified Files:
	bind-chroot-admin.in bind.spec named.init 
Log Message:
- 9.5.1b3 release
- don't mount /proc in chroot, it is no longer needed



Index: bind-chroot-admin.in
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/bind-chroot-admin.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- bind-chroot-admin.in	11 Feb 2008 15:47:01 -0000	1.30
+++ bind-chroot-admin.in	11 Nov 2008 14:21:44 -0000	1.31
@@ -287,7 +287,6 @@
     if [ $ENABLED -eq 0 ] ; then # chroot is disabled, clean it up
         if [ -n "${BIND_CHROOT_PREFIX}" -a "x${BIND_CHROOT_PREFIX}" != "x/" ]; then
             rm -r ${BIND_CHROOT_PREFIX}/dev  >/dev/null 2>&1 || :;
-            rmdir ${BIND_CHROOT_PREFIX}/proc >/dev/null 2>&1 || :;
 	    rmdir ${BIND_CHROOT_PREFIX}/etc  >/dev/null 2>&1 || :;
 	    rmdir ${BIND_CHROOT_PREFIX}/var/run/named  >/dev/null 2>&1 || :;
 	    rmdir ${BIND_CHROOT_PREFIX}/var/run/dbus  >/dev/null 2>&1 || :;
@@ -311,7 +310,6 @@
     -d|--disable)
 	disable_bind_chroot;
 	sync_files;
-	/bin/umount ${BIND_CHROOT_PREFIX}/proc >/dev/null 2>&1 || :;
 	/bin/umount ${BIND_CHROOT_PREFIX}/var/run/dbus >/dev/null 2>&1 || :;
 	clean_root;
 	exit $?;


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/bind.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- bind.spec	3 Nov 2008 11:36:03 -0000	1.284
+++ bind.spec	11 Nov 2008 14:21:44 -0000	1.285
@@ -2,7 +2,7 @@
 # Red Hat BIND package .spec file
 #
 
-%define PREVER b2
+%define PREVER b3
 %define VERSION %{version}%{PREVER}
 
 %{?!SDB:       %define SDB       1}
@@ -19,7 +19,7 @@
 Name:     bind
 License:  ISC
 Version:  9.5.1
-Release:  0.8.4.%{PREVER}%{?dist}
+Release:  0.9.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -251,7 +251,7 @@
 
 %build
 export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
-export CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+export CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED"
 export STD_CDEFINES="$CPPFLAGS"
 
 sed -i -e \
@@ -636,6 +636,10 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Tue Nov 11 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.9.b3
+- 9.5.1b3 release
+- don't mount /proc in chroot, it is no longer needed
+
 * Mon Nov 03 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.8.4.b2
 - dig/host: use only IPv4 addresses when -4 option is specified (#469440)
 


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-10/named.init,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- named.init	13 May 2008 07:09:15 -0000	1.68
+++ named.init	11 Nov 2008 14:21:44 -0000	1.69
@@ -84,10 +84,6 @@
     OPTIONS="${OPTIONS} -t ${ROOTDIR}"
     ckcf_options="$ckcf_options -t ${ROOTDIR}";
     [ -s /etc/localtime ] && cp -fp /etc/localtime ${ROOTDIR}/etc/localtime;
-    [ -d ${ROOTDIR}/proc ] || mkdir -p ${ROOTDIR}/proc;
-    if ! egrep -q '^/proc[[:space:]]+'${ROOTDIR}'/proc' /proc/mounts; then
-      mount --bind -n /proc ${ROOTDIR}/proc >/dev/null 2>&1;
-    fi
     if [ ! -z $dbusEnabled ]; then
       if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${ROOTDIR}'/var/run/dbus' /proc/mounts; then
         mkdir -p ${ROOTDIR}/var/run/dbus
@@ -162,9 +158,6 @@
 
   # unmount mounted filesystems/directories
   if [ -n "${ROOTDIR}" -a "x${ROOTDIR}" != "x/" ]; then
-    if egrep -q '^/proc[[:space:]]+'${ROOTDIR}'/proc' /proc/mounts; then
-      umount ${ROOTDIR}/proc >/dev/null 2>&1
-    fi
     if [ ! -z $dbusEnabled ]; then
       if egrep -q '^/[^[:space:]]+[[:space:]]+'${ROOTDIR}'/var/run/dbus' /proc/mounts; then
         umount ${ROOTDIR}/var/run/dbus > /dev/null 2>&1