diff options
| author |   Mikle Kolyada <zlogene@gentoo.org> | 2021-12-25 13:46:14 +0300 |
|---|---|---|
| committer | Mikle Kolyada <zlogene@gentoo.org> | 2021-12-25 13:48:34 +0300 |
| commit | 1de86d8250aae0a9d5a043fcc9e1065e6c435067 (patch) | |
| tree | 73ac5c07c862d90b7cb061b0a3e4d5a24f6e90dc /eclass | |
| parent | app-officeext/texmaths: Drop 0.48 (diff) | |
| download | gentoo-1de86d8250aae0a9d5a043fcc9e1065e6c435067.tar.gz gentoo-1de86d8250aae0a9d5a043fcc9e1065e6c435067.tar.bz2 gentoo-1de86d8250aae0a9d5a043fcc9e1065e6c435067.zip | |
eclass/pam.eclass: misc improvements
* EAPI=8
* EAPI=5 gone
* missing die
* cleanup mod_dir logic (openpam is long gone)
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/pam.eclass | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/eclass/pam.eclass b/eclass/pam.eclass index 0b3421b5e7c8..9928e746e41e 100644 --- a/eclass/pam.eclass +++ b/eclass/pam.eclass @@ -6,14 +6,14 @@ # Mikle Kolyada <zlogene@gentoo.org> # @AUTHOR: # Diego Pettenò <flameeyes@gentoo.org> -# @SUPPORTED_EAPIS: 5 6 7 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: Handles pam related tasks # @DESCRIPTION: # This eclass contains functions to install pamd configuration files and # pam modules. case ${EAPI:-0} in - [567]) ;; + [678]) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -100,12 +100,7 @@ newpamsecurity() { # @DESCRIPTION: # Returns the pam modules' directory for current implementation getpam_mod_dir() { - if has_version sys-libs/pam; then - PAM_MOD_DIR=/$(get_libdir)/security - else - # Unable to find PAM implementation... defaulting - PAM_MOD_DIR=/$(get_libdir)/security - fi + PAM_MOD_DIR=/$(get_libdir)/security echo ${PAM_MOD_DIR} } @@ -209,7 +204,7 @@ pamd_mimic() { cleanpamd() { while [[ -n $1 ]]; do if ! has_version sys-libs/pam; then - sed -i -e '/pam_shells\|pam_console/s:^:#:' "${D}/etc/pam.d/$1" + sed -i -e '/pam_shells\|pam_console/s:^:#:' "${D}/etc/pam.d/$1" || die fi shift |