- 9.5.1b3 release

- don't mount /proc in chroot, it is no longer needed

3 files changed, 7 insertions, 12 deletions

diff --git a/bind-chroot-admin.in b/bind-chroot-admin.in
index 3a431d4..fca8298 100644
--- a/bind-chroot-admin.in
+++ b/bind-chroot-admin.in
@@ -287,7 +287,6 @@ function clean_root()
     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 @@ case $1 in
     -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 $?;
diff --git a/bind.spec b/bind.spec
index f4323b7..2557269 100644
--- a/bind.spec
+++ b/bind.spec
@@ -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 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 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 @@ done
 
 %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 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_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)
 
diff --git a/named.init b/named.init
index 33b8ce3..5e198af 100755
--- a/named.init
+++ b/named.init
@@ -84,10 +84,6 @@ start()
     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 @@ stop() {
 
   # 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