This commit is contained in:
committed by
Git OBS Bridge
parent
a4c38fd6f6
commit
58d31cd2ab
@@ -2,7 +2,7 @@ Index: src/private.h
|
||||
===================================================================
|
||||
--- src/private.h.orig
|
||||
+++ src/private.h
|
||||
@@ -4,7 +4,7 @@
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <limits.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
|
@@ -2,7 +2,7 @@ Index: scripts/umount.crypt
|
||||
===================================================================
|
||||
--- scripts/umount.crypt.orig
|
||||
+++ scripts/umount.crypt
|
||||
@@ -58,6 +58,7 @@ fi;
|
||||
@@ -46,6 +46,7 @@ fi;
|
||||
# ask cryptsetup about the underlying device
|
||||
#
|
||||
REALDEVICE=`cryptsetup status "$DMDEVICE" | sed -n '/device/s/[ ]*device:[ ]*//p'`;
|
||||
@@ -10,7 +10,7 @@ Index: scripts/umount.crypt
|
||||
|
||||
for ((x = 5; x >= 0; --x)); do
|
||||
fuser -m "$1" || break;
|
||||
@@ -65,6 +66,15 @@ for ((x = 5; x >= 0; --x)); do
|
||||
@@ -53,6 +54,15 @@ for ((x = 5; x >= 0; --x)); do
|
||||
sleep 1;
|
||||
done;
|
||||
|
||||
@@ -26,7 +26,7 @@ Index: scripts/umount.crypt
|
||||
umount "$1";
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "${0##*/}: error unmounting $1" >&2
|
||||
@@ -85,3 +95,12 @@ if echo "$REALDEVICE" | grep ^/dev/loop
|
||||
@@ -73,3 +83,12 @@ if echo "$REALDEVICE" | grep ^/dev/loop
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
@@ -1,18 +0,0 @@
|
||||
Index: pam_mount-0.35/configure.ac
|
||||
===================================================================
|
||||
--- pam_mount-0.35.orig/configure.ac
|
||||
+++ pam_mount-0.35/configure.ac
|
||||
@@ -46,8 +46,11 @@ AM_CONDITIONAL(SELINUX, $with_selinux)
|
||||
|
||||
m4_sinclude(m4lib/gcc4_visibility.m4)
|
||||
# RH 8.0's OpenSSL does not have?
|
||||
-AC_CHECK_LIB(crypto, EVP_DecryptInit_ex, [pmt_LIBS="$pmt_LIBS -lcrypto"])
|
||||
-AC_CHECK_LIB(ssl, SSL_load_error_strings, [pmt_LIBS="$pmt_LIBS -lssl"])
|
||||
+AC_CHECK_LIB(crypto, EVP_DecryptInit_ex)
|
||||
+AC_CHECK_LIB(ssl, SSL_load_error_strings)
|
||||
+pmt_LIBS="$LIBS";
|
||||
+LIBS="";
|
||||
+AC_SUBST(pmt_LIBS)
|
||||
|
||||
regular_CFLAGS="-D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 \
|
||||
-D_FILE_OFFSET_BITS=64 \
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:636d9a8f7a280882a3c4a409478a4c92dce1bdd7ea4faa0c2fb3f736dd22eeae
|
||||
size 305939
|
3
pam_mount-0.41.tar.bz2
Normal file
3
pam_mount-0.41.tar.bz2
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8eaab032c12a0b36b6db580689e85d836fb14d07c9703a752835621f493c3451
|
||||
size 307583
|
@@ -1,3 +1,30 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 23 13:24:01 CEST 2008 - mc@suse.de
|
||||
|
||||
- version 0.41
|
||||
- add missing pgrp/sgrp attribute handling for simple user control
|
||||
- mount.crypt: handle arbitrary argument order
|
||||
- correct extended sgrp handling
|
||||
- manpages: add missing description for <fsck>, and reorder <path>
|
||||
- the documentation in pam_mount.conf.xml has been reworked and
|
||||
split off into pam_mount.conf(5).
|
||||
- extensive user selection for <volume> (revised)
|
||||
- case-insensitive matching for user, pgrp, sgrp
|
||||
- fixed segfault when more than one volume was defined
|
||||
- extended user selection for <volume>
|
||||
- fix an unwanted inversion for handling <options allow=" (nonempty) ">
|
||||
- store per-volume option list in ordered form --
|
||||
essentially fixes the problem of "user" (implies noeexec)
|
||||
overriding "exec"
|
||||
- fix null pointer deref (from new UID/GID range support)
|
||||
- mount.crypt uses normal sleep from coreutils again
|
||||
- truecrypt 5.x is not supported because the truecrypt CLI component
|
||||
that pam_mount requires was removed
|
||||
- <volume> tag in pam_mount.conf.xml supports UID and GID ranges now
|
||||
- fix HAVE_LIBCRYPTO regression;
|
||||
crypto was always disabled even if openssl present
|
||||
- remove pam_mount-0.35-fix-configure.dif (is upstream now)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 22 16:44:52 CEST 2008 - mc@suse.de
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package pam_mount (Version 0.35)
|
||||
# spec file for package pam_mount (Version 0.41)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
|
||||
Name: pam_mount
|
||||
BuildRequires: libHX10-devel libxml2-devel openssl-devel pam-devel perl-XML-Writer pkg-config
|
||||
BuildRequires: libHX-devel libxml2-devel openssl-devel pam-devel perl-XML-Writer pkg-config
|
||||
BuildRequires: linux-kernel-headers
|
||||
Summary: A PAM Module that can Mount Volumes for a User Session
|
||||
Version: 0.35
|
||||
Release: 5
|
||||
Version: 0.41
|
||||
Release: 1
|
||||
# psmisc: /bin/fuser
|
||||
Recommends: cifs-mount psmisc
|
||||
Recommends: cryptsetup
|
||||
@@ -27,7 +27,6 @@ Group: System/Libraries
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Patch1: pam_mount-0.18-umount-home-dir.dif
|
||||
Patch2: pam_mount-0.18-bump-max-par.diff
|
||||
Patch3: pam_mount-0.35-fix-configure.dif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Url: http://pam-mount.sourceforge.net/
|
||||
PreReq: coreutils, perl-XML-Writer
|
||||
@@ -65,7 +64,6 @@ include it and send me patches.
|
||||
%setup -q
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
%{suse_update_config -f}
|
||||
@@ -113,6 +111,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_sbindir}/pmvarrun
|
||||
%config(noreplace) %{_sysconfdir}/security/pam_mount.conf.xml
|
||||
%doc %{_mandir}/man1/mkehd.1.gz
|
||||
%doc %{_mandir}/man1/pmt-fd0ssh.1.gz
|
||||
%doc %{_mandir}/man5/pam_mount.conf.5.gz
|
||||
%doc %{_mandir}/man8/autoehd.8.gz
|
||||
%doc %{_mandir}/man8/mount.crypt.8.gz
|
||||
%doc %{_mandir}/man8/pam_mount.8.gz
|
||||
@@ -121,6 +121,30 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%doc %{_mandir}/man8/umount.crypt.8.gz
|
||||
|
||||
%changelog
|
||||
* Mon Jun 23 2008 mc@suse.de
|
||||
- version 0.41
|
||||
- add missing pgrp/sgrp attribute handling for simple user control
|
||||
- mount.crypt: handle arbitrary argument order
|
||||
- correct extended sgrp handling
|
||||
- manpages: add missing description for <fsck>, and reorder <path>
|
||||
- the documentation in pam_mount.conf.xml has been reworked and
|
||||
split off into pam_mount.conf(5).
|
||||
- extensive user selection for <volume> (revised)
|
||||
- case-insensitive matching for user, pgrp, sgrp
|
||||
- fixed segfault when more than one volume was defined
|
||||
- extended user selection for <volume>
|
||||
- fix an unwanted inversion for handling <options allow=" (nonempty) ">
|
||||
- store per-volume option list in ordered form --
|
||||
essentially fixes the problem of "user" (implies noeexec)
|
||||
overriding "exec"
|
||||
- fix null pointer deref (from new UID/GID range support)
|
||||
- mount.crypt uses normal sleep from coreutils again
|
||||
- truecrypt 5.x is not supported because the truecrypt CLI component
|
||||
that pam_mount requires was removed
|
||||
- <volume> tag in pam_mount.conf.xml supports UID and GID ranges now
|
||||
- fix HAVE_LIBCRYPTO regression;
|
||||
crypto was always disabled even if openssl present
|
||||
- remove pam_mount-0.35-fix-configure.dif (is upstream now)
|
||||
* Tue Apr 22 2008 mc@suse.de
|
||||
- use upstream fix for bnc#381292
|
||||
* Fri Apr 18 2008 mc@suse.de
|
||||
|
Reference in New Issue
Block a user