From 18e6d02732615a4c34ad0f3d6d773f92a58214c6 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 17 Feb 2010 05:40:55 +0100
Subject: [PATCH] pam, shadow: disable pam_namespace for /tmp and /var/tmp.

There are some problems with it that aren't easy to fix, so give up.

--HG--
extra : convert_revision : 16763d6ef027eab3f9ffed1edcbc0f8fdbe16862
---
 srcpkgs/pam/INSTALL            | 16 ----------------
 srcpkgs/pam/template           | 19 +------------------
 srcpkgs/shadow/files/login.pam |  4 +---
 srcpkgs/shadow/template        |  2 +-
 4 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/pam/INSTALL

diff --git a/srcpkgs/pam/INSTALL b/srcpkgs/pam/INSTALL
deleted file mode 100644
index 1d0d1f0092..0000000000
--- a/srcpkgs/pam/INSTALL
+++ /dev/null
@@ -1,16 +0,0 @@
-# This script creates the pam_namespace(8) instance directories
-# for /tmp and /var/tmpfs, they are created from /tmp/.tmp_inst
-# and /var/tmp/.tmp_inst respectively.
-#
-case "${ACTION}" in
-post)
-	if [ ! -d tmp/.tmp_inst ]; then
-		mkdir -m 0000 tmp/.tmp_inst || exit $?
-		echo "Created pam_namespace(8) /tmp instance dir."
-	fi
-	if [ ! -d var/tmp/.tmp_inst ]; then
-		mkdir -m 0000 var/tmp/.tmp_inst || exit $?
-		echo "Created pam_namespace(8) /var/tmp instance dir."
-	fi
-	;;
-esac
diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index f0e90a1c31..0eef5c567c 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -1,7 +1,7 @@
 # Template file for 'pam'
 pkgname=pam
 version=1.1.1
-revision=3
+revision=4
 wrksrc="Linux-PAM-$version"
 distfiles="${KERNEL_SITE}/libs/pam/library/Linux-PAM-$version.tar.bz2"
 build_style=gnu_configure
@@ -38,23 +38,6 @@ post_install()
 	# Fix unix_chkpwd perms.
 	chmod 4755 ${DESTDIR}/sbin/unix_chkpwd
 
-	#
-	# Enable by default pam_namespace(8) to mount /tmp and
-	# /var/tmp as tmpfs for all users except root.
-	#
-	cat >> ${DESTDIR}/etc/security/namespace.conf << _EOF
-#
-# ------ END OF DEFAULT FILE ---------
-#
-# XBPS: by default create /tmp and /var/tmp tmpfs instances to
-# all users except root.
-#
-/tmp		/tmp/.tmp_inst/		tmpfs	root
-/var/tmp	/var/tmp/.tmp_inst/	tmpfs	root
-#
-_EOF
-	chmod 644 ${DESTDIR}/etc/security/namespace.conf || return 1
-
 	#
 	# Fix a syntax error in namespace.init, -p flag is unknown
 	# at least to dash and bash.
diff --git a/srcpkgs/shadow/files/login.pam b/srcpkgs/shadow/files/login.pam
index bf61258b95..ad3e3a8a07 100644
--- a/srcpkgs/shadow/files/login.pam
+++ b/srcpkgs/shadow/files/login.pam
@@ -1,5 +1,4 @@
-# login pam service with sha512 passwords, cracklib and
-# namespace support for tmpfs /tmp and /var/tmp.
+# login pam service with sha512 passwords and cracklib support.
 auth 		requisite	pam_nologin.so
 auth 		required	pam_securetty.so
 auth 		required	pam_unix.so
@@ -11,6 +10,5 @@ session 	required	pam_limits.so
 session 	optional	pam_mail.so 	dir=/var/mail standard
 session 	optional	pam_lastlog.so
 session 	required	pam_unix.so
-session		required	pam_namespace.so
 password	required	pam_cracklib.so	try_first_pass retry=3
 password	required	pam_unix.so 	sha512 shadow nullok try_first_pass use_authtok
diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index 850dc762a7..266d6f15eb 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -1,7 +1,7 @@
 # Template file for 'shadow'
 pkgname=shadow
 version=4.1.4.2
-revision=2
+revision=3
 distfiles="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--libdir=/lib --enable-shared --disable-static