testing/linux-pam: cleanups

7 files changed, 50 insertions, 13 deletions

diff --git a/testing/linux-pam/APKBUILD b/testing/linux-pam/APKBUILD
index dc0f76a0e..157efbffe 100644
--- a/testing/linux-pam/APKBUILD
+++ b/testing/linux-pam/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=linux-pam
 pkgver=1.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="pluggable authentication modules for linux"
 url="http://www.kernel.org/pub/linux/libs/pam"
 arch="all"
@@ -14,6 +14,11 @@ install=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
 	linux-pam-innetgr.patch
+	base-auth.pamd
+	base-account.pamd
+	base-password.pamd
+	base-session.pamd
+	base-session-noninteractive.pamd
 	other.pamd"
 
 _builddir="$srcdir"/Linux-PAM-$pkgver
@@ -45,10 +50,28 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 
 	# do not install pam.d files bundled with the source, they could be broken
-	rm -rf "$pkgdir"/etc/pam.d/*
-	cp "$srcdir"/other.pamd "$pkgdir"/etc/pam.d
+	rm -rf "$pkgdir"/etc/pam.d
+
+	# install our pam.d files
+	mkdir "$pkgdir"/etc/pam.d
+	for i in $source; do
+		case $i in
+		*.pamd)
+			basename=$(echo $i | cut -d. -f1)
+			cp "$srcdir"/$i "$pkgdir"/etc/pam.d/"$basename"
+			;;
+		esac
+	done
+
+	# delete pointless libtool archives.
+	rm -rf "$pkgdir"/lib/security/*.la
 }
 
 md5sums="6db7fcb5db6253350e3a4648ceac40e7  Linux-PAM-1.1.3.tar.bz2
 c309401e103cc86e8b25557ff3eb0b53  linux-pam-innetgr.patch
-20ed7aa9c65942e4020a891b06ee5b76  other.pamd"
+125677d39d365f114b82f67020315109  base-auth.pamd
+fafcf29cb9bab788cb4933106be31883  base-account.pamd
+117535e4938f478efced1398b408cf96  base-password.pamd
+baec6808544bf6cebc59e07467f8c213  base-session.pamd
+afbdd8eb4db5c31dfd8e8da35c698b90  base-session-noninteractive.pamd
+b8e839ece64df173f16d28520eb8d66c  other.pamd"
diff --git a/testing/linux-pam/base-account.pamd b/testing/linux-pam/base-account.pamd
new file mode 100644
index 000000000..591092944
--- /dev/null
+++ b/testing/linux-pam/base-account.pamd
@@ -0,0 +1,3 @@
+# basic PAM configuration for Alpine.
+
+account		required	pam_unix.so
diff --git a/testing/linux-pam/base-auth.pamd b/testing/linux-pam/base-auth.pamd
new file mode 100644
index 000000000..012445aa3
--- /dev/null
+++ b/testing/linux-pam/base-auth.pamd
@@ -0,0 +1,5 @@
+# basic PAM configuration for Alpine.
+
+auth		required	pam_env.so
+auth		required	pam_unix.so	nullok_secure
+auth		required	pam_nologin.so	successok
diff --git a/testing/linux-pam/base-password.pamd b/testing/linux-pam/base-password.pamd
new file mode 100644
index 000000000..a146a93fe
--- /dev/null
+++ b/testing/linux-pam/base-password.pamd
@@ -0,0 +1,3 @@
+# basic PAM configuration for Alpine.
+
+password	required	pam_unix.so	nullok obscure md5 sha512
diff --git a/testing/linux-pam/base-session-noninteractive.pamd b/testing/linux-pam/base-session-noninteractive.pamd
new file mode 100644
index 000000000..85e07d594
--- /dev/null
+++ b/testing/linux-pam/base-session-noninteractive.pamd
@@ -0,0 +1,4 @@
+# basic PAM configuration for Alpine.
+
+session		required	pam_limits.so
+session		required	pam_unix.so
diff --git a/testing/linux-pam/base-session.pamd b/testing/linux-pam/base-session.pamd
new file mode 100644
index 000000000..bf5bcb734
--- /dev/null
+++ b/testing/linux-pam/base-session.pamd
@@ -0,0 +1,4 @@
+# basic PAM configuration for Alpine.
+
+session		include		base-session-noninteractive
+session		required	pam_motd.so
diff --git a/testing/linux-pam/other.pamd b/testing/linux-pam/other.pamd
index 491271849..8c9797e71 100644
--- a/testing/linux-pam/other.pamd
+++ b/testing/linux-pam/other.pamd
@@ -1,11 +1,6 @@
 # basic PAM configuration for Alpine.
 
-auth		required	pam_env.so
-auth		required	pam_unix.so	nullok_secure
-
-account		required	pam_unix.so
-
-password	required	pam_unix.so	nullok obscure md5 sha512
-
-session		required	pam_limits.so
-session		required	pam_unix.so
+auth		include		base-auth
+account		include		base-account
+password	include		base-password
+session		include		base-session-noninteractive