From ab52b76b4d4497e8dfd86d595b39b39ea25c55fc Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 9 Jul 2012 15:05:50 +0200
Subject: [PATCH] pam: switch to /usr.

---
 srcpkgs/pam/pam-devel.template                |  5 ++-
 srcpkgs/pam/pam-userdb.template               |  6 ++--
 .../pam/patches/pam_unix_sys_resource.patch   | 10 ++++++
 srcpkgs/pam/template                          | 31 ++++++-------------
 4 files changed, 23 insertions(+), 29 deletions(-)
 create mode 100644 srcpkgs/pam/patches/pam_unix_sys_resource.patch

diff --git a/srcpkgs/pam/pam-devel.template b/srcpkgs/pam/pam-devel.template
index 165a657e96..0c0b48a11e 100644
--- a/srcpkgs/pam/pam-devel.template
+++ b/srcpkgs/pam/pam-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'pam-devel'.
 #
-depends="cracklib-devel db-devel pam"
+noarch=yes
+depends="cracklib-devel db-devel pam>=$version"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-
 do_install() {
 	vmove usr/include usr
 	vmove usr/share/man/man3 usr/share/man
diff --git a/srcpkgs/pam/pam-userdb.template b/srcpkgs/pam/pam-userdb.template
index 5010fb4eca..c2efa43c01 100644
--- a/srcpkgs/pam/pam-userdb.template
+++ b/srcpkgs/pam/pam-userdb.template
@@ -8,9 +8,7 @@ long_desc="${long_desc}
  username, and the data fields corresponding to the username keys are the
  passwords."
 
-
-do_install()
-{
-	vmove lib/security/pam_userdb.so lib/security
+do_install() {
+	vmove usr/lib/security/pam_userdb.so usr/lib/security
 	vmove usr/share/man/man8/pam_userdb.8 usr/share/man/man8
 }
diff --git a/srcpkgs/pam/patches/pam_unix_sys_resource.patch b/srcpkgs/pam/patches/pam_unix_sys_resource.patch
new file mode 100644
index 0000000000..21f313b358
--- /dev/null
+++ b/srcpkgs/pam/patches/pam_unix_sys_resource.patch
@@ -0,0 +1,10 @@
+--- modules/pam_unix/pam_unix_acct.c.orig	2012-07-09 15:01:11.592269364 +0200
++++ modules/pam_unix/pam_unix_acct.c	2012-07-09 15:01:54.615228076 +0200
+@@ -47,6 +47,7 @@
+ #include <time.h>		/* for time() */
+ #include <errno.h>
+ #include <sys/wait.h>
++#include <sys/resource.h>	/* for RLIMIT_NOFILE */
+ 
+ #include <security/_pam_macros.h>
+ 
diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index 09444d135e..275a9b7f2f 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -1,15 +1,18 @@
 # Template file for 'pam'
 pkgname=pam
 version=1.1.5
+revision=4
 wrksrc="Linux-PAM-$version"
-#distfiles="${KERNEL_SITE}/libs/pam/library/Linux-PAM-$version.tar.bz2"
-distfiles="https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$version.tar.bz2"
-revision=3
-makedepends="flex cracklib-devel db-devel"
+build_style=gnu-configure
+configure_args="--libdir=/usr/lib --sbindir=/usr/sbin --docdir=/usr/share/doc/pam"
+subpackages="pam-devel pam-userdb"
+makedepends="flex cracklib-devel db-devel libtirpc-devel"
 short_desc="A flexible mechanism for authenticating users"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/pub/linux/libs/pam/"
 license="GPL-2"
+#distfiles="${KERNEL_SITE}/libs/pam/library/Linux-PAM-$version.tar.bz2"
+distfiles="https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$version.tar.bz2"
 checksum=65def4df04254dc4c5156859d36c34ad6d7afbcf3adbf2780530ebc4dbf2a116
 long_desc="
  Linux-PAM provides a flexible mechanism for authenticating users.
@@ -23,26 +26,10 @@ conf_files="
 /etc/security/namespace.conf
 /etc/security/pam_env.conf
 /etc/security/time.conf"
-subpackages="pam-devel pam-userdb"
 
-
-do_configure() {
-	./configure ${CONFIGURE_SHARED_ARGS} \
-		--disable-selinux --libdir=/lib \
-		--disable-rpath --docdir=/usr/share/doc/pam \
-		--enable-read-both-confs DESTDIR=${DESTDIR}
-}
-
-do_build() {
-	make ${makejobs}
-}
-
-do_install() {
-	make DESTDIR=${DESTDIR} install
-
-	rm -rf ${DESTDIR}/var
+post_install() {
 	# Fix unix_chkpwd perms.
-	chmod 4755 ${DESTDIR}/sbin/unix_chkpwd
+	chmod 4755 ${DESTDIR}/usr/sbin/unix_chkpwd
 	#
 	# Fix a syntax error in namespace.init, -p flag is unknown
 	# at least to dash and bash.