Accepting request 46900 from Linux-PAM

Copy from Linux-PAM/pam_mount based on submit request 46900 from user jengelh

OBS-URL: https://build.opensuse.org/request/show/46900
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pam_mount?expand=0&rev=40
This commit is contained in:
OBS User autobuild 2010-09-06 16:42:33 +00:00 committed by Git OBS Bridge
commit a2c3ec81fc
5 changed files with 33 additions and 16 deletions

View File

@ -1,10 +1,14 @@
Index: pam_mount-1.32/config/pam_mount.conf.xml
---
config/pam_mount.conf.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: pam_mount-2.5/config/pam_mount.conf.xml
===================================================================
--- pam_mount-1.32.orig/config/pam_mount.conf.xml
+++ pam_mount-1.32/config/pam_mount.conf.xml
@@ -33,7 +33,7 @@
--- pam_mount-2.5.orig/config/pam_mount.conf.xml
+++ pam_mount-2.5/config/pam_mount.conf.xml
@@ -32,7 +32,7 @@
-->
<mntoptions require="nosuid,nodev" />
<path>/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin</path>
-<logout wait="0" hup="0" term="0" kill="0" />
+<logout wait="2000" hup="0" term="1" kill="1" />

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d01c12084f1ee1736966b274b66516df77ad5ea4747dfbef26bb938bdfbf1e4d
size 329753

3
pam_mount-2.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7fa248a98ffa49dc6d8ceae1b45088571b6845d7831cae95fc75ccbcca3afb26
size 288644

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Fri Aug 27 15:12:24 UTC 2010 - jengelh@medozas.de
- remove unnecessary Requires(pre)
- do not needlessy run autoreconf
- update to version 2.5
* new mount.crypt program that now uses libcryptsetup rather than
the cryptsetup binary
* HXformat2 is now used. This invalidates old constructs like
%(before=\"-o\"...) which need to be replaced by new syntax
(see /usr/share/doc/packages/pam_mount/changelog.txt)
* fusermount now called with secondary groups initialized
* add support for keyfile passthru using -ofsk_cipher=none
-------------------------------------------------------------------
Tue Jun 1 13:42:01 CEST 2010 - mc@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package pam_mount (Version 1.34)
# spec file for package pam_mount (Version 2.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -23,17 +23,19 @@ BuildRequires: perl-XML-Parser perl-XML-Writer
BuildRequires: libtool pam-devel >= 0.99 pkg-config >= 0.19
BuildRequires: libxml2-devel >= 2.6 openssl-devel >= 0.9.7
BuildRequires: libHX-devel >= 3.4
BuildRequires: libcryptsetup-devel >= 1.1.2
Requires: device-mapper >= 1.02.48
BuildRequires: linux-kernel-headers >= 2.6
Summary: A PAM Module that can Mount Volumes for a User Session
Version: 1.34
Release: 2
Recommends: cryptsetup
Version: 2.5
Release: 1
Recommends: cifs-mount
Requires: util-linux
License: LGPLv2.1+
Prefix: /usr
Group: System/Libraries
Source: %{name}-%{version}.tar.bz2
Source: %{name}-%{version}.tar.xz
BuildRequires: xz
Source1: convert_pam_mount_conf.pl
Source2: convert_keyhash.pl
Source3: mount.crypt
@ -42,7 +44,6 @@ Source5: baselibs.conf
Patch1: pam_mount-0.47-enable-logout-kill.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://pam-mount.sourceforge.net/
Requires(pre): coreutils, perl-XML-Writer, perl-XML-Parser
Requires(post): coreutils, perl-XML-Writer, perl-XML-Parser
%description
@ -63,8 +64,6 @@ dm-crypt and LUKS.
%patch1 -p1
%build
%{suse_update_config -f}
autoreconf --verbose --force --install
%configure --with-slibdir=/%{_lib} %{?_with_selinux:--with-selinux}
%{__make} %{?_smp_mflags}