From 36b79112bf49fa26c80bd2d3dc35b0bad2d9a40c Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Fri, 10 Apr 2009 23:35:13 +0300
Subject: [PATCH] pam: cleaned pam.conf by using tar -C and overlay_install()

---
 .../etc_pam.d_other.txt}                      |  0
 .../etc_pam.d_system-auth.txt}                |  0
 base/pam/pam.conf                             | 22 +++----------------
 3 files changed, 3 insertions(+), 19 deletions(-)
 rename base/pam/{etc_pamd_other.txt => install/etc_pam.d_other.txt} (100%)
 rename base/pam/{etc_pamd_system-auth.txt => install/etc_pam.d_system-auth.txt} (100%)

diff --git a/base/pam/etc_pamd_other.txt b/base/pam/install/etc_pam.d_other.txt
similarity index 100%
rename from base/pam/etc_pamd_other.txt
rename to base/pam/install/etc_pam.d_other.txt
diff --git a/base/pam/etc_pamd_system-auth.txt b/base/pam/install/etc_pam.d_system-auth.txt
similarity index 100%
rename from base/pam/etc_pamd_system-auth.txt
rename to base/pam/install/etc_pam.d_system-auth.txt
diff --git a/base/pam/pam.conf b/base/pam/pam.conf
index 3bc876852..a9dd6c93d 100644
--- a/base/pam/pam.conf
+++ b/base/pam/pam.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../pam/pam.conf
-# Copyright (C) 2006 - 2007 The OpenSDE Project
+# Copyright (C) 2006 - 2009 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -28,23 +28,10 @@ else
 	var_append extraconfopt " " "--disable-prelude"
 fi
 
-
-install_pam_configs() {
-	mkdir -p $root/etc/pam.d
-	for x in $confdir/etc_pamd_*.txt; do
-		file="`echo $x | sed -e 's,.*etc_pamd_,/etc/pam.d/,' -e s,.txt,,`"
-		if [ ! -f $root$file ]; then
-			cp -vf $x $root$file
-		else
-			touch $root$file
-		fi
-	done
-}
-
 # Install default pam.d/* files (without them,
 # nobody can log in on the system..  ;-)
 #
-hook_add postmake 5 "install_pam_configs"
+hook_add postmake 5 "overlay_apply '$confdir/install'"
 
 # Outch: --disable-debug enables debugging...
 #
@@ -55,8 +42,5 @@ var_remove confopt " " "--disable-debug"
 hook_add postmake 5 "install_pam_docs"
 
 install_pam_docs() {
-	(
-		cd $root$docdir
-		tar -v $taropt `match_source_file -p '.*doc.*'`
-	)
+	tar -C "$root$docdir" -v $taropt `match_source_file -p docs`
 }