From f50e1231c248ead1b355472e5ad2154a92f469ae28ce5665ec575fba5d0ac359 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 26 Sep 2012 08:10:32 +0000
Subject: [PATCH] Accepting request 135869 from Linux-PAM

- Update to pam-config 0.83:
  - Fix stacking of pam_unix
  - Add new pam_unix options
- Update to pam-config 0.82:
  - Use pam_unix and pam_cracklib as default on fresh installations.

OBS-URL: https://build.opensuse.org/request/show/135869
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pam-config?expand=0&rev=57
---
 pam-config-0.81.tar.bz2       |  3 ---
 pam-config-0.83.tar.bz2       |  3 +++
 pam-config.changes            | 12 ++++++++++++
 pam-config.spec               |  8 ++------
 pam_config-0.81-pam_ssh.patch | 28 ----------------------------
 5 files changed, 17 insertions(+), 37 deletions(-)
 delete mode 100644 pam-config-0.81.tar.bz2
 create mode 100644 pam-config-0.83.tar.bz2
 delete mode 100644 pam_config-0.81-pam_ssh.patch

diff --git a/pam-config-0.81.tar.bz2 b/pam-config-0.81.tar.bz2
deleted file mode 100644
index de1231e..0000000
--- a/pam-config-0.81.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fef3efbd758ce564d938934894746553418277a4c7663ae6d5dd809bf55dd8e3
-size 317404
diff --git a/pam-config-0.83.tar.bz2 b/pam-config-0.83.tar.bz2
new file mode 100644
index 0000000..0decc3d
--- /dev/null
+++ b/pam-config-0.83.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4677f4f1cbfc36e7db5911c78bd0b01f50e777bde24c7a348526f74f29abe291
+size 317892
diff --git a/pam-config.changes b/pam-config.changes
index 959dbcf..91995f5 100644
--- a/pam-config.changes
+++ b/pam-config.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Sep 25 14:02:06 CEST 2012 - kukuk@suse.de
+
+- Update to pam-config 0.83:
+  - Fix stacking of pam_unix
+  - Add new pam_unix options
+
+-------------------------------------------------------------------
+Thu Sep 20 14:58:56 CEST 2012 - kukuk@suse.de
+
+- Use pam_unix and pam_cracklib as default on fresh installations. 
+
 -------------------------------------------------------------------
 Tue Aug 14 13:02:09 UTC 2012 - vcizek@suse.com
 
diff --git a/pam-config.spec b/pam-config.spec
index f17cd80..33defb3 100644
--- a/pam-config.spec
+++ b/pam-config.spec
@@ -20,13 +20,10 @@ Name:           pam-config
 Summary:        Modify common PAM configuration files
 License:        GPL-2.0
 Group:          System/Management
-Version:        0.81
+Version:        0.83
 Release:        0
-BuildRequires:  automake
 PreReq:         pam >= 0.99
-Requires:       pam-modules >= 10.2
 Source:         %{name}-%{version}.tar.bz2
-Patch:          pam_config-0.81-pam_ssh.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -40,7 +37,6 @@ add/adjust/remove other PAM modules and their options.
 
 %prep
 %setup -q
-%patch
 
 %build
 %configure
@@ -75,7 +71,7 @@ if [ $1 == 0 ]; then
     if [ -f $dir/$pamd.pam-config-backup -a -L $dir/$pamd ]; then
       rm -v $dir/$pamd && mv -v $dir/$pamd.pam-config-backup $dir/$pamd
     fi
-    # common-*-pc are %ghost, so we have to move them away...
+    # common-*-pc are ghost, so we have to move them away...
     if [ -f $dir/$pamd-pc ]; then
       mv -v $dir/$pamd-pc $dir/$pamd-pc.bak
     fi
diff --git a/pam_config-0.81-pam_ssh.patch b/pam_config-0.81-pam_ssh.patch
deleted file mode 100644
index a53d614..0000000
--- a/pam_config-0.81-pam_ssh.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: src/mod_pam_ssh.c
-===================================================================
---- src/mod_pam_ssh.c	2012-08-06 16:39:19.000000000 +0200
-+++ src/mod_pam_ssh.c	2012-08-14 14:52:14.649970973 +0200
-@@ -44,7 +44,7 @@ write_config_ssh (pam_module_t *this, en
-       break;
- 
-     case AUTH:
--      fprintf (fp, "auth\toptional\tpam_ssh.so\ttry_first_pass ");
-+      fprintf (fp, "auth\tsufficient\tpam_ssh.so\ttry_first_pass ");
-       break;
- 
-     case SESSION:
-Index: src/supported-modules.h
-===================================================================
---- src/supported-modules.h	2012-08-06 16:59:11.000000000 +0200
-+++ src/supported-modules.h	2012-08-14 14:55:27.022709610 +0200
-@@ -100,8 +100,8 @@ static pam_module_t *module_list_auth[]
-   &mod_pam_fprint,
-   &mod_pam_fprintd,
-   &mod_pam_thinkfinger,
--  &mod_pam_gnome_keyring,
--  &mod_pam_ssh,     /* optional modules MUST executed before sufficient modules which also need a password. */
-+  &mod_pam_gnome_keyring, /* optional modules MUST be executed before sufficient modules which also need a password. */
-+  &mod_pam_ssh,
-   &mod_pam_unix2,
-   &mod_pam_unix,
-   &mod_pam_ecryptfs,