Use pamd_mimic_system to use the primary pam configuration; drop old revision

(Portage version: -svn/cvs/Linux i686)

3 files changed, 13 insertions, 50 deletions

diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog
index 65170b1c9636..affc904ffe79 100644
--- a/dev-util/schroot/ChangeLog
+++ b/dev-util/schroot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/schroot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.6 2009/10/17 02:02:58 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.7 2009/11/12 02:06:50 abcd Exp $
+
+*schroot-1.2.3-r3 (12 Nov 2009)
+
+  12 Nov 2009; Jonathan Callen <abcd@gentoo.org> -schroot-1.2.3-r2.ebuild,
+  +schroot-1.2.3-r3.ebuild, -files/schroot-1.2.3-pam.patch:
+  Use pamd_mimic_system to use the primary pam configuration; drop old
+  revision
 
   17 Oct 2009; Jonathan Callen <abcd@gentoo.org> -schroot-1.2.3-r1.ebuild,
   schroot-1.2.3-r2.ebuild:
diff --git a/dev-util/schroot/files/schroot-1.2.3-pam.patch b/dev-util/schroot/files/schroot-1.2.3-pam.patch
deleted file mode 100644
index 2cc6d659e558..000000000000
--- a/dev-util/schroot/files/schroot-1.2.3-pam.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-removes the dependency on debian specific pam files. Updates the pam
-configuration to behave as it does on debian.
-
-contributed by Nick Fortino (nfortino@gmail.com) 1/15/2009
-
---- schroot-1.2.1/bin/schroot/pam/schroot.old
-+++ schroot-1.2.1/bin/schroot/pam/schroot
-@@ -23,12 +23,32 @@
- # time restrainst on schroot usage.
- # account    requisite  pam_time.so
- 
--# The standard Unix authentication modules, used with
--# NIS (man nsswitch) as well as normal /etc/passwd and
--# /etc/shadow entries.
--@include common-auth
--@include common-account
--@include common-session
-+# here are the per-package modules (the "Primary" block)
-+auth	[success=1 default=ignore]	pam_unix.so nullok_secure
-+# here's the fallback if no module succeeds
-+auth	requisite			pam_deny.so
-+# prime the stack with a positive return value if there isn't one already;
-+# this avoids us returning an error just because nothing sets a success code
-+# since the modules above will each just jump around
-+auth	required			pam_permit.so
-+
-+# here are the per-package modules (the "Primary" block)
-+account	[success=1 new_authtok_reqd=done default=ignore]	pam_unix.so 
-+# here's the fallback if no module succeeds
-+account	requisite			pam_deny.so
-+# prime the stack with a positive return value if there isn't one already;
-+# this avoids us returning an error just because nothing sets a success code
-+# since the modules above will each just jump around
-+account	required			pam_permit.so
-+
-+# here are the per-package modules (the "Primary" block)
-+session	[default=1]			pam_permit.so
-+# here's the fallback if no module succeeds
-+session	requisite			pam_deny.so
-+# prime the stack with a positive return value if there isn't one already;
-+# this avoids us returning an error just because nothing sets a success code
-+# since the modules above will each just jump around
-+session	required			pam_permit.so
- 
- # Sets up user limits, please uncomment and read /etc/security/limits.conf
- # to enable this functionality.
diff --git a/dev-util/schroot/schroot-1.2.3-r2.ebuild b/dev-util/schroot/schroot-1.2.3-r3.ebuild
index e8b752bfb1b5..0272d4aedcc6 100644
--- a/dev-util/schroot/schroot-1.2.3-r2.ebuild
+++ b/dev-util/schroot/schroot-1.2.3-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.2.3-r2.ebuild,v 1.2 2009/10/17 02:02:58 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.2.3-r3.ebuild,v 1.1 2009/11/12 02:06:50 abcd Exp $
 
 EAPI="2"
 
-inherit autotools base
+inherit autotools base pam
 
 DESCRIPTION="Utility to execute commands in a chroot environment"
 HOMEPAGE="http://packages.debian.org/source/sid/schroot"
@@ -33,7 +33,6 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${P}-autotools.patch"
-	"${FILESDIR}/${P}-pam.patch"
 	"${FILESDIR}/${P}-tests.patch"
 )
 
@@ -77,6 +76,9 @@ src_install() {
 		dohtml doc/schroot/html/* || die "installation of html docs failed"
 	fi
 
+	rm -f "${D}"/etc/pam.d/schroot
+	pamd_mimic_system schroot auth account session
+
 	# Remove *.la files
 	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
 }