rpms/pam_mount/devel pam_mount-README.Fedora, NONE, 1.1 pam_mount-umount.crypt-wait.patch, NONE, 1.1 pam_mount.spec, 1.24, 1.25

[Till Maas (till)]

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12646

Modified Files:
	pam_mount.spec 
Added Files:
	pam_mount-README.Fedora pam_mount-umount.crypt-wait.patch 
Log Message:
license tag, wait patch (#248538)



--- NEW FILE pam_mount-README.Fedora ---
Changes to the config file format
=================================

pam_mount 0.19 uses a new file format that is based on XML. The new configfile can be found at:
/etc/security/pam_mount.conf.xml

Please verify, that the automatic conversion worked. To convert other config
files from the old format to the new xml format, you can use
convert_pam_mount_conf.pl < pam_mount.conf > pam_mount.conf.xml

Example pam configuration
=========================

Here is an example /etc/pam.d/gdm file, that enables pam_mount:

--------8<--------
#%PAM-1.0
auth       required    pam_env.so
auth       optional    pam_mount.so
auth       include     system-auth
account    required    pam_nologin.so
account    include     system-auth
password   include     system-auth
session    optional    pam_keyinit.so force revoke
session    optional    pam_mount.so
session    include     system-auth
session    required    pam_loginuid.so
session    optional    pam_console.so
--------8<--------

pam_mount-umount.crypt-wait.patch:

--- NEW FILE pam_mount-umount.crypt-wait.patch ---
--- trunk/scripts/umount.crypt	2007/03/21 23:13:17	177
+++ trunk/scripts/umount.crypt	2007/08/14 19:31:35	235
@@ -58,6 +58,12 @@
 #
 REALDEVICE=`cryptsetup status "$DMDEVICE" | sed -n '/device/s/[ ]*device:[ ]*//p'`;
 
+for ((x = 5; x >= 0; --x)); do
+	fuser -m "$1" || break;
+	echo "Some program is blocking our unmount. Not nice.";
+	sleep 1;
+done;
+
 umount "$1";
 if [ $? -ne 0 ]; then
 	echo "${0##*/}: error unmounting $1" >&2


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pam_mount.spec	10 Dec 2006 19:37:41 -0000	1.24
+++ pam_mount.spec	23 Aug 2007 12:58:22 -0000	1.25
@@ -1,19 +1,23 @@
 Name:           pam_mount
 Version:        0.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
 Group:          System Environment/Base
-License:        LGPL
+# The library and binary are LGPLv2+, the scripts are GPLv2+
+License:        LGPLv2+ and GPLv2+
 URL:            http://pam-mount.sourceforge.net/
 Source0:        http://prdownloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.bz2
+Source1:        %name-README.Fedora
 
 Patch1:         %{name}-lsof-path.patch
+Patch2:         pam_mount-umount.crypt-wait.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
 Requires:       pam, lsof
+Requires:       psmisc
 
 %description
 This module is aimed at environments with SMB (Samba or Windows NT) 
@@ -54,6 +58,8 @@
 
 %patch1 -p1
 
+#cp %SOURCE1 README.Fedora
+
 %build
 %configure --libdir=/%{_lib}
 
@@ -82,7 +88,12 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README FAQ LICENSE.*
+%doc AUTHORS FAQ README TODO
+# README.Fedora (for 0.19)
+%doc LICENSE.GPL2 
+#LICENSE.GPL3
+%doc LICENSE.LGPL2 
+#LICENSE.LGPL3
 /%{_lib}/security/pam_mount.so
 /%{_lib}/security/pam_mount_auth.so
 /%{_lib}/security/pam_mount_session.so
@@ -100,6 +111,11 @@
 
 
 %changelog
+* Thu Aug 23 2007 Till Maas <opensource till name> - 0.18-2
+- add README.Fedora
+- add patch to wait for applications that do not process pam properly
+- update license tag
+
 * Sun Dec 10 2006 Till Maas <opensource till name> - 0.18-1
 - Version bump
 - removed Patch0