diff --git a/pam_mount-38a15cc3-ehd_logctl-debug.diff b/pam_mount-38a15cc3-ehd_logctl-debug.diff new file mode 100644 index 0000000..e95884b --- /dev/null +++ b/pam_mount-38a15cc3-ehd_logctl-debug.diff @@ -0,0 +1,39 @@ +From 38a15cc36c7fe6714dd3010fde6ad808b3792ac0 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +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 + diff --git a/pam_mount.changes b/pam_mount.changes index 2d82180..f45dbb6 100644 --- a/pam_mount.changes +++ b/pam_mount.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/pam_mount.spec b/pam_mount.spec index 6a2187c..50b2b13 100644 --- a/pam_mount.spec +++ b/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,6 +33,7 @@ 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 @@ -105,6 +106,7 @@ and transparent use of the OS's crypto layer. %endif %setup -q %patch -P 1 -p1 +%patch -P 2 -p1 %build %configure --disable-static --with-slibdir=/%_lib \