rpms/pam_mount/FC-5 pam_mount-lsof-path.patch, NONE, 1.1 pam_mount.spec, 1.10, 1.11

[Michael J Knox (mjk)]

Author: mjk

Update of /cvs/extras/rpms/pam_mount/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13193/FC-5

Modified Files:
	pam_mount.spec 
Added Files:
	pam_mount-lsof-path.patch 
Log Message:
taking ownership of pam_mount. Add fix for BZ#188284


pam_mount-lsof-path.patch:

--- NEW FILE pam_mount-lsof-path.patch ---
--- pam_mount-0.13.0/config/pam_mount.conf	2006-03-19 22:59:57.000000000 +1200
+++ pam_mount-0.13.0/config/pam_mount.conf.mjk	2006-07-05 07:39:26.000000000 +1200
@@ -77,7 +77,7 @@
 # source in mount.c (it sends the password to the stdin file descriptor
 # of the child process -- look for STDIN_FILENO).
 #
-lsof /usr/bin/lsof %(MNTPT)
+lsof /usr/sbin/lsof %(MNTPT)
 fsck /sbin/fsck -p %(FSCKTARGET)
 losetup /sbin/losetup -p0 "%(before=\"-e\" CIPHER)" "%(before=\"-k\" KEYBITS)" %(FSCKLOOP) %(VOLUME)
 unlosetup /sbin/losetup -d %(FSCKLOOP)


Index: pam_mount.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/FC-5/pam_mount.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pam_mount.spec	2 Jan 2006 04:53:30 -0000	1.10
+++ pam_mount.spec	4 Jul 2006 20:24:59 -0000	1.11
@@ -1,14 +1,20 @@
-Summary: A PAM module that can mount volumes for a user session
-Name: pam_mount
-Version: 0.11.0
-Release: 1
-License: LGPL
-Group: System Environment/Base
-Source: http://prdownloads.sourceforge.net/pam-mount/%{name}-%{version}.tbz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://pam-mount.sourceforge.net/
-Requires: pam
-BuildRequires: glib2-devel pam-devel openssl-devel zlib-devel kernel-devel
+Name:           pam_mount
+Version:        0.13.0
+Release:        4%{?dist}
+Summary:        A PAM module that can mount volumes for a user session
+
+Group:          System Environment/Base
+License:        LGPL
+URL:            http://pam-mount.sourceforge.net/
+Source0:        http://prdownloads.sourceforge.net/pam-mount/%{name}-%{version}.tbz2
+
+Patch0:		%{name}-0.13.0-loop.patch
+Patch1:		%{name}-lsof-path.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  glib2-devel pam-devel openssl-devel zlib-devel
+Requires:       pam, lsof
 
 %description
 This module is aimed at environments with SMB (Samba or Windows NT) 
@@ -44,39 +50,41 @@
 partition (the cryptoswap can help you do this). Don't assume a 
 system is secure without carefully considering potential threats.
 
-
-
 %prep
+%setup -q
 
-
-%setup
-
+%patch0 -p1
+%patch1 -p1
 
 %build
-# See BZ 174190 for why this definition is required.
-export CFLAGS=-I/lib/modules/`uname -r`/build/include/
-%configure --libdir=/%{_lib}
+%configure--libdir=%{_lib}
+
 make %{?_smp_mflags}
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall libdir=/%{_lib}
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/security
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/macros
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc
-install --owner=root --group=root --mode=0644 config/pam_mount.conf ${RPM_BUILD_ROOT}/%{_sysconfdir}/security
-install --owner=root --group=root --mode=0644 config/pam_mount_macros.te ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/macros
-install --owner=root --group=root --mode=0644 config/pam_mount.fc ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc
-rm -f ${RPM_BUILD_ROOT}/%{_lib}/security/pam_mount.a
-rm -f ${RPM_BUILD_ROOT}/%{_lib}/security/pam_mount.la
+rm -rf %{buildroot}
+
+%makeinstall libdir=%{buildroot}/%{_lib}
+
+mkdir -p %{buildroot}/%{_sysconfdir}/security
+mkdir -p %{buildroot}/%{_sysconfdir}/selinux/strict/src/policy/macros
+mkdir -p %{buildroot}/%{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc
+install --mode=0644 config/pam_mount.conf %{buildroot}/%{_sysconfdir}/security
+install --mode=0644 config/pam_mount_macros.te %{buildroot}/%{_sysconfdir}/selinux/strict/src/policy/macros
+install --mode=0644 config/pam_mount.fc %{buildroot}/%{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc
+
+rm -f %{buildroot}/%{_lib}/security/pam_mount.a
+rm -f %{buildroot}/%{_lib}/security/pam_mount.la
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
-%defattr(-, root, root)
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README FAQ LICENSE.LGPL2
 /%{_lib}/security/pam_mount.so
 /%{_lib}/security/pam_mount_auth.so
 /%{_lib}/security/pam_mount_session.so
@@ -93,10 +101,22 @@
 %policy %{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc/pam_mount.fc
 
 
-%doc	AUTHORS COPYING ChangeLog INSTALL NEWS README FAQ
-
-
 %changelog
+* Wed Jul 05 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.13.0-4
+- added patch for bz #188284
+- spec tidy, removed unused buildreq on kernel-devel
+
+* Wed Apr 05 2006 W. Michael Petullo <mike[@]flyn.org> - 0.13.0-3
+   - Ship LICENSE.LGPL2.
+
+* Sun Apr 02 2006 W. Michael Petullo <mike[@]flyn.org> - 0.13.0-2
+   - Don't use --owner=root or --group=root on install.
+
+* Sun Apr 02 2006 W. Michael Petullo <mike[@]flyn.org> - 0.13.0-1
+   - Updated to pam_mount 0.13.0.
+   - Added patch to allow to build with local loop.h (see RH BZ 174190.)
+   - Ensure module installed in RPM_BUILD_ROOT when building package.
+
 * Sun Jan 01 2006 W. Michael Petullo <mike[@]flyn.org> - 0.11.0-1
    - Updated to pam_mount 0.11.0.
    - Mike Petullo is no longer the up-stream maintainer.
@@ -189,7 +209,3 @@
 
 * Fri Jan 23 2004 W. Michael Petullo <mike[@]flyn.org> - 0.9.12-0.fdr.1
    - Updated to pam_mount 0.9.12.
-
-
-
-