Hello community, here is the log from the commit of package pam_mount for openSUSE:11.4 checked in at Wed Aug 17 16:26:09 CEST 2011.
-------- --- old-versions/11.4/all/pam_mount/pam_mount.changes 2011-02-14 16:38:11.000000000 +0100 +++ 11.4/pam_mount/pam_mount.changes 2011-08-10 13:02:28.000000000 +0200 @@ -1,0 +2,37 @@ +Wed Aug 10 11:00:29 UTC 2011 - [email protected] + +- Add commit 2f8daad from upstream - call umount.crypt directly + from pam_mount.so while mount.crypt is having no support for + utab (bnc#671276); also add commit eb20a26 for better wording of + this situation. + +------------------------------------------------------------------- +Sun Aug 7 00:09:17 UTC 2011 - [email protected] + +- Update to new upstream release 2.11 +* Allow specifying CIFS/NCP/NFS <volume>s without a + "server" attribute (this allows AD integration via pam_winbind) +* Added a handful of diagnostics to umount.crypt to determine + failure to find vfsmounts +* Use /run directory for our variadic data +* pmt-ehd: Exclusively create LUKS partitions from now on + +------------------------------------------------------------------- +Fri Apr 15 11:21:08 UTC 2011 - [email protected] + +- Update to new upstream release 2.10 +* loop-linux: wait for loop device deallocation to succeed +* crypto: avoid premature attempt of unloading the loop device +* mtab: cope with mtab-less systems in staleness check +* mount.crypt: reduce mtab-less message from error to warning + +------------------------------------------------------------------- +Thu Apr 7 00:15:50 UTC 2011 - [email protected] + +- Update to new upstream release 2.9 +* Support for mount --bind/--move +* mount.crypt: warn about unwritable /etc/mtab +- %VERSION should have been %%VERSION in post +- Run spec-beautifier + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/pam_mount Destination is old-versions/11.4/UPDATES/all/pam_mount calling whatdependson for 11.4-i586 Old: ---- 29d23c4-fix-log-message.diff mount.encfs13 pam_mount-2.8.tar.xz New: ---- 2f8daad-call-umount-crypt-directly.diff eb20a26-utab-explain.diff pam_mount-2.11.tar.xz pam_mount-2.11.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_mount.spec ++++++ --- /var/tmp/diff_new_pack.sI9m0L/_old 2011-08-17 16:24:32.000000000 +0200 +++ /var/tmp/diff_new_pack.sI9m0L/_new 2011-08-17 16:24:32.000000000 +0200 @@ -15,37 +15,36 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: pam_mount 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.6 +BuildRequires: libHX-devel >= 3.10.1 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.8 -Release: 2 +Version: 2.11 +Release: 2.<RELEASE2> # for fd0ssh and ofl: Suggests: hxtools >= 20090116 Recommends: cifs-mount # for mount: Requires: util-linux License: LGPLv2.1+ -Prefix: /usr Group: System/Libraries -Source: %{name}-%{version}.tar.xz -BuildRequires: xz +Source: %name-%version.tar.xz +Source9: %name-%version.tar.xz.asc +BuildRequires: man xz Source1: convert_pam_mount_conf.pl Source2: convert_keyhash.pl Source3: mount.crypt -Source4: mount.encfs13 Source5: baselibs.conf Patch1: pam_mount-0.47-enable-logout-kill.dif -Patch2: 29d23c4-fix-log-message.diff +Patch2: eb20a26-utab-explain.diff +Patch3: 2f8daad-call-umount-crypt-directly.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pam-mount.sf.net/ Requires(post): coreutils, perl-XML-Writer, perl-XML-Parser @@ -61,76 +60,67 @@ mount call, such as encrypted volumes. This includes SMB/CIFS, FUSE, dm-crypt and LUKS. - +Author(s): +---------- + Jan Engelhardt %prep %setup -q -%patch1 -p1 -%patch2 -p1 +%patch -P 1 -P 2 -P 3 -p1 %build -%configure --with-slibdir=/%{_lib} %{?_with_selinux:--with-selinux} -%{__make} %{?_smp_mflags} +%configure --with-slibdir=/%_lib %{?_with_selinux:--with-selinux} +make %{?_smp_mflags} %install -make install DESTDIR=${RPM_BUILD_ROOT} +make install DESTDIR=%buildroot # Remove static and libtool version -rm -f ${RPM_BUILD_ROOT}/%{_lib}/security/pam_mount.{a,la} +rm -f %buildroot/%_lib/security/pam_mount.{a,la} #install the docs -mkdir -p ${RPM_BUILD_ROOT}/%_docdir/%{name}/examples -cp doc/bugs.txt doc/changelog.txt LICENSE* doc/faq.txt doc/todo.txt doc/options.txt doc/pam_mount.txt ${RPM_BUILD_ROOT}/%_docdir/%name/ -install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}/%_docdir/%{name}/examples/ -install -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}/%_docdir/%{name}/examples/ +mkdir -p %buildroot/%_docdir/%name/examples +cp doc/bugs.txt doc/changelog.txt LICENSE* doc/faq.txt doc/todo.txt doc/options.txt doc/pam_mount.txt %buildroot/%_docdir/%name/ +install -m 755 %SOURCE1 %buildroot/%_docdir/%name/examples/ +install -m 755 %SOURCE2 %buildroot/%_docdir/%name/examples/ # -# move /sbin/mount.crypt to /usr/sbin/mount.crypt and put a wrapper script to /sbin/mount.crypt -# The same for mount.encfs13 +# move /sbin/mount.crypt to %_sbindir/mount.crypt and put a wrapper script to /sbin/mount.crypt # -mkdir -p ${RPM_BUILD_ROOT}/usr/sbin/ -mv ${RPM_BUILD_ROOT}/sbin/mount.crypt ${RPM_BUILD_ROOT}/usr/sbin/ -mv ${RPM_BUILD_ROOT}/sbin/mount.encfs13 ${RPM_BUILD_ROOT}/usr/sbin/ -ln -s /usr/sbin/mount.crypt ${RPM_BUILD_ROOT}/usr/sbin/umount.crypt -ln -s /usr/sbin/mount.encfs13 ${RPM_BUILD_ROOT}/usr/sbin/umount.encfs13 -install -m755 %{SOURCE3} ${RPM_BUILD_ROOT}/sbin/ -install -m755 %{SOURCE4} ${RPM_BUILD_ROOT}/sbin/ +mkdir -p %buildroot%_sbindir/ +mv %buildroot/sbin/mount.crypt %buildroot%_sbindir/ +ln -s %_sbindir/mount.crypt %buildroot%_sbindir/umount.crypt +install -m755 %SOURCE3 %buildroot/sbin/ %post if [ -e etc/security/pam_mount.conf ] then - cp etc/security/pam_mount.conf.xml %_docdir/%{name}/examples/ - %_docdir/%{name}/examples/convert_pam_mount_conf.pl \ + cp etc/security/pam_mount.conf.xml %_docdir/%name/examples/ + %_docdir/%name/examples/convert_pam_mount_conf.pl \ -i etc/security/pam_mount.conf -o etc/security/pam_mount.conf.xml fi -if [ $1 -gt 1 ] +if [ "$1" -gt 1 ] then - for v in `rpm -q --queryformat "%{VERSION} " %{name}`; do + for v in `rpm -q --queryformat "%%VERSION " %name`; do if echo "$v" | grep -E "^0\." - ; then - %_docdir/%{name}/examples/convert_keyhash.pl \ + %_docdir/%name/examples/convert_keyhash.pl \ -i etc/security/pam_mount.conf.xml break; fi done fi -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-, root, root) %docdir %_docdir/%name %_docdir/%name -/%{_lib}/security/pam_mount*.so +/%_lib/security/pam_mount*.so /sbin/mount.crypt* /sbin/umount.crypt* -/sbin/mount.encfs13 -%{_sbindir}/mount.crypt -%{_sbindir}/umount.crypt -%{_sbindir}/mount.encfs13 -%{_sbindir}/umount.encfs13 -%{_sbindir}/pmvarrun -%{_sbindir}/pmt-ehd -%config(noreplace) %{_sysconfdir}/security/pam_mount.conf.xml -%doc %{_mandir}/man5/pam_mount.conf.5.gz -%doc %{_mandir}/man8/*.8.gz +%_sbindir/mount.crypt +%_sbindir/umount.crypt +%_sbindir/pmvarrun +%_sbindir/pmt-ehd +%config(noreplace) %_sysconfdir/security/pam_mount.conf.xml +%doc %_mandir/man5/pam_mount.conf.5.gz +%doc %_mandir/man8/*.8.gz %if 0%{?_with_selinux:1} %policy %_sysconfdir/selinux/strict/src/policy/macros/%{name}_macros.te %policy %_sysconfdir/selinux/strict/src/policy/file_contexts/misc/%name.fc ++++++ 2f8daad-call-umount-crypt-directly.diff ++++++ parent eb20a2681362520a9728038a9ff3bdbba58eb1cb (v2.11-1-geb20a26) commit 2f8daad6ee71bade802f78e5072410e46bfd74c1 Author: Jan Engelhardt <[email protected]> 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 ++++++ eb20a26-utab-explain.diff ++++++ parent ebeca48d6740cc18dcb4bac15f19b5808c67ae72 (v2.11) commit eb20a2681362520a9728038a9ff3bdbba58eb1cb Author: Jan Engelhardt <[email protected]> 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
