From e2b4e2093e6bcc1bf6acb8f8d6d6b174605fc25b Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Tue, 21 Dec 2021 00:56:41 +0100
Subject: [PATCH] community/shadow: move etc/pam.d/login to -login subpkg
...and also add '#%PAM-1.0' header to all pam files.
---
community/shadow/APKBUILD | 8 +++++---
community/shadow/chpasswd.pamd | 1 +
community/shadow/login.pamd | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/community/shadow/APKBUILD b/community/shadow/APKBUILD
index 75d9380de66a..b33d513757d6 100644
--- a/community/shadow/APKBUILD
+++ b/community/shadow/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=shadow
pkgver=4.10
-pkgrel=2
+pkgrel=3
pkgdesc="PAM-using login and passwd utilities (usermod, useradd, ...)"
url="https://github.com/shadow-maint/shadow"
arch="all"
@@ -129,6 +129,8 @@ login() {
error "file $cmd not found"
return 1
done
+
+ amove etc/pam.d/login
}
_login_doc() {
@@ -172,7 +174,7 @@ ed9174e102594a74ab4399ae68a68a89393bfde6244f04852d382ad5a57d50f2b1a532ca3a51e6e0
3d5a13a6795842cd4c627a76e4420380e5da334d635a8221d69b3ab3eda528aa9732520dc1fd91f7a67bafc4d5ba75f759883a3dae4f5e66e9001901ac167a58 passwd-long-entry.patch
fdba42bf04a07afd90b610f5ff78784bcefbcea94d6ccc0b96cdb0bded59e7b2761796bc60a013a5ff9284790c541ba6a025b5236af5c5a15e715b074d974a8d sysugid-min-limit.patch
b1a83dd1503607079b66d9f7f2d54dc305200ab1244dcdc7b2140e3a1c101d0fa525f5872229319985c14e5f400a888406ed851281c4c07994a090953662cb94 usermod-move-home-errmsg.patch
-38e78aade316350dc26000b35335a778f12f5deb0f54ea23f84000ad92a683c519c7814165b5ed7e63187d11677993082d35dc6c21f7f66c6aee8e3fd4b3694b chpasswd.pamd
-46a6f83f3698e101b58b8682852da749619412f75dfa85cecad03d0847f6c3dc452d984510db7094220e4570a0565b83b0556e16198ad894a3ec84b3e513d58d login.pamd
+7eff04de1004aa6bffcad1c32f52e8a06b338a3a1a1146dc4306d399d65e05b4f59ac62aa545351fc4a0deff13ea8b3acd7000d984d043bf4209008b900be8d6 chpasswd.pamd
+8d1c7043719af9ee1473fdb482e054ca0e0fa1ac673cb9c7db96a6aad00382456225dea05267dab96e19d5f444a00681e8dbaf7399100c75424fd388d48ad68b login.pamd
1c4f7d9057855a187d5f3cac6cb6486e7da5ef374f7b8a3058e2d385304b02fb7bd7127c9fecb7c2e3bdb179c210b4c2c31eba3d3d4559928c55a9e63e52f70f useradd.pamd
"
diff --git a/community/shadow/chpasswd.pamd b/community/shadow/chpasswd.pamd
index e2d392f4ef96..73844aed249b 100644
--- a/community/shadow/chpasswd.pamd
+++ b/community/shadow/chpasswd.pamd
@@ -1,3 +1,4 @@
+#%PAM-1.0
auth sufficient pam_rootok.so
account include base-account
password include base-password
diff --git a/community/shadow/login.pamd b/community/shadow/login.pamd
index ad455580941d..49081c882f1a 100644
--- a/community/shadow/login.pamd
+++ b/community/shadow/login.pamd
@@ -1,5 +1,5 @@
+#%PAM-1.0
# /bin/login opens an interactive session.
-
auth include base-auth
account include base-account
password include base-password
--
GitLab