rpms/pam_mount/F-13 pam_mount-2.4-cmtab_location.patch, NONE, 1.1 pam_mount-2.4-man-db.patch, NONE, 1.1 pam_mount-2.4-selinux-cryptmount.patch, NONE, 1.1 pam_mount.spec, 1.64, 1.65 sources, 1.29, 1.30
Till Maas
till at fedoraproject.org
Fri Jul 2 19:18:22 UTC 2010
Author: till
Update of /cvs/pkgs/rpms/pam_mount/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25848
Modified Files:
pam_mount.spec sources
Added Files:
pam_mount-2.4-cmtab_location.patch pam_mount-2.4-man-db.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
- add Patch to remove man-db BR for Fedora < 14
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-man-db.patch:
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE pam_mount-2.4-man-db.patch ---
diff -up pam_mount-2.4/doc/Makefile.in.man-db pam_mount-2.4/doc/Makefile.in
--- pam_mount-2.4/doc/Makefile.in.man-db 2010-07-02 19:56:21.143982254 +0200
+++ pam_mount-2.4/doc/Makefile.in 2010-07-02 19:57:52.140985730 +0200
@@ -551,7 +551,7 @@ pam_mount.conf.5: pam_mount.conf.5.in ${
${AM_V_GEN}${replcmd} ${srcdir}/pam_mount.conf.5.in >pam_mount.conf.5;
pam_mount.txt: pam_mount.8
- ${AM_V_GEN}man -l pam_mount.8 | perl -pe 's/.\cH//g' >pam_mount.txt;
+ ${AM_V_GEN}man pam_mount.8 | col -b | perl -pe 's/.\cH//g' >pam_mount.txt;
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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: pam_mount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/F-13/pam_mount.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- pam_mount.spec 16 May 2010 17:55:07 -0000 1.64
+++ pam_mount.spec 2 Jul 2010 19:18:22 -0000 1.65
@@ -1,7 +1,7 @@
%global packext xz
Name: pam_mount
-Version: 2.2
+Version: 2.4
Release: 1%{?dist}
Summary: A PAM module that can mount volumes for a user session
@@ -13,17 +13,35 @@ 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
+%else
+# used for Patch100 / col -b
+BuildRequires: util-linux-ng
+%endif
+# use man ... | col -b instead of man -l ..., because man -l is only supported my man -db
+# Not suitable for upstream
+Patch100: pam_mount-2.4-man-db.patch
+
# Used in mtcrypt.c / mount.crypt
# The Requires is used to detect potential breakage caused by readlink only
@@ -63,6 +81,12 @@ lzip -c -d %SOURCE0 | tar -xvvf - -C ..
%setup -q
%endif
+%patch0 -p1 -b .cmtab_location
+%patch1 -p1 -b .selinux-cryptmount
+%if ! (0%{?fedora} >= 14)
+%patch100 -p1 -b .man-db
+%endif
+
%build
%configure --with-slibdir=/%{_lib} --with-dtd
@@ -118,6 +142,17 @@ 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
+- add Patch to remove man-db BR for Fedora < 14
+
+* Wed May 19 2010 Till Maas <opensource at till.name> - 2.3-1
+- Update to new release
+
* Sun May 16 2010 Till Maas <opensource at till.name> - 2.2-1
- Update to new release
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pam_mount/F-13/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources 16 May 2010 17:55:07 -0000 1.29
+++ sources 2 Jul 2010 19:18:22 -0000 1.30
@@ -1,2 +1,2 @@
-29bf53be742b158e757f99d3201988e2 pam_mount-2.2.tar.xz
-f80eee6ce8f435a787f2688efdcd4f9f pam_mount-2.2.tar.xz.asc
+e7788d69ff7bc7e6957ae3fbf894b06c pam_mount-2.4.tar.xz
+609da5cbaa7aee8147d40a5df216f957 pam_mount-2.4.tar.xz.asc
More information about the scm-commits
mailing list