rpms/pam_mount/devel 0001-use-extra_opts-in-etc-mtab-unless-empty.patch, NONE, 1.1 pam_mount-1.22-uninitialized-variable.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 pam_mount.spec, 1.54, 1.55 sources, 1.24, 1.25

[Till Maas]

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19611

Modified Files:
	.cvsignore pam_mount.spec sources 
Added Files:
	0001-use-extra_opts-in-etc-mtab-unless-empty.patch 
	pam_mount-1.22-uninitialized-variable.patch 
Log Message:
* Mon Apr 13 2009 Till Maas <opensource at till.name> - 1.22-1
- Update to new release
- Support remount (Red Hat Bugzilla: #492347)
- Show more correct mount options in /etc/mtab
- backport fix against uninitialized value


0001-use-extra_opts-in-etc-mtab-unless-empty.patch:

--- NEW FILE 0001-use-extra_opts-in-etc-mtab-unless-empty.patch ---
>From fcc3c29f4eea2ce3194029453e4ae7597cc32b1e Mon Sep 17 00:00:00 2001
From: Till Maas <opensource at till.name>
Date: Mon, 13 Apr 2009 23:02:37 +0200
Subject: [PATCH] - use extra_opts in /etc/mtab unless empty

---
 src/mtcrypt.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/mtcrypt.c b/src/mtcrypt.c
index 493afb7..3b80663 100644
--- a/src/mtcrypt.c
+++ b/src/mtcrypt.c
@@ -450,8 +450,13 @@ static int mtcr_mount(struct mount_options *opt)
 	} else if (opt->no_update) {
 		/* awesome logic */;
 	} else {
-		pmt_smtab_add(mount_info.container, opt->mountpoint,
-			"crypt", "defaults");
+		if (opt->extra_opts != NULL) {
+			pmt_smtab_add(mount_info.container, opt->mountpoint,
+				"crypt", opt->extra_opts);
+		} else {
+			pmt_smtab_add(mount_info.container, opt->mountpoint,
+				"crypt", "defaults");
+		}
 	}
 
 	ehd_mtfree(&mount_info);
-- 
1.5.4.1


pam_mount-1.22-uninitialized-variable.patch:

--- NEW FILE pam_mount-1.22-uninitialized-variable.patch ---
From: Jan Engelhardt <jengelh at medozas.de>
Date: Sun, 12 Apr 2009 17:51:02 +0000 (+0200)
Subject: src: fix one uninitialized value
X-Git-Url: http://pam-mount.git.sourceforge.net/git/gitweb.cgi?p=pam-mount;a=commitdiff_plain;h=d4f898a53b7fc039c0bbb08bf125e5c43b99d966

src: fix one uninitialized value

valgrind reported (which "disable_interactive" pam_mount option):

==8731== Conditional jump or move depends on uninitialised value(s)
==8731==    at 0x4E15D6B: pam_sm_open_session (pam_mount.c:517)
==8731==    by 0x48436DE: (within /lib/libpam.so.0.81.12)
==8731==    by 0x4847392: pam_open_session (in /lib/libpam.so.0.81.12)
==8731==    by 0x2CDC: main (in /bin/su)
---

diff --git a/src/pam_mount.c b/src/pam_mount.c
index 1e5e780..921885f 100644
--- a/src/pam_mount.c
+++ b/src/pam_mount.c
@@ -446,7 +446,7 @@ PAM_EXTERN EXPORT_SYMBOL int pam_sm_open_session(pam_handle_t *pamh, int flags,
 	struct vol *vol;
 	int ret;
 	unsigned int krb5_set;
-	char *system_authtok;
+	char *system_authtok = NULL;
 	const void *tmp;
 	int getval;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	3 Mar 2009 17:39:26 -0000	1.23
+++ .cvsignore	13 Apr 2009 21:59:23 -0000	1.24
@@ -1,2 +1,2 @@
-pam_mount-1.20.tar.bz2
-pam_mount-1.20.tar.bz2.asc
+pam_mount-1.22.tar.bz2
+pam_mount-1.22.tar.bz2.asc


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- pam_mount.spec	3 Mar 2009 17:39:26 -0000	1.54
+++ pam_mount.spec	13 Apr 2009 21:59:23 -0000	1.55
@@ -1,7 +1,7 @@
 %define packext bz2
 
 Name:           pam_mount
-Version:        1.20
+Version:        1.22
 Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
@@ -13,6 +13,10 @@
 URL:            http://pam-mount.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.%{packext}
 Source1:        http://downloads.sourceforge.net/pam-mount/%{name}-%{version}.tar.%{packext}.asc
+# from upstream: http://pam-mount.git.sourceforge.net/git/gitweb.cgi?p=pam-mount;a=commitdiff_plain;h=d4f898a53b7fc039c0bbb08bf125e5c43b99d966
+Patch0:         pam_mount-1.22-uninitialized-variable.patch
+# 2009-04-13: submitted to upstream https://sourceforge.net/support/tracker.php?aid=2715698
+Patch1:         0001-use-extra_opts-in-etc-mtab-unless-empty.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel, pam-devel, openssl-devel
@@ -55,6 +59,8 @@
 %setup -q
 %endif
 
+%patch0 -p1 -b .uninitialized-variable
+%patch1 -p1 -b .use-extra_opts
 
 %build
 %configure --with-slibdir=/%{_lib} --with-dtd
@@ -110,6 +116,12 @@
 
 
 %changelog
+* Mon Apr 13 2009 Till Maas <opensource at till.name> - 1.22-1
+- Update to new release
+- Support remount (Red Hat Bugzilla: #492347)
+- Show more correct mount options in /etc/mtab
+- backport fix against uninitialized value
+
 * Tue Mar 03 2009 Till Maas <opensource at till.name> - 1.20-1
 - Update to new release
 - Update libHX dependency


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	3 Mar 2009 17:39:26 -0000	1.24
+++ sources	13 Apr 2009 21:59:23 -0000	1.25
@@ -1,2 +1,2 @@
-006136e2d955be6b4feeda89fdea0d1a  pam_mount-1.20.tar.bz2
-1d063a0532c788fd3d72c08556e006a7  pam_mount-1.20.tar.bz2.asc
+afabec61b86d859cb73af438d1ec63bd  pam_mount-1.22.tar.bz2
+58a229effc324489ebe12203ce262254  pam_mount-1.22.tar.bz2.asc