diff --git a/mount.crypt b/mount.crypt
index f59e971..00ca6dd 100644
--- a/mount.crypt
+++ b/mount.crypt
@@ -3,17 +3,17 @@
CMD="${0##*/}"
if [[ "$CMD" =~ "umount" ]]; then
- if [ ! -x ../usr/sbin/umount.crypt ]; then
+ if [ ! -x /usr/sbin/umount.crypt ]; then
logger -t "mount.crypt" -p user.err -i "/usr/sbin/umount.crypt: File not found."
exit 1
fi
- ../usr/sbin/umount.crypt $@
+ /usr/sbin/umount.crypt "$@"
elif [[ "$CMD" =~ "mount" ]]; then
- if [ ! -x ../usr/sbin/mount.crypt ]; then
+ if [ ! -x /usr/sbin/mount.crypt ]; then
logger -t "mount.crypt" -p user.err -i "/usr/sbin/mount.crypt: File not found."
exit 1
fi
- ../usr/sbin/mount.crypt $@
+ /usr/sbin/mount.crypt "$@"
else
logger -t "mount.crypt" -p user.err -i "Unknown command: $0"
exit 1
diff --git a/mount.encfs13 b/mount.encfs13
index 740e44b..d18a340 100644
--- a/mount.encfs13
+++ b/mount.encfs13
@@ -3,17 +3,17 @@
CMD="${0##*/}"
if [[ "$CMD" =~ "umount" ]]; then
- if [ ! -x ../usr/sbin/umount.encfs13 ]; then
+ if [ ! -x /usr/sbin/umount.encfs13 ]; then
logger -t "mount.encfs13" -p user.err -i "/usr/sbin/umount.encfs13: File not found."
exit 1
fi
- ../usr/sbin/umount.encfs13 $@
+ /usr/sbin/umount.encfs13 "$@"
elif [[ "$CMD" =~ "mount" ]]; then
- if [ ! -x ../usr/sbin/mount.encfs13 ]; then
+ if [ ! -x /usr/sbin/mount.encfs13 ]; then
logger -t "mount.encfs13" -p user.err -i "/usr/sbin/mount.encfs13: File not found."
exit 1
fi
- ../usr/sbin/mount.encfs13 $@
+ /usr/sbin/mount.encfs13 "$@"
else
logger -t "mount.encfs13" -p user.err -i "Unknown command: $0"
exit 1
diff --git a/pam_mount-0.47-enable-logout-kill.dif b/pam_mount-0.47-enable-logout-kill.dif
index 976399e..5ed7fc7 100644
--- a/pam_mount-0.47-enable-logout-kill.dif
+++ b/pam_mount-0.47-enable-logout-kill.dif
@@ -1,10 +1,14 @@
-Index: pam_mount-1.32/config/pam_mount.conf.xml
+---
+ config/pam_mount.conf.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: pam_mount-2.5/config/pam_mount.conf.xml
===================================================================
---- pam_mount-1.32.orig/config/pam_mount.conf.xml
-+++ pam_mount-1.32/config/pam_mount.conf.xml
-@@ -33,7 +33,7 @@
+--- pam_mount-2.5.orig/config/pam_mount.conf.xml
++++ pam_mount-2.5/config/pam_mount.conf.xml
+@@ -32,7 +32,7 @@
+ -->
- /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
-
+
diff --git a/pam_mount-1.34.tar.bz2 b/pam_mount-1.34.tar.bz2
deleted file mode 100644
index b21e440..0000000
--- a/pam_mount-1.34.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d01c12084f1ee1736966b274b66516df77ad5ea4747dfbef26bb938bdfbf1e4d
-size 329753
diff --git a/pam_mount-2.5.tar.xz b/pam_mount-2.5.tar.xz
new file mode 100644
index 0000000..a7d6f6e
--- /dev/null
+++ b/pam_mount-2.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fa248a98ffa49dc6d8ceae1b45088571b6845d7831cae95fc75ccbcca3afb26
+size 288644
diff --git a/pam_mount-2.5.tar.xz.asc b/pam_mount-2.5.tar.xz.asc
new file mode 100644
index 0000000..0203aea
--- /dev/null
+++ b/pam_mount-2.5.tar.xz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEABECAAYFAkxhGaUACgkQ92gFgoRMQ2DJsACcCLvpRlZPYYIRAzRJQBA4nEsd
+7pgAn0WQBFNcLNovRR7Pn+H8WvGD5uGy
+=BW1E
+-----END PGP SIGNATURE-----
diff --git a/pam_mount.changes b/pam_mount.changes
index 5156e01..e4c7cee 100644
--- a/pam_mount.changes
+++ b/pam_mount.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Fri Aug 27 15:12:24 UTC 2010 - jengelh@medozas.de
+
+- remove unnecessary Requires(pre)
+- do not needlessy run autoreconf
+- update to version 2.5
+* new mount.crypt program that now uses libcryptsetup rather than
+ the cryptsetup binary
+* HXformat2 is now used. This invalidates old constructs like
+ %(before=\"-o\"...) which need to be replaced by new syntax
+ (see /usr/share/doc/packages/pam_mount/changelog.txt)
+* fusermount now called with secondary groups initialized
+* add support for keyfile passthru using -ofsk_cipher=none
+
+-------------------------------------------------------------------
+Tue Jun 1 13:42:01 CEST 2010 - mc@suse.de
+
+- use full paths in wrapper scripts (bnc#607200)
+
-------------------------------------------------------------------
Wed Apr 7 23:43:17 UTC 2010 - jengelh@medozas.de
diff --git a/pam_mount.spec b/pam_mount.spec
index 92e8dbb..6498579 100644
--- a/pam_mount.spec
+++ b/pam_mount.spec
@@ -23,17 +23,19 @@ BuildRequires: perl-XML-Parser perl-XML-Writer
BuildRequires: libtool pam-devel >= 0.99 pkg-config >= 0.19
BuildRequires: libxml2-devel >= 2.6 openssl-devel >= 0.9.7
BuildRequires: libHX-devel >= 3.4
+BuildRequires: libcryptsetup-devel >= 1.1.2
+Requires: device-mapper >= 1.02.48
BuildRequires: linux-kernel-headers >= 2.6
Summary: A PAM Module that can Mount Volumes for a User Session
-Version: 1.34
+Version: 2.5
Release: 1
-Recommends: cryptsetup
Recommends: cifs-mount
Requires: util-linux
License: LGPLv2.1+
Prefix: /usr
Group: System/Libraries
-Source: %{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.xz
+BuildRequires: xz
Source1: convert_pam_mount_conf.pl
Source2: convert_keyhash.pl
Source3: mount.crypt
@@ -42,7 +44,6 @@ Source5: baselibs.conf
Patch1: pam_mount-0.47-enable-logout-kill.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://pam-mount.sourceforge.net/
-Requires(pre): coreutils, perl-XML-Writer, perl-XML-Parser
Requires(post): coreutils, perl-XML-Writer, perl-XML-Parser
%description
@@ -63,8 +64,6 @@ dm-crypt and LUKS.
%patch1 -p1
%build
-%{suse_update_config -f}
-autoreconf --verbose --force --install
%configure --with-slibdir=/%{_lib} %{?_with_selinux:--with-selinux}
%{__make} %{?_smp_mflags}