From 67f38f87b39401df5d916b30f19fa3a28a528866 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 3 Nov 2014 17:21:00 +0100
Subject: [PATCH] shadow: /etc/pam.d/other is now provided by pam-base; remove
 it.

---
 srcpkgs/shadow/files/other.pam | 8 --------
 srcpkgs/shadow/template        | 7 ++-----
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/shadow/files/other.pam

diff --git a/srcpkgs/shadow/files/other.pam b/srcpkgs/shadow/files/other.pam
deleted file mode 100644
index 54503f74c78..00000000000
--- a/srcpkgs/shadow/files/other.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-auth 		required	pam_deny.so
-auth 		required	pam_warn.so
-account 	required	pam_deny.so
-account 	required	pam_warn.so
-password 	required	pam_deny.so
-password 	required	pam_warn.so
-session 	required	pam_deny.so
-session 	required	pam_warn.so
diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index 42e3508c49b..e2a8d6e5217 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -1,7 +1,7 @@
 # Template file for 'shadow'
 pkgname=shadow
 version=4.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--bindir=/usr/bin --sbindir=/usr/sbin
  --libdir=/usr/lib --enable-shared --disable-static
@@ -23,7 +23,6 @@ conf_files="
 	/etc/pam.d/chpasswd
 	/etc/pam.d/chgpasswd
 	/etc/pam.d/chage
-	/etc/pam.d/other
 	/etc/defaults/useradd
 	/etc/login.defs"
 short_desc="Shadow password file utilities"
@@ -41,7 +40,6 @@ pre_configure() {
 		*-musl) sed '/RUSEROK/d' -i configure;;
 	esac
 }
-
 do_build() {
 	# Don't install groups(1), we use the one from coreutils.
 	sed -i 's/groups$(EXEEXT) //' src/Makefile
@@ -51,11 +49,10 @@ do_build() {
 	# Build PIE binaries by default.
 	make CFLAGS+=" -fPIE" LDFLAGS+=" -pie" ${makejobs}
 }
-
 post_install() {
 	# Install our pam files not the ones supplied with shadow.
 	rm -f ${DESTDIR}/etc/pam.d/*
-	for f in chage passwd other; do
+	for f in chage passwd; do
 		install -m644 ${FILESDIR}/${f}.pam ${DESTDIR}/etc/pam.d/${f}
 	done
 	for f in chpasswd chgpasswd groupadd groupdel groupmems \