aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominique Martinet <dominique.martinet@atmark-techno.com>2022-06-28 10:03:15 +0900
committeralice <alice@ayaya.dev>2022-06-28 02:30:45 +0000
commit5c0a877f72a3a8f47847f0cbb2065d974ab64c40 (patch)
tree7f9a29bc491229dc0cf8ff68cbf7a892ed3b6095
parent0b56f91ff710a9d6c5b0abb644214e57911d6384 (diff)
downloadaports-5c0a877f72a3a8f47847f0cbb2065d974ab64c40.tar.gz
aports-5c0a877f72a3a8f47847f0cbb2065d974ab64c40.tar.bz2
aports-5c0a877f72a3a8f47847f0cbb2065d974ab64c40.tar.xz
main/linux-pam: remove pam_motd from base-session
motd is printed by login utilities (busybox, util-linux-login, or shadow-login) busybox login does not seem to care about base-session pam, but util-linux and shadow versions will end up printing motd twice with this pam. Removing pam_motd leaves the motd being displayed exactly once for all three variants. Fixes #13958
-rw-r--r--main/linux-pam/APKBUILD4
-rw-r--r--main/linux-pam/base-session.pamd1
2 files changed, 2 insertions, 3 deletions
diff --git a/main/linux-pam/APKBUILD b/main/linux-pam/APKBUILD
index 967e2fc3c0..30687ab5e5 100644
--- a/main/linux-pam/APKBUILD
+++ b/main/linux-pam/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=linux-pam
pkgver=1.5.2
-pkgrel=0
+pkgrel=1
pkgdesc="Linux PAM (Pluggable Authentication Modules for Linux)"
url="https://www.kernel.org/pub/linux/libs/pam"
arch="all"
@@ -82,7 +82,7 @@ fa16350c132d3e5fb82b60d991768fb596582639841b8ece645c684705467305ccf1302a0147ec22
ea6a10957ba9ec50d982bfabafb35060426ac797936f874097b4fa7620b89fd2ba3be9757401f9b787956fb23879d8ef73676f7703e75fcef3dca0b9559c4167 base-auth.pamd
85462201a4044c7e170e617d39b0eceb4790abc6c0504999117548030a16d80a9d2078d1ad97690d7d346e6374201f0c52e792ccb08ce2b1c4bbf0cc2be96f5b base-account.pamd
da5d9a361abfc5b705e01a8da3a2e6de3ba394a0814307a65ec5b6c88ddae199d54b4d443204bf770f8daccb990777b68a5da716fb756932cf21f9046c839540 base-password.pamd
-6e262f1b1bb4cc01f43c0c3cb72136ebd976d25cb27ca35fd8a76b3dfd57e9938e359d20671f4077ad75b1d38cb944596539220a44d9b6b92cc234605a95ada1 base-session.pamd
+b72bbce09f7a3f7da9bdaa2518cd4e44be9f343ab935eb8576d8d5d7d2a6b7d37040e98051e43cdf8027dda13fdca56e4d801f9ce6d1dcafd0f69bb94e9925cb base-session.pamd
444e20046843057b17c0aac14d2b71a68923b989b3d8b478bbf684698673683186e928e5ca2e6cb9a1c76abc4248044a0e10ef6b06b3f51857106796ecce250d base-session-noninteractive.pamd
d103ba06b2c4929171e09c845f9866539220cd20d8d56a03d25850342ef5eabe281e958dfe1eaefd550c00f9440e8700c1d74c88c3001f933134ca6fd7cb9b7b other.pamd
83cc3d84ef5afded9afd4d347132901b9adcbd8b21be45b80d010370a2082e8388a713eb78d052944bc47b07fd7383edf18e2674d9d0545215cc45e14a2e14b1 system-local-login.pamd
diff --git a/main/linux-pam/base-session.pamd b/main/linux-pam/base-session.pamd
index 3804699b26..987574d4e2 100644
--- a/main/linux-pam/base-session.pamd
+++ b/main/linux-pam/base-session.pamd
@@ -1,5 +1,4 @@
# basic PAM configuration for Alpine.
session include base-session-noninteractive
-session required pam_motd.so
-session optional pam_elogind.so