Finally close bug #451068 by using /run/sepermit directly, and installing a tmpfiles.d file for it to be re-created at boot time.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

2 files changed, 21 insertions, 8 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index b7ac55b362cd..cbc4395ad36c 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/pam
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.314 2012/10/07 18:52:57 flameeyes Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.315 2013/01/30 15:36:43 flameeyes Exp $
+
+*pam-1.1.6-r1 (30 Jan 2013)
+
+  30 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org> +pam-1.1.6-r1.ebuild,
+  -pam-1.1.6.ebuild:
+  Finally close bug #451068 by using /run/sepermit directly, and installing a
+  tmpfiles.d file for it to be re-created at boot time.
 
   07 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   +files/Linux-PAM-1.1.6+glibc-2.16.patch, pam-1.1.6.ebuild:
diff --git a/sys-libs/pam/pam-1.1.6.ebuild b/sys-libs/pam/pam-1.1.6-r1.ebuild
index 429a03c1d85a..f5f2c23d9474 100644
--- a/sys-libs/pam/pam-1.1.6.ebuild
+++ b/sys-libs/pam/pam-1.1.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.6.ebuild,v 1.3 2012/10/07 18:52:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.6-r1.ebuild,v 1.1 2013/01/30 15:36:43 flameeyes Exp $
 
-EAPI=4
+EAPI=5
 
 inherit libtool multilib eutils pam toolchain-funcs flag-o-matic db-use autotools
 
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
 PDEPEND="sys-auth/pambase
 	vim-syntax? ( app-vim/pam-syntax )"
 RDEPEND="${RDEPEND}
+	!<sys-apps/openrc-0.11.8
 	!sys-auth/openpam
 	!sys-auth/pam_userdb"
 
@@ -125,19 +126,19 @@ src_configure() {
 }
 
 src_compile() {
-	emake sepermitlockdir="${EPREFIX}/var/run/sepermit" || die "emake failed"
+	emake sepermitlockdir="${EPREFIX}/run/sepermit"
 }
 
 src_test() {
 	# explicitly allow parallel-build during testing
-	emake sepermitlockdir="${EPREFIX}/var/run/sepermit" check || die "emake check failed"
+	emake sepermitlockdir="${EPREFIX}/run/sepermit" check
 }
 
 src_install() {
 	local lib
 
 	emake DESTDIR="${D}" install \
-		 sepermitlockdir="${EPREFIX}/var/run/sepermit" || die "make install failed"
+		 sepermitlockdir="${EPREFIX}/var//sepermit"
 
 	# Need to be suid
 	fperms u+s /sbin/unix_chkpwd
@@ -162,6 +163,11 @@ src_install() {
 	# modules, and libpam is installed as a shared object only, so we
 	# don't need them for static linking either.
 	find "${D}" -name '*.la' -delete
+
+	dodir /usr/lib/tmpfiles.d
+	cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
+d /run/sepermit 0755 root root
+EOF
 }
 
 pkg_preinst() {