• [PATCH 1/2] pam.eclass: Support EAPI-8, add missing || die

    From Andreas Sturmlechner@21:1/5 to All on Tue Nov 30 16:01:37 2021
    Closes: https://bugs.gentoo.org/811363

    ---
    eclass/pam.eclass | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/eclass/pam.eclass b/eclass/pam.eclass
    index 0b3421b5e7c..effd17ad55d 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: 5 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]) ;;
    + [5678]) ;;
    *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac

    @@ -209,7 +209,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
    --
    2.34.1


    -----BEGIN PGP SIGNATURE-----

    iQGTBAABCgB9FiEEexlipVqz
  • From Andreas Sturmlechner@21:1/5 to All on Tue Nov 30 16:02:16 2021
    No more consumers for some time.

    ---
    eclass/pam.eclass | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/eclass/pam.eclass b/eclass/pam.eclass
    index effd17ad55d..38326682b3f 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 8
    +# @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
    - [5678]) ;;
    + [678]) ;;
    *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
    esac

    --
    2.34.1


    -----BEGIN PGP SIGNATURE-----

    iQGTBAABCgB9FiEEexlipVqzuLtTjHMOREsPlv/SLMsFAmGmPPhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDdC MTk2MkE1NUFCM0I4QkI1MzhDNzMwRTQ0NEIwRjk2RkZEMjJDQ0IACgkQREsPlv/S LMvT4wgAhifFiReZnZaqkOxAbvAQtg6JVXSn46N1msYmH/aAO9JY47iBCz8UFQ0x DWLjH73JIhbfaq78V1HFbdmmqgioI3YyBCBpOwhdOPAWU645