From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E0E8F158086 for ; Tue, 30 Nov 2021 17:16:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C144F2BC035; Tue, 30 Nov 2021 17:15:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB5E42BC011 for ; Tue, 30 Nov 2021 17:15:53 +0000 (UTC) Message-ID: Date: Tue, 30 Nov 2021 20:15:47 +0300 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: [gentoo-dev] [PATCH 1/2] pam.eclass: Support EAPI-8, add missing || die Content-Language: en-US To: gentoo-dev@lists.gentoo.org References: <20741053.4csPzL39Zc@tuxbrain> From: Mikhail Koliada In-Reply-To: <20741053.4csPzL39Zc@tuxbrain> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Archives-Salt: 6f5a64f2-2f1c-45f0-81a9-01779179cd41 X-Archives-Hash: 7b55476476b1d982695658ab3fb40776 On 30.11.2021 18:01, Andreas Sturmlechner wrote: > 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 > # @AUTHOR: > # Diego Pettenò > -# @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 Actually there are few more modifications that need to be made to the current code, I have this in my TODO until the end of December.