Accepting request 86906 from Linux-PAM
- Update to new upstream release 2.12 * mount.crypt: restore support for files >= 4 GB * remove patches merged upstream OBS-URL: https://build.opensuse.org/request/show/86906 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pam_mount?expand=0&rev=52
This commit is contained in:
Ruediger Oertel
Git OBS Bridge
commit
3e32e9e488
@ -1,41 +0,0 @@
|
||||
parent eb20a2681362520a9728038a9ff3bdbba58eb1cb (v2.11-1-geb20a26)
|
||||
commit 2f8daad6ee71bade802f78e5072410e46bfd74c1
|
||||
Author: Jan Engelhardt <jengelh@medozas.de>
|
||||
Date: Wed Aug 10 12:48:49 2011 +0200
|
||||
|
||||
config: default to calling umount.crypt directly
|
||||
|
||||
As long as utab (no mtab or ro mtab) is not supported, at least try to
|
||||
get the user's volumes unmounted on logout.
|
||||
---
|
||||
doc/changelog.txt | 1 +
|
||||
src/rdconf1.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/doc/changelog.txt b/doc/changelog.txt
|
||||
index d14828f..d99e52f 100644
|
||||
--- a/doc/changelog.txt
|
||||
+++ b/doc/changelog.txt
|
||||
@@ -3,6 +3,7 @@ For details, see the history as recorded in the git repository.
|
||||
|
||||
HEAD
|
||||
====
|
||||
+config: default to calling umount.crypt directly
|
||||
|
||||
|
||||
v2.11 (2011-08-07)
|
||||
diff --git a/src/rdconf1.c b/src/rdconf1.c
|
||||
index 37b465c..e64df06 100644
|
||||
--- a/src/rdconf1.c
|
||||
+++ b/src/rdconf1.c
|
||||
@@ -1367,7 +1367,7 @@ static const struct pmt_command default_command[] = {
|
||||
{CMD_NFSMOUNT, "nfs4"},
|
||||
{CMD_LCLMOUNT, NULL, {"mount", "-p0", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(VOLUME)", "%(MNTPT)", NULL}},
|
||||
{CMD_CRYPTMOUNT, "crypt", {"mount", "-t", "crypt", "%(if %(CIPHER),-ocipher=%(CIPHER))", "%(if %(FSKEYCIPHER),-ofsk_cipher=%(FSKEYCIPHER))", "%(if %(FSKEYHASH),-ofsk_hash=%(FSKEYHASH))", "%(if %(FSKEYPATH),-okeyfile=%(FSKEYPATH))", "%(if %(OPTIONS),-o%(OPTIONS))", "%(VOLUME)", "%(MNTPT)", NULL}},
|
||||
- {CMD_CRYPTUMOUNT, "crypt", {"umount", "%(MNTPT)", NULL}},
|
||||
+ {CMD_CRYPTUMOUNT, "crypt", {"umount.crypt", "%(MNTPT)", NULL}},
|
||||
{CMD_UMOUNT, NULL, {"umount", "%(MNTPT)", NULL}},
|
||||
{CMD_FSCK, NULL, {"fsck", "-p", "%(FSCKTARGET)", NULL}},
|
||||
{CMD_PMVARRUN, NULL, {"pmvarrun", "-u", "%(USER)", "-o", "%(OPERATION)", NULL}},
|
||||
--
|
||||
# Created with git-export-patch
|
||||
@ -1,31 +0,0 @@
|
||||
parent ebeca48d6740cc18dcb4bac15f19b5808c67ae72 (v2.11)
|
||||
commit eb20a2681362520a9728038a9ff3bdbba58eb1cb
|
||||
Author: Jan Engelhardt <jengelh@medozas.de>
|
||||
Date: Wed Aug 10 12:48:44 2011 +0200
|
||||
|
||||
mount.crypt: clarify situation about current absence of utab support
|
||||
---
|
||||
src/mtcrypt.c | 8 +++++---
|
||||
1 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/mtcrypt.c b/src/mtcrypt.c
|
||||
index b416dc3..d74a07c 100644
|
||||
--- a/src/mtcrypt.c
|
||||
+++ b/src/mtcrypt.c
|
||||
@@ -674,9 +674,11 @@ int main(int argc, const char **argv)
|
||||
int ret;
|
||||
|
||||
if (stat("/etc/mtab", &sb) == 0 && (sb.st_mode & S_IWUGO) == 0)
|
||||
- fprintf(stderr, "BIG FAT WARNING: This version of mount.crypt "
|
||||
- "does not support unmounting crypto volumes through "
|
||||
- "umount(8) on systems with read-only mtab yet.\n");
|
||||
+ fprintf(stderr, "NOTE: mount.crypt does not support utab "
|
||||
+ "(systems with no mtab or read-only mtab) yet. This "
|
||||
+ "means that you will temporarily need to call "
|
||||
+ "umount.crypt(8) rather than umount(8) to get crypto "
|
||||
+ "volumes unmounted.\n");
|
||||
|
||||
ret = HX_init();
|
||||
if (ret <= 0) {
|
||||
--
|
||||
# Created with git-export-patch
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:48e3048f6e28fb1c69dee6bdd7f60af8772fe5ddab135c9f6b543202e6dbec2d
|
||||
size 283960
|
||||
@ -1,7 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.16 (GNU/Linux)
|
||||
|
||||
iF4EABEIAAYFAk491X0ACgkQkb3j62iiDkWT5AD9FbCohmRy/Yz7T45XDYQw69/a
|
||||
RmLWSrkE4x3b4F47/XsA/3EuH9OFL+xecizdjVqTrKn/G8j6MWtEeG+usxXNUIhf
|
||||
=PYPR
|
||||
-----END PGP SIGNATURE-----
|
||||
3
pam_mount-2.12.tar.xz
Normal file
3
pam_mount-2.12.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5454ade466fbfed5dc19330647f1f1f70a819d32d8d2355f5ff024cedfa00525
|
||||
size 284140
|
||||
17
pam_mount-2.12.tar.xz.asc
Normal file
17
pam_mount-2.12.tar.xz.asc
Normal file
@ -0,0 +1,17 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.16 (GNU/Linux)
|
||||
|
||||
iQIcBAABAgAGBQJOjZfWAAoJEN//LNsZ/DONQ9EQAKDlm/fO1InodgoReEMLWyhl
|
||||
fTo3yo3oxLRhh3Ct7YPaD1Y4P0c/29aZ+FiCgaZcb8P9cg5SJtRcnV280XXspK/m
|
||||
5FLdTmqMfErn79KoDybv8eQDA4c8ux+8G5y60v7mQIssGay9sE/ECb3fId6evCrS
|
||||
eZGH5Hz3jo7Sv8a4kk2X5xWALdMeCu/LqszmL6gC9cxBMmUfzWkdNoykoF1mtlok
|
||||
U8PnqqH8DMsy2BiPQzdTlhk8xBXApQR8Gk3NWzJgEFbGdbzVZbvYoBb/OU/i2Ili
|
||||
55ayakUzlMe4aCptkR81Jdx2O14rL5EWGq+O+nbyPB0kCGYNE5Pq0+tFgUnDiHC+
|
||||
3Q1GLvZjWYRBKrTnorTKnzKyAka/kYItjiJYr7MN/D6ShksaFsBgYrFvDXrzLP1n
|
||||
DsvxZP/ZrDoxzdQokQm04Lb2U67IuejVuFHL5sbLjtUS3FA+nI7HbtHorVMR0m26
|
||||
UMAYp0ARDGYHWf+H3MzDR5/4uzk4hIrCmNfno7WnY/FRP5MSXmyS2fPcIB8iHcdE
|
||||
47RNd+I5bE6356ErV7ntijBkoa+KsUjqj95QrT4ViFl8y7/dcgYUUlvEuanwZEgZ
|
||||
s51ZSJVGArdGKV2IGrAzU9SEfXPWK2KQvOKuWrf79Q2XV+UKMZNQetlcTAnm4d6T
|
||||
0wK5Rx3S6fyrwWVXU/Qc
|
||||
=GILs
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 6 11:42:36 UTC 2011 - jengelh@medozas.de
|
||||
|
||||
- Update to new upstream release 2.12
|
||||
* mount.crypt: restore support for files >= 4 GB
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 30 05:45:50 UTC 2011 - jengelh@medozas.de
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ 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: 2.11
|
||||
Version: 2.12
|
||||
Release: 1
|
||||
# for fd0ssh and ofl:
|
||||
Suggests: hxtools >= 20090116
|
||||
@ -43,10 +43,8 @@ Source2: convert_keyhash.pl
|
||||
Source3: mount.crypt
|
||||
Source5: baselibs.conf
|
||||
Patch1: pam_mount-0.47-enable-logout-kill.dif
|
||||
Patch2: eb20a26-utab-explain.diff
|
||||
Patch3: 2f8daad-call-umount-crypt-directly.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Url: http://pam-mount.sf.net/
|
||||
URL: http://pam-mount.sf.net/
|
||||
Requires(post): coreutils, perl-XML-Writer, perl-XML-Parser
|
||||
|
||||
%description
|
||||
@ -60,20 +58,17 @@ volumes are set up properly because often they need more than just a
|
||||
mount call, such as encrypted volumes. This includes SMB/CIFS, FUSE,
|
||||
dm-crypt and LUKS.
|
||||
|
||||
Author(s):
|
||||
----------
|
||||
Jan Engelhardt
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -P 1 -P 2 -P 3 -p1
|
||||
%patch -P 1 -p1
|
||||
|
||||
%build
|
||||
%configure --with-slibdir=/%_lib %{?_with_selinux:--with-selinux}
|
||||
%configure --disable-static --with-slibdir=/%_lib \
|
||||
%{?_with_selinux:--with-selinux}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR=%buildroot
|
||||
%make_install
|
||||
# Remove static and libtool version
|
||||
rm -f %buildroot/%_lib/security/pam_mount.{a,la}
|
||||
#install the docs
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user