[pbuilder] Skip mounting /selinux

[Sandro Mani]

commit 38931840e88d371b9f481c6ed9f639351f27f865
Author: Sandro Mani <manisandro at gmail.com>
Date:   Sat Dec 13 21:27:58 2014 +0100

    Skip mounting /selinux

 pbuilder.spec             |    9 ++++++---
 pbuilder_selinux-ro.patch |   13 -------------
 pbuilder_selinux.patch    |   35 +++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 16 deletions(-)
---
diff --git a/pbuilder.spec b/pbuilder.spec
index 92b1170..23935a3 100644
--- a/pbuilder.spec
+++ b/pbuilder.spec
@@ -1,6 +1,6 @@
 Name:           pbuilder
 Version:        0.215
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Personal package builder for Debian packages
 
 License:        GPLv2+
@@ -15,8 +15,8 @@ Patch1:         pbuilder_no-chown.patch
 Patch2:         pbuilder_pbuilderrc.patch
 # Don't test non-existing ubuntu arm-mirrors
 Patch3:         pbuilder_test-arm.patch
-# Mount /selinux read-only, see debian bug #734193
-Patch4:         pbuilder_selinux-ro.patch
+# Skip mounting /selinux
+Patch4:         pbuilder_selinux.patch
 
 BuildArch:      noarch
 
@@ -119,6 +119,9 @@ make check
 
 
 %changelog
+* Sat Dec 13 2014 Sandro Mani <manisandro at gmail.com> - 0.215-13
+- Skip mounting /selinux in chroots
+
 * Sun Dec 07 2014 Sandro Mani <manisandro at gmail.com> - 0.215-12
 - Fix pbuilder_selinux-ro.patch
 
diff --git a/pbuilder_selinux.patch b/pbuilder_selinux.patch
new file mode 100644
index 0000000..4039b90
--- /dev/null
+++ b/pbuilder_selinux.patch
@@ -0,0 +1,35 @@
+diff -rupN pbuilder-0.215/pbuilder-modules pbuilder-0.215-new/pbuilder-modules
+--- pbuilder-0.215/pbuilder-modules	2013-03-26 09:49:36.000000000 +0100
++++ pbuilder-0.215-new/pbuilder-modules	2014-12-13 21:25:52.364076521 +0100
+@@ -212,9 +212,9 @@ function umountproc () {
+     for mnt in $reversed; do
+ 	umount_one "$mnt"
+     done
+-    if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+-	umount_one "selinux"
+-    fi
++#     if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
++# 	umount_one "selinux"
++#     fi
+     if [ "$DEB_BUILD_ARCH_OS" = "linux" ] && [ "$USEDEVPTS" = "yes" ]; then
+ 	umount_one "dev/pts"
+     fi
+@@ -273,12 +273,12 @@ function mountproc () {
+ 	mount -t devpts /dev/pts "$BUILDPLACE/dev/pts" -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE
+ 	mounted[${#mounted[@]}]="$BUILDPLACE/dev/pts"
+     fi
+-    if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
+-	log "I: mounting selinux filesystem"
+-	mkdir -p $BUILDPLACE/selinux
+-	mount -t selinuxfs /selinux "$BUILDPLACE/selinux"
+-	mounted[${#mounted[@]}]="$BUILDPLACE/selinux"
+-    fi
++#     if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
++# 	log "I: mounting selinux filesystem"
++# 	mkdir -p $BUILDPLACE/selinux
++# 	mount -t selinuxfs /selinux "$BUILDPLACE/selinux"
++# 	mounted[${#mounted[@]}]="$BUILDPLACE/selinux"
++#     fi
+     MOUNTPARAMS="-obind"
+     [ "$DEB_BUILD_ARCH_OS" = "kfreebsd" ] && MOUNTPARAMS="-t nullfs"
+     for mnt in $BINDMOUNTS; do