diff --git a/pam_mount-0.18-bump-max-par.diff b/pam_mount-0.18-bump-max-par.diff deleted file mode 100644 index 2bc442f..0000000 --- a/pam_mount-0.18-bump-max-par.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/private.h -=================================================================== ---- src/private.h.orig -+++ src/private.h -@@ -6,7 +6,7 @@ - #include - #include - --#define MAX_PAR 127 -+#define MAX_PAR 1024 - #ifndef S_IRUGO - # define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) - #endif diff --git a/pam_mount-0.44.tar.lzma b/pam_mount-0.44.tar.lzma deleted file mode 100644 index 141bf98..0000000 --- a/pam_mount-0.44.tar.lzma +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:104167b592f84cef520bd877bdb574813bf65315f3fce14728e4f7cb10d5d794 -size 247369 diff --git a/pam_mount-0.45-bump-max-par.diff b/pam_mount-0.45-bump-max-par.diff new file mode 100644 index 0000000..153ec21 --- /dev/null +++ b/pam_mount-0.45-bump-max-par.diff @@ -0,0 +1,11 @@ +--- src/pam_mount.h ++++ src/pam_mount.h 2008/09/01 08:18:32 +@@ -6,7 +6,7 @@ + #include + #include + +-#define MAX_PAR 127 ++#define MAX_PAR 1024 + #ifndef S_IRUGO + # define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) + #endif diff --git a/pam_mount-0.18-umount-home-dir.dif b/pam_mount-0.45-umount-home-dir.dif similarity index 62% rename from pam_mount-0.18-umount-home-dir.dif rename to pam_mount-0.45-umount-home-dir.dif index 2f9bdd6..98bfc6c 100644 --- a/pam_mount-0.18-umount-home-dir.dif +++ b/pam_mount-0.45-umount-home-dir.dif @@ -10,22 +10,6 @@ Index: scripts/umount.crypt for ((x = 5; x >= 0; --x)); do fuser -m "$1" || break; -@@ -53,6 +54,15 @@ for ((x = 5; x >= 0; --x)); do - sleep 1; - done; - -+# kill remaining user processes if we're unmounting a user's home dir -+USER=`stat --format=%U $1 2>/dev/null` && getent passwd "$USER" | grep -e ":$1:" &> /dev/null -+if test $? -eq 0; then -+ lsof -t $1 | xargs kill -TERM &> /dev/null -+ sleep 1 -+ lsof -t $1 | xargs kill -9 &> /dev/null -+ sleep 1 -+fi -+ - umount "$1"; - if [ $? -ne 0 ]; then - echo "${0##*/}: error unmounting $1" >&2 @@ -73,3 +83,12 @@ if echo "$REALDEVICE" | grep ^/dev/loop exit 1 fi diff --git a/pam_mount-0.45.tar.lzma b/pam_mount-0.45.tar.lzma new file mode 100644 index 0000000..6bab38a --- /dev/null +++ b/pam_mount-0.45.tar.lzma @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b33348dfcff5cfe5e16164a8b8a14e48f481054c968bace08e32aca8f7a8bd97 +size 249132 diff --git a/pam_mount.changes b/pam_mount.changes index 8055159..12125e0 100644 --- a/pam_mount.changes +++ b/pam_mount.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Sep 1 10:56:59 CEST 2008 - mc@suse.de + +- version 0.45 + * fix double-freeing the authentication token + * use ofl instead of lsof/fuser + * kill-on-logout support (terminate processes that would stand in the + way of unmounting) + (remove suse patch which supports this) + * mount.crypt: auto-detect necessity for running losetup + ------------------------------------------------------------------- Mon Aug 18 11:56:07 CEST 2008 - mc@suse.de diff --git a/pam_mount.spec b/pam_mount.spec index f1a2548..dba281a 100644 --- a/pam_mount.spec +++ b/pam_mount.spec @@ -1,5 +1,5 @@ # -# spec file for package pam_mount (Version 0.44) +# spec file for package pam_mount (Version 0.45) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,7 @@ Name: pam_mount BuildRequires: libHX-devel libxml2-devel lzma openssl-devel pam-devel perl-XML-Writer pkg-config BuildRequires: linux-kernel-headers Summary: A PAM Module that can Mount Volumes for a User Session -Version: 0.44 +Version: 0.45 Release: 1 # psmisc: /bin/fuser Recommends: cifs-mount psmisc @@ -32,8 +32,8 @@ License: LGPL v2.1 or later Prefix: /usr Group: System/Libraries Source: %{name}-%{version}.tar.lzma -Patch1: pam_mount-0.18-umount-home-dir.dif -Patch2: pam_mount-0.18-bump-max-par.diff +Patch1: pam_mount-0.45-umount-home-dir.dif +Patch2: pam_mount-0.45-bump-max-par.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pam-mount.sourceforge.net/ PreReq: coreutils, perl-XML-Writer @@ -113,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/bin/autoehd %{_prefix}/bin/passwdehd %{_prefix}/bin/pmt-fd0ssh +%{_prefix}/bin/pmt-ofl /sbin/mount.crypt /sbin/umount.crypt %{_sbindir}/pmvarrun @@ -128,6 +129,14 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man8/umount.crypt.8.gz %changelog +* Mon Sep 01 2008 mc@suse.de +- version 0.45 + * fix double-freeing the authentication token + * use ofl instead of lsof/fuser + * kill-on-logout support (terminate processes that would stand in the + way of unmounting) + (remove suse patch which supports this) + * mount.crypt: auto-detect necessity for running losetup * Mon Aug 18 2008 mc@suse.de - version 0.44 - mount.crypt: fix option slurping