Accepting request 59377 from Linux-PAM

Accepted submit request 59377 from user jengelh OBS-URL: https://build.opensuse.org/request/show/59377 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pam_mount?expand=0&rev=41
2011-02-02 01:03:18 +00:00 · 2011-02-02 01:03:18 +00:00 · bc2542c316
commit bc2542c316
parent a2c3ec81fc 241bd5e6f6
7 changed files with 71 additions and 15 deletions
--- a/29d23c4-fix-log-message.diff
+++ b/29d23c4-fix-log-message.diff
@ -0,0 +1,26 @@
+parent af3f78d48b3191f4c452a91c75c95123e4ae28e2 (v2.8-2-gaf3f78d)
+commit 29d23c4f429e87d1449309e2e247cd2e47d72120
+Author: Jan Engelhardt <jengelh@medozas.de>
+Date:   Mon Jan 3 01:23:35 2011 +0100
+
+pam_mount: fix printing of log message
+---
+ src/mount.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/mount.c b/src/mount.c
+index 22de49d..68926ee 100644
+--- a/src/mount.c
+++ b/src/mount.c
+@@ -293,7 +293,8 @@ static bool mkmountpoint(struct vol *volume, const char *d)
+ 			break;
+ 		}
+ 		w4rn("chown %s -> %ld:%ld\n", dtmp,
+-		     pe->pw_uid, pe->pw_gid);
+		     static_cast(long, pe->pw_uid),
+		     static_cast(long, pe->pw_gid));
+ 	}
+ 	HXmc_free(dtmp);
+ 	/* restore state: */
+-- 
+# Created with git-export-patch
--- a/pam_mount-0.47-enable-logout-kill.dif
+++ b/pam_mount-0.47-enable-logout-kill.dif
@ -2,14 +2,14 @@
 config/pam_mount.conf.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-Index: pam_mount-2.5/config/pam_mount.conf.xml
+Index: pam_mount-2.8/config/pam_mount.conf.xml
 ===================================================================
--- pam_mount-2.5.orig/config/pam_mount.conf.xml
-+++ pam_mount-2.5/config/pam_mount.conf.xml
-@@ -32,7 +32,7 @@
- -->
+--- pam_mount-2.8.orig/config/pam_mount.conf.xml
+++ pam_mount-2.8/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" />
 
--- a/pam_mount-2.5.tar.xz
+++ b/pam_mount-2.5.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7fa248a98ffa49dc6d8ceae1b45088571b6845d7831cae95fc75ccbcca3afb26
-size 288644
--- a/pam_mount-2.8.tar.xz
+++ b/pam_mount-2.8.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:720ee7d7969189e2bcf8b9c0ac51049e7f6219c95b79049bb9042c6ef21a457b
+size 283280
--- a/pam_mount-2.8.tar.xz.asc
+++ b/pam_mount-2.8.tar.xz.asc
@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEABECAAYFAk0RYBYACgkQ92gFgoRMQ2DiIQCfU+9NDL4pcMJshPEi/Zba19t4
+VuMAn2hM7X/VZI7o0VjfXnYXvOWVtzF0
+=gldi
+-----END PGP SIGNATURE-----
--- a/pam_mount.changes
+++ b/pam_mount.changes
@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sat Jan 15 17:14:10 UTC 2011 - jengelh@medozas.de
+
+- update to version 2.8
+* shipped fd0ssh and ofl were removed; the original ones from
+  hxtools are required
+* fix an improper refcount drop (rhbz#622930)
+* %(shell EXPR) is now activated and usable from the global config
+  file
+* mountpoint creation has been redone and now works better
+* remove mountpoint early when mount failed
+* fix truncation of groups on FUSE mounts
+* invocation of mount.fuse was broken due to missing space in
+  config
+
 -------------------------------------------------------------------
 Fri Aug 27 15:12:24 UTC 2010 - jengelh@medozas.de

@ -12,6 +27,12 @@ Fri Aug 27 15:12:24 UTC 2010 - jengelh@medozas.de
 * fusermount now called with secondary groups initialized
 * add support for keyfile passthru using -ofsk_cipher=none

+-------------------------------------------------------------------
+Fri Aug 20 19:52:55 UTC 2010 - lars@samba.org
+
+- rdconf: do not warn about missing fskeyhash when no fskey specified;
+  (bnc#626127); http://bugs.debian.org/580430
+
 -------------------------------------------------------------------
 Tue Jun  1 13:42:01 CEST 2010 - mc@suse.de

--- a/pam_mount.spec
+++ b/pam_mount.spec
@ -1,5 +1,5 @@
 #
-# spec file for package pam_mount (Version 2.5)
+# spec file for package pam_mount (Version 2.8)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@ -22,14 +22,17 @@ 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.4
+BuildRequires:  libHX-devel >= 3.6
 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.5
+Version:        2.8
 Release:        1
+# for fd0ssh and ofl:
+Recommends:	hxtools >= 20090116
 Recommends:     cifs-mount
+# for mount:
 Requires:       util-linux
 License:        LGPLv2.1+
 Prefix:         /usr
@ -42,8 +45,9 @@ Source3:        mount.crypt
 Source4:        mount.encfs13
 Source5:        baselibs.conf
 Patch1:         pam_mount-0.47-enable-logout-kill.dif
+Patch2:		29d23c4-fix-log-message.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Url:            http://pam-mount.sourceforge.net/
+Url:            http://pam-mount.sf.net/
 Requires(post):	coreutils, perl-XML-Writer, perl-XML-Parser

 %description
@ -62,6 +66,7 @@ dm-crypt and LUKS.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1

 %build
 %configure --with-slibdir=/%{_lib} %{?_with_selinux:--with-selinux}
@ -114,8 +119,6 @@ rm -rf $RPM_BUILD_ROOT
 %docdir %_docdir/%name
 %_docdir/%name
 /%{_lib}/security/pam_mount*.so
-%{_bindir}/pmt-fd0ssh
-%{_bindir}/pmt-ofl
 /sbin/mount.crypt*
 /sbin/umount.crypt*
 /sbin/mount.encfs13
@ -126,7 +129,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/pmvarrun
 %{_sbindir}/pmt-ehd
 %config(noreplace) %{_sysconfdir}/security/pam_mount.conf.xml
-%doc %{_mandir}/man1/pmt-fd0ssh.1.gz
 %doc %{_mandir}/man5/pam_mount.conf.5.gz
 %doc %{_mandir}/man8/*.8.gz
 %if 0%{?_with_selinux:1}