rpms/pam_mount/devel pam_mount-2.4-cmtab_location.patch, NONE, 1.1 pam_mount-2.4-selinux-cryptmount.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 pam_mount.spec, 1.68, 1.69 sources, 1.31, 1.32

[Till Maas]

Author: till

Update of /cvs/pkgs/rpms/pam_mount/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12312

Modified Files:
	.cvsignore pam_mount.spec sources 
Added Files:
	pam_mount-2.4-cmtab_location.patch 
	pam_mount-2.4-selinux-cryptmount.patch 
Log Message:
* Fri Jul 02 2010 Till Maas <opensource at till.name> - 2.4-1
- Update to new release
- add patch to keep cmtab at /etc
- add patch to use mount -t crypt instead of mount.crypt for crypto volumes
- BR cryptsetup-luks-devel >= 1.1.2
- add man-db BR for Fedora >= 14 for pam_mount.8 to pam_mount.txt conversion


pam_mount-2.4-cmtab_location.patch:
 mtab.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pam_mount-2.4-cmtab_location.patch ---
diff -up pam_mount-2.4/src/mtab.c.mtab_location pam_mount-2.4/src/mtab.c
--- pam_mount-2.4/src/mtab.c.mtab_location	2010-06-26 21:43:29.409741097 +0200
+++ pam_mount-2.4/src/mtab.c	2010-06-26 21:44:06.717741150 +0200
@@ -39,7 +39,7 @@
 typedef int (*scompare_t)(const char *, const char *);
 
 /* crypto mtab */
-static const char pmt_cmtab_file[] = LOCALSTATEDIR "/cmtab";
+static const char pmt_cmtab_file[] = "/etc/cmtab";
 
 #if defined(__linux__)
 static const char pmt_smtab_file[] = "/etc/mtab";

pam_mount-2.4-selinux-cryptmount.patch:
 rdconf1.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pam_mount-2.4-selinux-cryptmount.patch ---
diff -up pam_mount-2.4/src/rdconf1.c.selinux-cryptmount pam_mount-2.4/src/rdconf1.c
diff -up pam_mount-2.4/src/rdconf1.c.selinux-cryptmount pam_mount-2.4/src/rdconf1.c
--- pam_mount-2.4/src/rdconf1.c.selinux-cryptmount	2010-06-26 14:08:43.000000000 +0200
+++ pam_mount-2.4/src/rdconf1.c	2010-06-30 23:32:34.950726618 +0200
@@ -58,7 +58,7 @@ struct callbackmap {
 
 struct pmt_command {
 	enum command_type type;
-	const char *fs, *def[9];
+	const char *fs, *def[11];
 	/*
 	 * You will need to enlarge @def whenever the compiler
 	 * (rightfully) complains.
@@ -1359,7 +1359,7 @@ static const struct pmt_command default_
 	{CMD_NFSMOUNT,    "nfs",   {"mount", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(SERVER):%(VOLUME)", "%(MNTPT)", NULL}},
 	{CMD_NFSMOUNT,    "nfs4"},
 	{CMD_LCLMOUNT,    NULL,    {"mount", "-p0", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(VOLUME)", "%(MNTPT)", NULL}},
-	{CMD_CRYPTMOUNT,  "crypt", {"mount.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_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.crypt", "%(MNTPT)", NULL}},
 	{CMD_UMOUNT,     NULL,     {"umount", "%(MNTPT)", NULL}},
 	{CMD_FSCK,       NULL,     {"fsck", "-p", "%(FSCKTARGET)", NULL}},


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	19 May 2010 16:11:48 -0000	1.30
+++ .cvsignore	2 Jul 2010 17:32:38 -0000	1.31
@@ -1,2 +1,2 @@
-pam_mount-2.3.tar.xz
-pam_mount-2.3.tar.xz.asc
+pam_mount-2.4.tar.xz
+pam_mount-2.4.tar.xz.asc


Index: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- pam_mount.spec	19 May 2010 16:11:48 -0000	1.68
+++ pam_mount.spec	2 Jul 2010 17:32:38 -0000	1.69
@@ -1,7 +1,7 @@
 %global packext xz
 
 Name:           pam_mount
-Version:        2.3
+Version:        2.4
 Release:        1%{?dist}
 Summary:        A PAM module that can mount volumes for a user session
 
@@ -13,17 +13,29 @@ License:        LGPLv2+ and (LGPLv2 or L
 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
+# keep cmtab at /etc/cmtab to not break compatibility with older releases and to support
+# /var being on a seperate partition
+# Not upstreamable.
+Patch0:         pam_mount-2.4-cmtab_location.patch
+# Use mount -t crypt instead of mount.crypt as cryptmount command to support selinux
+# Merged into pam_mount 2.4:
+# http://pam-mount.git.sourceforge.net/git/gitweb.cgi?p=pam-mount/pam-mount;a=commitdiff;h=458b7245f3efd2cfaafc73cd721a6e26eabfb428
+Patch1:         pam_mount-2.4-selinux-cryptmount.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel pam-devel openssl-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  cryptsetup-luks-devel
+BuildRequires:  cryptsetup-luks-devel >= 1.1.2
 BuildRequires:  libHX-devel >= 3.4
 %if %packext == lz
 BuildRequires:  lzip
 %endif
 Requires:       pam
 Requires:       libHX >= 3.4
+%if (0%{?fedora} >= 14)
+BuildRequires:  man-db
+%endif
+
 
 # Used in mtcrypt.c / mount.crypt
 # The Requires is used to detect potential breakage caused by readlink only
@@ -63,6 +75,9 @@ lzip -c -d %SOURCE0 | tar -xvvf - -C ..
 %setup -q
 %endif
 
+%patch0 -p1 -b .cmtab_location
+%patch1 -p1 -b .selinux-cryptmount
+
 
 %build
 %configure --with-slibdir=/%{_lib} --with-dtd
@@ -118,6 +133,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 02 2010 Till Maas <opensource at till.name> - 2.4-1
+- Update to new release
+- add patch to keep cmtab at /etc
+- add patch to use mount -t crypt instead of mount.crypt for crypto volumes
+- BR cryptsetup-luks-devel >= 1.1.2
+- add man-db BR for Fedora >= 14 for pam_mount.8 to pam_mount.txt conversion
+
 * Wed May 19 2010 Till Maas <opensource at till.name> - 2.3-1
 - Update to new release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	19 May 2010 16:11:48 -0000	1.31
+++ sources	2 Jul 2010 17:32:38 -0000	1.32
@@ -1,2 +1,2 @@
-5b7ba1427ff01d2ec54b5fecf33c80b8  pam_mount-2.3.tar.xz
-60491e1a6d891e545a2ba84ba34b20b0  pam_mount-2.3.tar.xz.asc
+e7788d69ff7bc7e6957ae3fbf894b06c  pam_mount-2.4.tar.xz
+609da5cbaa7aee8147d40a5df216f957  pam_mount-2.4.tar.xz.asc