Jan Engelhardt 2014-12-01 13:44:07 +00:00 committed by Git OBS Bridge
parent 5510df4494
commit 6a59c826c8
7 changed files with 40 additions and 33 deletions

View File

@ -2,16 +2,16 @@
config/pam_mount.conf.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pam_mount-2.8/config/pam_mount.conf.xml
Index: pam_mount-2.15/config/pam_mount.conf.xml
===================================================================
--- pam_mount-2.8.orig/config/pam_mount.conf.xml
+++ pam_mount-2.8/config/pam_mount.conf.xml
--- pam_mount-2.15.orig/config/pam_mount.conf.xml
+++ pam_mount-2.15/config/pam_mount.conf.xml
@@ -33,7 +33,7 @@
<mntoptions require="nosuid,nodev" />
<!-- requires ofl from hxtools to be present -->
-<logout wait="0" hup="0" term="0" kill="0" />
+<logout wait="2000" hup="0" term="1" kill="1" />
-<logout wait="0" hup="no" term="no" kill="no" />
+<logout wait="2000" hup="no" term="yes" kill="yes" />
<!-- pam_mount parameters: Volume-related -->

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f66cbb34568875772d854d3f2a8948f97f3f1c7f30e3ea2474e1d4b227adcf9
size 312776

View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQIcBAABAgAGBQJSHH28AAoJEN//LNsZ/DONNbAP/A0C4Hl5vdK5jhQXufV3FWtl
TMntHVjWZv+Wsxlth00r/Z9vOpmlbT63a3dpAMfUXQJ2tetJvOk+OzcvM21Sevzx
tFsCrPMjqvlc9B2XTorqDkbqkDWycKOVR5SwnbgtlssLvbHABE+9Bvir3odgEUFo
+/O0DvGIwn1M8vhzzc//xvRH0qib+FPEB+s7+hoOsdn4wk64VQnIMVaNzv5sGYiu
WlbawbGhtDxztHncOZMM/CN1NthqmPmCDw7ELQtp4datTRU1q3dekStXaTF/djOD
VoFgz2sILIo1/1ItJV6aTnb5NJ30Um0xQKUswF5468ERfZqXgiCX4g+zUprW47yD
gv9DKDa5TnnDpCQKCtD2KLVBVUOR6RPD667AK7NZMTeQQtTggGY75mDQKAudUtOH
k4d94yF1EnAGLSCb+ik3d/efQm3f65W+iC1XvgxqDUB2yKYmYspfvaOxxd/vYg9n
ApRpRzeQyIa2J1Do7gR7NIlKg/3+3CGRhsgvZ0u+o1q+VuJxWR0xI/N5EOaa8HSh
8yGxiAjSce6nOUo/cyZIiZHKekImczY8XTo608SqYKO5U1dK8ff3gbQkMfgDrMRd
gJiGRz14TViqmg1pNpEg2SNRpyCo0ptUcb7vGuWUX0FcelzBDBJLO6pp6fXwZ1M3
33H9YfKMNPgcZHD6EuH4
=SObK
-----END PGP SIGNATURE-----

17
pam_mount-2.15.tar.asc Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABAgAGBQJUfG8iAAoJEN//LNsZ/DONWwUP/0Z3elg4/eY7tHtEIfXVs7VA
6gKoU+Zu/YItx1iiew/YQHPI8WJCllPn6/N9JG2WuRLLbwLGc7Fa137lXEO9h9mg
2hBeH4CZXMFYcem72TmhPQHjnWIHHpUeDdxo/ZsEGatXiv8OX1t9y2tCXyKdVtYt
A/pnwBfsbjGralk2IGPm0MbFyr0Y7KSQbVh7sRrErwxiPPzO+YNTtVuUBJ0XxvWx
gO+mLyG4r4q4D5nnGhEXHAdu+/H9QSCiOoC5huPL1AlzrAYIhEYOuc8UtFCZJqKx
aAKoQNv9QZFow/SUkJ4RBBOyJgGVAaDyY01P8ixVF6f564ZsrijbiSmfNToFvxPh
lNI6uFO8GG2A5pC4X1d9ZjEgQhgITL6aEiuAcwLZbQObjV+qyXyWmn0Nf2OFigMI
l6xXa6AytpLOXXf82ZqQxmrl4MMHDenGazctlc2Tcz+dACUJYamm+qsfTT0/m6PP
14WqcOV2msRoM6myUDHKOsyWLuVMev49zhsBmawD/zvVSBftJVYw9KSx9sj3k0j+
RC2nwEWarzf2Mau2XDvkrOPOgAeD7akZtvfZV6xgAV14bhrZ43HBzpqu5AEUVFb9
fIbKi4u0mdkWmFHwL03f0k6uWJN4G9rGgX5diSSfXWJAAav25GX1zuDLVIaEGJCm
tf2LyFwwcyiErBkcW0+C
=HEUj
-----END PGP SIGNATURE-----

3
pam_mount-2.15.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a54efb4a8e8dd52c77b15cd36d9354b4733bb9b4cae75083801c18e67fc12a24
size 312076

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Dec 1 13:43:06 UTC 2014 - jengelh@inai.de
- Update to new upstream release 2.15
* Use new helper= option in util-linux, allowing umount.crypt to be
called on umount.
* Fix a crash in ehd_log due to lack of va_start call
-------------------------------------------------------------------
Tue Sep 23 16:51:52 UTC 2014 - jengelh@inai.de

View File

@ -21,12 +21,12 @@ Name: pam_mount
Summary: A PAM Module that can Mount Volumes for a User Session
License: LGPL-2.1+ and GPL-2.0+
Group: System/Libraries
Version: 2.14
Version: 2.15
Release: 0
Url: http://pam-mount.sf.net/
Source: %name-%version.tar.xz
Source9: %name-%version.tar.xz.asc
Source: http://downloads.sf.net/pam-mount/%name-%version.tar.xz
Source9: http://downloads.sf.net/pam-mount/%name-%version.tar.asc
Source1: convert_pam_mount_conf.pl
Source2: convert_keyhash.pl
Source3: mount.crypt
@ -60,7 +60,7 @@ Requires: device-mapper >= 1.02.48
Requires: fd0ssh
Requires: ofl
# for mount(8) and mount.cifs:
Requires: util-linux
Requires: util-linux >= 2.20
Recommends: cifs-mount
%description
@ -102,8 +102,8 @@ and transparent use of the OS's crypto layer.
%patch -P 1 -p1
%build
%configure --disable-static --with-slibdir=/%_lib \
--includedir=%_includedir/libcryptmount-%version \
%configure --disable-static --with-slibdir="/%_lib" \
--includedir="%_includedir/libcryptmount" \
%{?_with_selinux:--with-selinux}
make %{?_smp_mflags}
@ -149,7 +149,6 @@ fi
%files
%defattr(-, root, root)
%docdir %_docdir/%name
%_docdir/%name
/%_lib/security/pam_mount*.so
/sbin/mount.crypt*
@ -172,7 +171,7 @@ fi
%files -n libcryptmount-devel
%defattr(-,root,root)
%_includedir/libcryptmount-%version
%_includedir/libcryptmount/
%_libdir/pkgconfig/*.pc
%_libdir/libcryptmount.so