rpms/pam_mount/devel pam_mount-1.2-o-cipher.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 pam_mount.spec, 1.45, 1.46 sources, 1.18, 1.19
Till Maas
till at fedoraproject.org
Wed Oct 29 13:31:51 UTC 2008
Author: till
Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11531
Modified Files:
.cvsignore pam_mount.spec sources
Added Files:
pam_mount-1.2-o-cipher.patch
Log Message:
* Sun Oct 26 2008 Till Maas <opensource at till.name> - 1.2-2
- Add patch to mount luks volumes without -o cipher
pam_mount-1.2-o-cipher.patch:
--- NEW FILE pam_mount-1.2-o-cipher.patch ---
From: Jan Engelhardt <jengelh at medozas.de>
Date: Sat, 25 Oct 2008 16:05:52 +0000 (-0400)
Subject: mount.crypt: only require -o cipher when used with a keyfile
X-Git-Url: http://dev.medozas.de/gitweb.cgi?p=pam_mount;a=commitdiff_plain;h=f1ece6a7588b27729ef5d4e517cbdbe496d94ef8
mount.crypt: only require -o cipher when used with a keyfile
Reference: SF bug #2194073
LUKS stores the cipher and hash in the header of the volume, so that
-o cipher is not needed from the command line.
---
diff --git a/src/loop.c b/src/loop.c
index 9fa5a30..220fa9c 100644
--- a/src/loop.c
+++ b/src/loop.c
@@ -185,8 +185,10 @@ static bool ehd_load_2(struct ehdmount_ctl *ctl)
start_args[argk++] = "cryptsetup";
if (ctl->readonly)
start_args[argk++] = "--readonly";
- start_args[argk++] = "-c";
- start_args[argk++] = ctl->cipher;
+ if (ctl->cipher != NULL) {
+ start_args[argk++] = "-c";
+ start_args[argk++] = ctl->cipher;
+ }
if (is_luks) {
start_args[argk++] = "luksOpen";
start_args[argk++] = ctl->lower_device;
diff --git a/src/mtcrypt.c b/src/mtcrypt.c
index ede984a..6517ee4 100644
--- a/src/mtcrypt.c
+++ b/src/mtcrypt.c
@@ -244,13 +244,12 @@ static bool mtcr_get_mount_options(int *argc, const char ***argv,
fprintf(stderr, "%s: No openssl hash specified "
"(use -o fsk_hash=xxx)\n", **argv);
return false;
+ } else if (opt->dmcrypt_cipher == NULL) {
+ fprintf(stderr, "%s: No dmcrypt cipher specified "
+ "(use -o cipher=xxx)\n", **argv);
+ return false;
}
}
- if (opt->dmcrypt_cipher == NULL) {
- fprintf(stderr, "%s: No dmcrypt cipher specified "
- "(use -o cipher=xxx)\n", **argv);
- return false;
- }
if (opt->dmcrypt_hash == NULL)
opt->dmcrypt_hash = "plain";
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 8 Oct 2008 14:17:47 -0000 1.17
+++ .cvsignore 29 Oct 2008 13:31:21 -0000 1.18
@@ -1 +1,2 @@
-pam_mount-0.49.tar.lzma
+pam_mount-1.2.tar.lzma
+pam_mount-1.2.tar.lzma.asc
Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- pam_mount.spec 8 Oct 2008 14:17:48 -0000 1.45
+++ pam_mount.spec 29 Oct 2008 13:31:21 -0000 1.46
@@ -1,16 +1,18 @@
Name: pam_mount
-Version: 0.49
-Release: 1%{?dist}
+Version: 1.2
+Release: 2%{?dist}
Summary: A PAM module that can mount volumes for a user session
Group: System Environment/Base
-# The library and binaries are LGPLv2+, the scripts are GPLv2+, except for convert_pam_mount_conf.pl
-# convert_pam_mount_conf.pl is licensed under the same license as pam_mount itself.
+# The library and binaries are LGPLv2+ with these Exceptions:
# pmt-fd0ssh is licensed under LGPLv2 or LGPLv3
-License: LGPLv2+ and GPLv2+ and (LGPLv2 or LGPLv3)
+# mount.encfs13 and pmt-ofl are Public Domain
+License: LGPLv2+ and (LGPLv2 or LGPLv3) and Public Domain
URL: http://pam-mount.sourceforge.net/
Source0: http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.lzma
-#Source1: http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.lzma.asc
+Source1: http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.lzma.asc
+# From upstream SCM:
+Patch0: pam_mount-1.2-o-cipher.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel, pam-devel, openssl-devel
@@ -18,9 +20,7 @@
BuildRequires: libHX-devel >= 1.25
BuildRequires: lzma
Requires: pam
-Requires: psmisc
Requires: libHX >= 1.25
-Requires(post): perl(XML::Writer)
%description
@@ -45,6 +45,7 @@
%prep
%setup -q -T -c
lzma -c -d %SOURCE0 | tar -xvvf - -C ..
+%patch0 -p1 -b .o-cipher
%build
@@ -57,17 +58,9 @@
make install DESTDIR=$RPM_BUILD_ROOT V=verbose
-install -p scripts/convert_pam_mount_conf.pl $RPM_BUILD_ROOT/%{_bindir}
rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.{a,la}
-%post
-if [ -e %{_sysconfdir}/security/pam_mount.conf ]; then
- convert_pam_mount_conf.pl <%{_sysconfdir}/security/pam_mount.conf \
- >%{_sysconfdir}/security/pam_mount.conf.xml;
-fi;
-
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -81,21 +74,28 @@
%config(noreplace) %{_sysconfdir}/security/pam_mount.conf.xml
/%{_lib}/security/pam_mount.so
%{_sbindir}/pmvarrun
-%{_bindir}/autoehd
-%{_bindir}/convert_pam_mount_conf.pl
-%{_bindir}/mkehd
-%{_bindir}/mount_ehd
-%{_bindir}/passwdehd
+%{_sbindir}/pmt-ehd
%{_bindir}/pmt-fd0ssh
%{_bindir}/pmt-ofl
/sbin/mount.crypt
/sbin/mount.encfs13
/sbin/umount.crypt
+/sbin/mount.crypt_LUKS
+/sbin/umount.crypt_LUKS
%{_mandir}/man?/*
%{_localstatedir}/run/pam_mount
%changelog
+* Sun Oct 26 2008 Till Maas <opensource at till.name> - 1.2-2
+- Add patch to mount luks volumes without -o cipher
+
+* Sat Oct 25 2008 Till Maas <opensource at till.name> - 1.2-1
+- Update to new release
+- remove config conversion script
+- add crypt_LUKS symlinks
+- remove psmisc dependency, lsof is no longer used
+
* Wed Oct 08 2008 Till Maas <opensource at till.name> - 0.49-1
- Update to new release
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 8 Oct 2008 14:17:48 -0000 1.18
+++ sources 29 Oct 2008 13:31:21 -0000 1.19
@@ -1 +1,2 @@
-91df908c0150236bd0da16fe856e7bfa pam_mount-0.49.tar.lzma
+7386eeb6ea3b7f4b21e30fd98dab0828 pam_mount-1.2.tar.lzma
+ccf8700ecb7d6a97946af90eadf04c05 pam_mount-1.2.tar.lzma.asc
More information about the scm-commits
mailing list