From 4207cef43a7cfdc81dbcf119716d7b81b203ef2ce7a6cd7e6b9513d284f04603 Mon Sep 17 00:00:00 2001
From: Uwe Gansert <ug@suse.com>
Date: Thu, 9 Dec 2010 15:33:29 +0000
Subject: [PATCH] Accepting request 55394 from home:mvyskocil:branches:network

OBS-URL: https://build.opensuse.org/request/show/55394
OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=43
---
 bind.changes                 |  5 +++++
 bind.spec                    |  2 ++
 named-direct-proc-mount.diff | 14 ++++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 named-direct-proc-mount.diff

diff --git a/bind.changes b/bind.changes
index 8432b35..2ef1fa1 100644
--- a/bind.changes
+++ b/bind.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec  9 15:21:15 UTC 2010 - mvyskocil@suse.cz
+
+- fix bnc#656509 - direct mount of /proc in chroot
+
 -------------------------------------------------------------------
 Thu Dec  2 17:38:44 CET 2010 - ug@suse.de
 
diff --git a/bind.spec b/bind.spec
index a4dc3c5..2777dd5 100644
--- a/bind.spec
+++ b/bind.spec
@@ -47,6 +47,7 @@ Patch4:         perl-path.diff
 Patch5:         tmpfs.patch
 Patch51:        pie_compile.diff
 Patch52:        named-bootconf.diff
+Patch54:        named-direct-proc-mount.diff
 Source60:       dlz-schema.txt
 %if %ul_version >= 1
 %define	VENDOR UL
@@ -225,6 +226,7 @@ Authors:
 %endif
 %patch52
 #%patch53
+%patch54 -p1
 # modify settings of some files regarding to OS version and vendor
 function replaceStrings()
 {
diff --git a/named-direct-proc-mount.diff b/named-direct-proc-mount.diff
new file mode 100644
index 0000000..651a56b
--- /dev/null
+++ b/named-direct-proc-mount.diff
@@ -0,0 +1,14 @@
+Index: bind-9.7.2P3/vendor-files/init/named
+===================================================================
+--- bind-9.7.2P3.orig/vendor-files/init/named	2010-12-09 16:17:51.000000000 +0100
++++ bind-9.7.2P3/vendor-files/init/named	2010-12-09 16:19:55.060044775 +0100
+@@ -183,8 +183,7 @@
+ 	# mount /proc for multicore CPUs (bnc#470828)
+         if [ ! -e "${CHROOT_PREFIX}/proc/meminfo" ]; then
+             mkdir -p "${CHROOT_PREFIX}/proc"
+-            mount --bind /proc "${CHROOT_PREFIX}/proc" 2>/dev/null
+-            mount -o remount,ro,nosuid,nodev ${CHROOT_PREFIX}/proc 2>/dev/null
++            mount -tproc -oro,nosuid,nodev,noexec proc ${CHROOT_PREFIX}/proc 2>/dev/null
+         fi;
+ 
+         ###########################