Add needed entry for selinux, thanks pebenito.

(Portage version: 2.0.51.22-r2)

5 files changed, 144 insertions, 12 deletions

diff --git a/sys-apps/pam-login/ChangeLog b/sys-apps/pam-login/ChangeLog
index 99708c1cfc47..62cfc1e350ab 100644
--- a/sys-apps/pam-login/ChangeLog
+++ b/sys-apps/pam-login/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pam-login
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.52 2005/08/01 11:48:13 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.53 2005/08/01 13:40:01 azarah Exp $
+
+*pam-login-4.0.11.1-r1 (01 Aug 2005)
+
+  01 Aug 2005; Martin Schlemmer <azarah@gentoo.org> files/login.pamd-4.0,
+  +pam-login-4.0.11.1-r1.ebuild:
+  Add needed entry for selinux, thanks pebenito.
 
 *pam-login-4.0.11.1 (01 Aug 2005)
 
diff --git a/sys-apps/pam-login/Manifest b/sys-apps/pam-login/Manifest
index 3db6838450ee..263679dc75e3 100644
--- a/sys-apps/pam-login/Manifest
+++ b/sys-apps/pam-login/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 ffe6ce4e0d878cf31c9461bf20e034f8 pam-login-4.0.11.1-r1.ebuild 3490
 MD5 080856750b39e5e4ff407da09d3dcd4f pam-login-4.0.11.1.ebuild 3434
 MD5 8881a99f155f3c3eaa29ee645d671e06 ChangeLog 7521
 MD5 2595d9d5d585309a961d44bb056d46fe pam-login-3.17.ebuild 2876
@@ -13,16 +11,10 @@ MD5 68c71aba21339235407b7b913885d667 files/login.defs-4.0 6041
 MD5 97fac4bd3167fadfc2abaeaa819ccbde files/pam_login-Werror-off-ppc64.patch 511
 MD5 9375147f78a25196b654616c969af9a5 files/digest-pam-login-4.0.11.1 69
 MD5 95f7b8980169e81352229bd548909ea7 files/pam-login-4.0.10-fix-configure.patch 579
-MD5 f9321666584a85c0e67eb086df552c64 files/login.pamd-4.0 763
+MD5 32713f9c07cadc12754d92df8bb3a99e files/login.pamd-4.0 969
 MD5 0021ec2d8f5fc517f0e74f7233fc16c9 files/pam-login-3.11-gcc33.patch 527
+MD5 9375147f78a25196b654616c969af9a5 files/digest-pam-login-4.0.11.1-r1 69
 MD5 2fdbabc344539e9dfd4955c061596a27 files/pam-login-3.17-query_user_context.patch 423
 MD5 2e7603feaff187884dd9b1e66601f02b files/login.pamd 382
 MD5 7761083b62bdcb822f1b9533aab2e06c files/pam-login-3.11-lastlog-fix.patch 362
 MD5 e7f9dde204926c73a570b344556e4b1e files/digest-pam-login-3.17 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC7gzH1ZcsMnZjRyIRAtDEAKCkeB3siJAtf4yExWeU4Czzl+YRLgCguX9M
-2kiAQ0fRh66CPeDbWd8ypaE=
-=ypeo
------END PGP SIGNATURE-----
diff --git a/sys-apps/pam-login/files/digest-pam-login-4.0.11.1-r1 b/sys-apps/pam-login/files/digest-pam-login-4.0.11.1-r1
new file mode 100644
index 000000000000..797d6633880d
--- /dev/null
+++ b/sys-apps/pam-login/files/digest-pam-login-4.0.11.1-r1
@@ -0,0 +1 @@
+MD5 e60b7b16128b9e00576073389a0ff1e6 shadow-4.0.11.1.tar.bz2 1056103
diff --git a/sys-apps/pam-login/files/login.pamd-4.0 b/sys-apps/pam-login/files/login.pamd-4.0
index 6676526a9cb4..f8f1f86fbc8e 100644
--- a/sys-apps/pam-login/files/login.pamd-4.0
+++ b/sys-apps/pam-login/files/login.pamd-4.0
@@ -12,6 +12,9 @@ account    required	pam_tally.so deny=0 file=/var/log/faillog onerr=succeed no_m
 
 password   include	system-auth
 
+@selinux@# pam_selinux.so close should be the first session rule
+@selinux@session    required	pam_selinux.so close
+@selinux@
 session    include	system-auth
 session    required	pam_env.so
 session    optional	pam_lastlog.so
@@ -22,3 +25,6 @@ session    optional	pam_mail.so
 # and read carefully README.pam_console in /usr/share/doc/pam*
 #session    optional	pam_console.so
 
+@selinux@# pam_selinux.so open should be the last session rule
+@selinux@session    required	pam_selinux.so multiple open
+@selinux@
diff --git a/sys-apps/pam-login/pam-login-4.0.11.1-r1.ebuild b/sys-apps/pam-login/pam-login-4.0.11.1-r1.ebuild
new file mode 100644
index 000000000000..dde880d4bd80
--- /dev/null
+++ b/sys-apps/pam-login/pam-login-4.0.11.1-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-4.0.11.1-r1.ebuild,v 1.1 2005/08/01 13:40:01 azarah Exp $
+
+inherit eutils libtool flag-o-matic pam
+
+# Do we want to backup an old login.defs, and forcefully
+# install a new version?
+FORCE_LOGIN_DEFS="no"
+
+MY_PN="shadow"
+S="${WORKDIR}/${MY_PN}-${PV}"
+DESCRIPTION="Login, lastlog and faillog for PAM based systems"
+HOMEPAGE="http://shadow.pld.org.pl/"
+SRC_URI="ftp://ftp.pld.org.pl/software/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="livecd nls selinux"
+
+DEPEND="virtual/libc
+	sys-libs/pam
+	>=sys-apps/shadow-4.0.11.1
+	selinux? ( sys-libs/libselinux )"
+# We need sys-apps/shadow-4.0.7-r1, as that no longer installs login.pamd
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# The new configure changes do not detect utmp/logdir properly
+	epatch "${FILESDIR}"/${PN}-4.0.10-fix-configure.patch
+
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	append-ldflags -Wl,-z,now
+	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] \
+		&& export ac_cv_func_setpgrp_void=yes
+	econf \
+		--disable-desrpc \
+		--with-libcrypt \
+		--with-libcrack \
+		--enable-shared=no \
+		--enable-static=yes \
+		--with-libpam \
+		$(use_with skey libskey) \
+		$(use_with selinux) \
+		$(use_enable nls) \
+		|| die "bad configure"
+
+	cd ${S}/man
+	emake SUBDIRS="" \
+	      man_XMANS="faillog.5.xml faillog.8.xml lastlog.8.xml \
+	                 login.1.xml login.access.5.xml login.defs.5.xml" \
+	      man_MANS="faillog.5 faillog.8 lastlog.8 \
+	                login.1 login.access.5 login.defs.5" \
+		|| die "emake man failed"
+	cd ${S}/libmisc
+	emake || die "emake libmisc failed"
+	cd ${S}/lib
+	emake || die "emake lib failed"
+	cd ${S}/src
+	emake faillog lastlog login || die "emake faillog lastlog login failed"
+}
+
+src_install() {
+	cd ${S}/man
+	make SUBDIRS="" \
+	     man_XMANS="faillog.5.xml faillog.8.xml lastlog.8.xml \
+	                login.1.xml login.defs.5.xml" \
+	     man_MANS="faillog.5 faillog.8 lastlog.8 \
+	               login.1 login.defs.5" \
+	     DESTDIR=${D} install || die "emake man failed"
+	cd ${S}/src
+
+	into /
+	dobin ${S}/src/login
+	into /usr
+	dobin ${S}/src/{last,fail}log
+
+	newpamd "${FILESDIR}/login.pamd-4.0" login
+	use selinux || dosed -e '/@selinux@/d' /etc/pam.d/login
+	use selinux && dosed -e 's:@selinux@::g' /etc/pam.d/login
+
+	insinto /etc
+	insopts -m0644
+	newins "${FILESDIR}/login.defs-4.0" login.defs
+
+	# Also install another one that we can use to check if
+	# we need to update it if FORCE_LOGIN_DEFS = "yes"
+	[ "${FORCE_LOGIN_DEFS}" = "yes" ] \
+		&& newins "${FILESDIR}/login.defs" login.defs.new
+
+	dodoc ChangeLog NEWS README TODO
+}
+
+pkg_preinst() {
+	rm -f "${ROOT}/etc/login.defs.new"
+}
+
+pkg_postinst() {
+	[ "${FORCE_LOGIN_DEFS}" != "yes" ] && return 0
+
+	ewarn "Due to a compatibility issue, ${ROOT}etc/login.defs "
+	ewarn "is being updated automatically. Your old login.defs"
+	ewarn "will be backed up as:  ${ROOT}etc/login.defs.bak"
+	echo
+
+	local CHECK1="`md5sum ${ROOT}/etc/login.defs | cut -d ' ' -f 1`"
+	local CHECK2="`md5sum ${ROOT}/etc/login.defs.new | cut -d ' ' -f 1`"
+
+	if [ "${CHECK1}" != "${CHECK2}" ]
+	then
+		cp -a ${ROOT}/etc/login.defs ${ROOT}/etc/login.defs.bak
+		mv -f ${ROOT}/etc/login.defs.new ${ROOT}/etc/login.defs
+	elif [ ! -f ${ROOT}/etc/login.defs ]
+	then
+		mv -f ${ROOT}/etc/login.defs.new ${ROOT}/etc/login.defs
+	else
+		rm -f ${ROOT}/etc/login.defs.new
+	fi
+}