From 001a6fdbc2b29579e16ee1af69105d7f3eca1d7ae2db9e11808d03a0b2ef6887 Mon Sep 17 00:00:00 2001
From: Michael Calmer <mc@suse.com>
Date: Mon, 11 Jan 2010 10:14:19 +0000
Subject: [PATCH] Accepting request 28412 from home:jengelh:branches:Linux-PAM

Copy from home:jengelh:branches:Linux-PAM/pam_mount via accept of submit request 28412 revision 2.
Request was accepted with message:

OBS-URL: https://build.opensuse.org/request/show/28412
OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=8
---
 pam_mount-1.32.tar.bz2 |  3 ---
 pam_mount-1.33.tar.bz2 |  3 +++
 pam_mount.changes      | 13 +++++++++++++
 pam_mount.spec         | 17 +++++++++--------
 4 files changed, 25 insertions(+), 11 deletions(-)
 delete mode 100644 pam_mount-1.32.tar.bz2
 create mode 100644 pam_mount-1.33.tar.bz2

diff --git a/pam_mount-1.32.tar.bz2 b/pam_mount-1.32.tar.bz2
deleted file mode 100644
index bff59e3..0000000
--- a/pam_mount-1.32.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76786345ea182a3ac53808c71340e36d999ab2ed318ca24a70af2eb1d447437c
-size 330255
diff --git a/pam_mount-1.33.tar.bz2 b/pam_mount-1.33.tar.bz2
new file mode 100644
index 0000000..3ecfb25
--- /dev/null
+++ b/pam_mount-1.33.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd408ff25c861940f8b3a9bfa9cbdae3ce4419320855fc83ddad73f74372b288
+size 329619
diff --git a/pam_mount.changes b/pam_mount.changes
index feabc73..6be2c23 100644
--- a/pam_mount.changes
+++ b/pam_mount.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Jan 10 01:52:56 CET 2010 - jengelh@medozas.de
+
+- update to version 1.33
+  * avoid multi-free of auth token when pam_mount is rerun in a
+    PAM stack
+  * avoid NULL dereference when there is an empty line in mtab
+- adjust BuildRequires as upstream really requires
+- package baselibs.conf
+- convert PreReq to Requires(pre,post)
+- remove CFLAGS="$RPM_OPT_FLAGS", it is implicit
+- use _smp_mflags
+
 -------------------------------------------------------------------
 Fri Dec 18 13:14:17 CET 2009 - mc@suse.de
 
diff --git a/pam_mount.spec b/pam_mount.spec
index 2e7ae3e..34411ab 100644
--- a/pam_mount.spec
+++ b/pam_mount.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package pam_mount (Version 1.32)
+# spec file for package pam_mount (Version 1.33)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,12 +20,12 @@
 
 Name:           pam_mount
 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.8
+BuildRequires:  libtool pam-devel >= 0.99 pkg-config >= 0.23
+BuildRequires:  libxml2-devel >= 2.6 openssl-devel >= 0.9.7
 BuildRequires:  libHX-devel >= 3.0.1
 BuildRequires:  linux-kernel-headers >= 2.6
 Summary:        A PAM Module that can Mount Volumes for a User Session
-Version:        1.32
+Version:        1.33
 Release:        1
 # psmisc: /bin/fuser
 Recommends:     cryptsetup
@@ -39,10 +39,12 @@ Source1:        convert_pam_mount_conf.pl
 Source2:        convert_keyhash.pl
 Source3:        mount.crypt
 Source4:        mount.encfs13
+Source5:	baselibs.conf
 Patch1:         pam_mount-0.47-enable-logout-kill.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://pam-mount.sourceforge.net/
-PreReq:         coreutils, perl-XML-Writer, perl-XML-Parser
+Requires(pre):	coreutils, perl-XML-Writer, perl-XML-Parser
+Requires(post):	coreutils, perl-XML-Writer, perl-XML-Parser
 
 %description
 This module is aimed at environments with central file servers that a
@@ -64,9 +66,8 @@ dm-crypt and LUKS.
 %build
 %{suse_update_config -f}
 autoreconf --verbose --force --install
-CFLAGS="$RPM_OPT_FLAGS " 
-%configure --disable-static --with-slibdir=/%{_lib} %{?_with_selinux:--with-selinux}
-%{__make} %{?jobs:-j%jobs}
+%configure --with-slibdir=/%{_lib} %{?_with_selinux:--with-selinux}
+%{__make} %{?_smp_mflags}
 
 %install
 make install DESTDIR=${RPM_BUILD_ROOT}