Accepting request 150891 from Linux-PAM

- Suppress useless debug output on using pam_mount (forwarded request 150886 from wstephenson)

OBS-URL: https://build.opensuse.org/request/show/150891
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pam_mount?expand=0&rev=58

pam_mount-38a15cc3-ehd_logctl-debug.diff

@@ -0,0 +1,39 @@
+From 38a15cc36c7fe6714dd3010fde6ad808b3792ac0 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@medozas.de>
+Date: Mon, 26 Dec 2011 23:33:47 +0100
+Subject: [PATCH] log: fix "feature 1 already set to zero"
+Upstream: yes
+
+---
+ doc/changelog.txt |    2 ++
+ src/rdconf1.c     |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/doc/changelog.txt b/doc/changelog.txt
+index 9759f4f..ef009c9 100644
+--- a/doc/changelog.txt
++++ b/doc/changelog.txt
+@@ -3,6 +3,8 @@ For details, see the history as recorded in the git repository.
+ 
+ HEAD
+ ====
++Fixes:
++- fix "feature 1 already set to zero"
+ 
+ 
+ v2.13 (2011-12-15)
+diff --git a/src/rdconf1.c b/src/rdconf1.c
+index e8ccd2d..827d36a 100644
+--- a/src/rdconf1.c
++++ b/src/rdconf1.c
+@@ -340,6 +340,7 @@ void initconfig(struct config *config)
+ 	char options_require[] = "nosuid,nodev";
+ 
+ 	memset(config, 0, sizeof(*config));
++	ehd_logctl(EHD_LOGFT_DEBUG, EHD_LOG_SET);
+ 	config->debug      = true;
+ 	config->mkmntpoint = true;
+ 
+-- 
+1.7.4.1
+

pam_mount.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Feb  3 14:16:32 UTC 2013 - wstephenson@suse.com
+
+- Suppress useless debug output on using pam_mount
+
+-------------------------------------------------------------------
+Sun Dec  9 17:48:35 UTC 2012 - jengelh@inai.de
+
+- Avoid running fdupes on /etc
+- Depend on gpg-offline only for openSUSE >= 12.3
+- Do require ofl and fd0ssh now, as they are now separate
+  installables starting with 12.3
+
 -------------------------------------------------------------------
 Thu Nov 29 18:23:56 CET 2012 - sbrabec@suse.cz
 

pam_mount.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pam_mount
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -33,17 +33,20 @@ Source3:        mount.crypt
 Source5:        baselibs.conf
 Source6:        %{name}.keyring
 Patch1:         pam_mount-0.47-enable-logout-kill.dif
+Patch2:         pam_mount-38a15cc3-ehd_logctl-debug.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  fdupes
+%if 0%{?suse_version} >= 1230
 BuildRequires:  gpg-offline
+%endif
 BuildRequires:  libtool
+# LOOP64 support:
+BuildRequires:  linux-glibc-devel >= 2.6
+BuildRequires:  man
 BuildRequires:  pam-devel >= 0.99
 BuildRequires:  perl-XML-Parser
 BuildRequires:  perl-XML-Writer
-# LOOP64 support:
-BuildRequires:  fdupes
-BuildRequires:  linux-glibc-devel >= 2.6
-BuildRequires:  man
 BuildRequires:  pkgconfig >= 0.19
 BuildRequires:  xz
 BuildRequires:  pkgconfig(libHX) >= 3.12.1
@@ -58,6 +61,8 @@ Requires:       device-mapper >= 1.02.48
 # for mount(8) and mount.cifs:
 Requires:       util-linux
 Recommends:     cifs-mount
+Requires:       fd0ssh
+Requires:       ofl
 # for fd0ssh and ofl:
 Suggests:       hxtools >= 20090116
 
@@ -96,9 +101,12 @@ setup. It supports pam_mount style plain EHD2/OpenSSL images and LUKS
 and transparent use of the OS's crypto layer.
 
 %prep
+%if 0%{?gpg_verify:1}
 %gpg_verify %{S:9}
+%endif
 %setup -q
 %patch -P 1 -p1
+%patch -P 2 -p1
 
 %build
 %configure --disable-static --with-slibdir=/%_lib \
@@ -107,7 +115,7 @@ and transparent use of the OS's crypto layer.
 make %{?_smp_mflags}
 
 %install
-%make_install
+make install DESTDIR="%buildroot";
 # Remove static and libtool version
 rm -f "%buildroot/%_lib/security"/*.{a,la} "%buildroot/%_libdir"/*.la
 #install the docs
@@ -122,7 +130,7 @@ mkdir -p %buildroot%_sbindir/
 mv %buildroot/sbin/mount.crypt %buildroot%_sbindir/
 ln -s %_sbindir/mount.crypt %buildroot%_sbindir/umount.crypt
 install -m755 %SOURCE3 %buildroot/sbin/
-%fdupes %buildroot
+%fdupes %buildroot/%_prefix
 
 %post
 if [ -e etc/security/pam_mount.conf ]