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

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

[Andreas Sturmlechner]

[-- Attachment #1: Type: text/plain, Size: 1007 bytes --]

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


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

[gentoo-dev] [PATCH 2/2] pam.eclass: Drop EAPI-5 support

[Andreas Sturmlechner]

[-- Attachment #1: Type: text/plain, Size: 713 bytes --]

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


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

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

[Mikhail Koliada]

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 <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


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.