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

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

3 files changed, 30 insertions, 17 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/Manifest b/sys-libs/pam/Manifest
index d15e85d1614f..b891e9e2f0a5 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -9,17 +9,17 @@ DIST Linux-PAM-1.1.5.tar.bz2 1123524 SHA256 65def4df04254dc4c5156859d36c34ad6d7a
 DIST Linux-PAM-1.1.6-docs.tar.bz2 147359 SHA256 0244321b1c4b8a71064d984880566890cc809b1c77bdd0550f121fa7d8450497 SHA512 f158116c2a3d604a9195d96263f094a1c9c0e2ba78b54e0f8a92bfa73955d8cec36d68b985eb70f1bf0958fc54be5590b61669b3b777ba6bd2138bc156cec782 WHIRLPOOL 73b42d795b3ca06c3a22ea8a91258da9bd4662e72de8a72751eec3824524a44e13dbc13a7c0e79256429f583d21c2764512363921d5709e61752e391f8227577
 DIST Linux-PAM-1.1.6.tar.bz2 1147538 SHA256 bab887d6280f47fc3963df3b95735a27a16f0f663636163ddf3acab5f1149fc2 SHA512 f68e3a0d648441eef7589efe0fad65c621d030a9425635f461f2882a5129240830a55d5a5b81d02b439c633870a96f61b4c4dea22d0eacfdd583f4fac353928a WHIRLPOOL 619214ecf859e1fc4e6f59e37045e370b98bae57ceeaed3f6a5e0732fc0caba41c040bea926830b678f6e5c243d73a607daea438f55cf28d339ce458eded7db5
 EBUILD pam-1.1.5.ebuild 5784 SHA256 a003975168a13a6ddd06fe26ce33e0da007bcd26ca145786abd525abd9fe72e3 SHA512 647b6c5c9aad340fbbf32efc0988e5678cef8175297eb921ce36b097838aa1bd8cfef6f96157235ff0e9017f938b72429d741b01ea1692f7134f2871473d9fa3 WHIRLPOOL 7296e3adcb6e04eacc61b563a2f00f40b84f4f3f247b77acc3c79d4c87ae61513c20eca12d2b442d10dadda40963387343d87a54c03ce74a06c06a521d1b6f8b
-EBUILD pam-1.1.6.ebuild 5938 SHA256 e8c22f257fcb28bf3c1a71d9e282ec17fc16e60d875697fee64ed310730238d0 SHA512 ce6b722731bb8b1a28244c55f9e66b6d5537bd934d6eb4998578945b60f181d578a8f7cc7e573d2a15b390ee272ff3a153e0924618ccd74f09aedf2095ccb39e WHIRLPOOL c73957b6af05157189fd52f371b09b447805c6d7cf796cd85049b58a6e2a427f900e968c6e1a0a1eccc5d1e19ee62384dd612755247d7636c891638f47275cf4
-MISC ChangeLog 50282 SHA256 6701b075f563ea6819486fdc6d5c5685f038c1a698eafc4ec8f7667928b4e524 SHA512 dc026a5329296f75a898b51f796f0411802ac00e9e424a1a04f4693f2d9850ce4a808b2fd5c31fdac26fa825fe9a3e81654dbb2aebe8d7322879f64a8ab6b2f8 WHIRLPOOL 61eaac25ec44c313b74589fcba203c419f4176c157bb7680bf1ca0f5afd86fa9f8ca4fbbbc2f9d3a05514f03ddd2c67a351a9b77588d8661bb2b5b2061b05c55
+EBUILD pam-1.1.6-r1.ebuild 6012 SHA256 6fe5300b3ad6baba4ba02e261d5742747e76954b098569114d8031fba6d918b4 SHA512 32cf3d8454fd2c7d270dae861239c54bc5c84683c9422af38da3abfb2a3dfeab100a2225bfb4b079fe88105cdc287a21b948d0b745e46f00381e0aba72ceb15a WHIRLPOOL 1b9be3eb690382ce8937ad347901a2f9ffec0ee5a99fa0f0adbaaac1752baf873863d2f9a51ea4ea3b6b8a5fa089cef502b9c84d5d8171223b767fa7efbc1bd1
+MISC ChangeLog 50545 SHA256 79bc68dc6b254e32018ecd776b793546bf74f28992ad1cf39d2ed5250b51e0b7 SHA512 0e223b60145c5c2cda530ca5ad00f61907ac9384dce3d85c453c96def3ac2205753cc9240ec55b980e696a4f17e9971dd64f2d67bb44c76f61987cfad87087f8 WHIRLPOOL 1be9c8ae3b8e87b0d22f0c9109e1220ec4ea3abe19ef0ad284ae0778bd96e509cee6c40f1bec961be1c77968a4381eb915ba99c6ef80a0c2fe5df28793993df3
 MISC metadata.xml 1129 SHA256 e160643aca26e0418b31429836ae1b4c673474cd6130b7e2ac0d0bf41380df0b SHA512 ad3fa4cbe664d992849c7ef17fbf49519289d1a8d2e568014ae5c08eec1030eb2d6874c5b6f877d311cb9f920c5f78b1199aa7d778ffbffea377a7f539281362 WHIRLPOOL 69d3406bd7f903292a3c84e806fe9ae5ee0e63473c4c7005449dba7af09e7d405209b66c25ef8369a53aaa92626bea8dc84ad1e34da1a717d6926ee9925e2c62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQcc+TAAoJEBzRPIrUMBNCozUH/ij7GcDdbbZOArQjLjHnM65l
-4rPQGF6nQqGNI8yGOGBxP80g7LjLOgnLbswaLu5jZcN7ygU3G9QjEeNVghyklP1h
-SRDugBXj/TElk1HM+DWiJFDI0CTRUSEcPsg/SVoTMCpI92akB5UQnItYxUH64OXT
-YD1RC3YQDhzEM7RBDTwzo6J6Y7RXeOTIgcdLvZLEg5CulpeLoK75vA/AV9ai5rOf
-XmWI1M1hg4URsLMCw6kjWKzDRSUHFD4RPWzPnun0r/SJ0y4A+WD/nx0nE3fzYkbK
-kk4iJ8UnuRKXFxvD5OVQdEGOVf4G6WLD1HDahZQTzstRaJvFOAW+MFyCK1w5qiA=
-=P/gg
+iQEcBAEBCAAGBQJRCT4uAAoJEBzRPIrUMBNC4UwIAIPJlwxLAVgnnTk2+B3+Se+b
+j9zQBmnQ5fEMR8K1w4bBfoqjMEMa7qbtomFtJHleaH0LT1Gvmq10ZcNDNL9lTeS+
+3nUkdhhR+WnAB1tAZRNlsY5WMTSDMzfidXFIEYUGgRbUEh7c4NZe0AQufVBpfYaR
+miaOcCHjj1bR4XYJ1UaG4t2SdIUMBesXl8IQ0J4J4JesEHP3ofvh8929ly4XFMHG
+QSaSSBDPtd284R/u3AjScEATj7nM3GDW3VE8ONDuniHNSgdfjw+2WUh6TORLhRQM
+uYR5Dl7y/vbWGvjQCqtxaJNm5/dkz4PfVNkYEQc4oapQCJ4j4tZQpsQ28ujMbK0=
+=lp6Z
 -----END PGP SIGNATURE-----
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() {