From 5161d10ee5492d21e7712e4e2cd21fcda912c9ae Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 3 Nov 2014 17:59:36 +0100 Subject: [PATCH] util-linux: make /etc/pam.d/login use system-local-login from pam-base. --- srcpkgs/util-linux/files/login.pam | 24 ++++++------------------ srcpkgs/util-linux/template | 3 +-- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/srcpkgs/util-linux/files/login.pam b/srcpkgs/util-linux/files/login.pam index ff5541180ee..a3e236e2ace 100644 --- a/srcpkgs/util-linux/files/login.pam +++ b/srcpkgs/util-linux/files/login.pam @@ -1,19 +1,7 @@ -# login pam service with sha512 passwords. -auth requisite pam_nologin.so -auth required pam_securetty.so -auth required pam_unix.so +#%PAM-1.0 -account required pam_access.so -account required pam_unix.so - -session required pam_env.so -session required pam_motd.so -session optional pam_mail.so dir=/var/mail standard -session required pam_unix.so -session required pam_loginuid.so -session required pam_lastlog.so silent never --session optional pam_systemd.so --session optional pam_ck_connector.so nox11 -session required pam_limits.so - -password required pam_unix.so sha512 shadow nullok try_first_pass use_authtok +auth required pam_securetty.so +auth requisite pam_nologin.so +auth include system-local-login +account include system-local-login +session include system-local-login diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index 27824b25a00..b0c7c77e1ca 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -1,7 +1,7 @@ # Template file for 'util-linux' pkgname=util-linux version=2.25.2 -revision=1 +revision=2 short_desc="Miscellaneous linux utilities" maintainer="Juan RP " homepage="http://userweb.kernel.org/~kzak/util-linux-ng" @@ -20,7 +20,6 @@ conf_files=" /etc/pam.d/su /etc/pam.d/su-l /etc/pam.d/login" -replaces="runit-void<20141013_2 eject>=0" provides="eject-${version}_1" pre_configure() {