[gentoo-commits] repo/gentoo:master commit in: sys-libs/pam/

[Mikle Kolyada]

commit:     fc2e898a3615e0daf9354c0dc00e5aa5686984cc
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 15:01:14 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 15:02:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc2e898a

sys-libs/pam: go back to the manual tmpfiles creation

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 sys-libs/pam/{pam-1.4.0-r1.ebuild => pam-1.4.0-r2.ebuild} | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/sys-libs/pam/pam-1.4.0-r1.ebuild b/sys-libs/pam/pam-1.4.0-r2.ebuild
similarity index 89%
rename from sys-libs/pam/pam-1.4.0-r1.ebuild
rename to sys-libs/pam/pam-1.4.0-r2.ebuild
index 2217c406746..95952e5cfb4 100644
--- a/sys-libs/pam/pam-1.4.0-r1.ebuild
+++ b/sys-libs/pam/pam-1.4.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools db-use fcaps tmpfiles toolchain-funcs usr-ldscript 
multilib-minimal
+inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal
 
 DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
 HOMEPAGE="https://github.com/linux-pam/linux-pam";
@@ -95,10 +95,15 @@ multilib_src_install() {
 multilib_src_install_all() {
        find "${ED}" -type f -name '*.la' -delete || die
 
-       newtmpfiles - "${CATEGORY}-${PN}.conf" <<-_EOF_
+       # tmpfiles.eclass is impossible to use because
+       # there is the pam -> tmpfiles -> systemd -> pam dependency loop
+
+       dodir /usr/lib/tmpfiles.d
+
+       cat ->>  "${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}.conf <<-_EOF_
                d /run/faillock 0755 root root
        _EOF_
-       use selinux && newtmpfiles - "${CATEGORY}-${PN}-selinux.conf" <<-_EOF_
+       use selinux && cat ->>  
"${D}"/usr/lib/tmpfiles.d/${CATEGORY}-${PN}-selinux.conf <<-_EOF_
                d /run/sepermit 0755 root root
        _EOF_
 
@@ -122,8 +127,4 @@ pkg_postinst() {
        # The pam_unix module needs to check the password of the user which 
requires
        # read access to /etc/shadow only.
        fcaps cap_dac_override sbin/unix_chkpwd
-
-       # OpenRC systems need this processed right away
-       tmpfiles_process "${CATEGORY}-${PN}.conf"
-       use selinux && tmpfiles_process "${CATEGORY}-${PN}-selinux.conf"
 }