[pam_pkcs11/f14/master] pcsc-lite has removed a redundant typedef SCARD_READERSTATE_A which was being used by a tool in this

[Robert Relyea]

commit 907282168cd68206153f55f898cb8540a162357e
Author: Robert Relyea <rrelyea at redhat.com>
Date:   Thu Sep 9 10:31:33 2010 -0700

    pcsc-lite has removed a redundant typedef SCARD_READERSTATE_A which was being
    used by a tool in this package. Revert to the preferred  version of this
    typedef, SCARD_READERSTATE.

 pam_pkcs11-0.6.2-pcsc-lite.patch |   12 ++++++++++++
 pam_pkcs11.spec                  |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/pam_pkcs11-0.6.2-pcsc-lite.patch b/pam_pkcs11-0.6.2-pcsc-lite.patch
new file mode 100644
index 0000000..990c6c2
--- /dev/null
+++ b/pam_pkcs11-0.6.2-pcsc-lite.patch
@@ -0,0 +1,12 @@
+diff -up ./src/tools/card_eventmgr.c.pcsc-lite ./src/tools/card_eventmgr.c
+--- ./src/tools/card_eventmgr.c.pcsc-lite	2009-09-02 05:32:55.000000000 -0700
++++ ./src/tools/card_eventmgr.c	2010-09-09 09:43:29.178974000 -0700
+@@ -311,7 +311,7 @@ static void signal_trap(int sig)
+ int main(int argc, char *argv[]) {
+     int current_reader;
+     LONG rv;
+-    SCARD_READERSTATE_A *rgReaderStates_t = NULL;
++    SCARD_READERSTATE *rgReaderStates_t = NULL;
+     DWORD dwReaders, dwReadersOld;
+     LPSTR mszReaders = NULL;
+     char *ptr, **readers = NULL;
diff --git a/pam_pkcs11.spec b/pam_pkcs11.spec
index d6aa6d1..ffe54d8 100644
--- a/pam_pkcs11.spec
+++ b/pam_pkcs11.spec
@@ -6,7 +6,7 @@
 
 Name:           pam_pkcs11
 Version:        0.6.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        PKCS #11/NSS PAM login module
 
 Group:          System Environment/Base
@@ -16,6 +16,7 @@ Source0: 	http://www.opensc-project.org/files/pam_pkcs11/%{name}-%{version}.tar.
 Source1:	rh_pam_pkcs11.conf
 Source2:	rh_pkcs11_eventmgr.conf
 patch1:		pam_pkcs11-0.6.2-login_required.patch
+patch2:		pam_pkcs11-0.6.2-pcsc-lite.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pam-devel
@@ -47,6 +48,7 @@ Additional included pam_pkcs11 related tools
 %prep
 %setup -q -n pam_pkcs11-%{version}
 %patch1 -p1 -b .login-required
+%patch2 -p1 -b .pcsc-lite
 
 %build
 
@@ -133,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/card_eventmgr.1.gz
 
 %changelog
+* Thu Sep 9 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-6
+- pcsc lite removed the redudant SCARD_READSTATE_A structure.
+
 * Mon May 2 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-5
 - Sigh, ocsp should be off by default