[pam_pkcs11/f15/master] pcsc-lite has removed the _A symbols from it's defines, use the default reader state definition.
Robert Relyea
rrelyea at fedoraproject.org
Fri Feb 11 00:46:21 UTC 2011
commit dec6cfdf92521ad35c05ea6a70962f1891cac6da
Author: Robert Relyea <rrelyea at redhat.com>
Date: Thu Feb 10 16:45:32 2011 -0800
pcsc-lite has removed the _A symbols from it's defines, use the default reader
state definition.
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 3497d04..e469fe3 100644
--- a/pam_pkcs11.spec
+++ b/pam_pkcs11.spec
@@ -6,7 +6,7 @@
Name: pam_pkcs11
Version: 0.6.2
-Release: 6%{?dist}
+Release: 7%{?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 Feb 10 2011 Bob Relyea <rrelyea at redhat.com> - 0.6.2-7
+- Update code to accept new pcsc-lite defines
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list