[Python-modules-commits] r16232 - in packages/pyscard/trunk/debian (3 files)

[rousseau at users.alioth.debian.org]

    Date: Friday, March 25, 2011 @ 20:01:32
  Author: rousseau
Revision: 16232

Fix "Cannot load Python module: SCardCancelTransaction is an
undefined symbol" patch from upstream revision 516 (Closes: #618841)

Added:
  packages/pyscard/trunk/debian/patches/SCardCancelTransaction.patch
Modified:
  packages/pyscard/trunk/debian/changelog
  packages/pyscard/trunk/debian/patches/series

Modified: packages/pyscard/trunk/debian/changelog
===================================================================
--- packages/pyscard/trunk/debian/changelog	2011-03-25 19:18:32 UTC (rev 16231)
+++ packages/pyscard/trunk/debian/changelog	2011-03-25 20:01:32 UTC (rev 16232)
@@ -1,3 +1,10 @@
+pyscard (1.6.12-3) unstable; urgency=low
+
+  * Fix "Cannot load Python module: SCardCancelTransaction is an
+    undefined symbol" patch from upstream revision 516 (Closes: #618841)
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Fri, 25 Mar 2011 18:35:15 +0100
+
 pyscard (1.6.12-2) unstable; urgency=low
 
   * upload to unstable

Added: packages/pyscard/trunk/debian/patches/SCardCancelTransaction.patch
===================================================================
--- packages/pyscard/trunk/debian/patches/SCardCancelTransaction.patch	                        (rev 0)
+++ packages/pyscard/trunk/debian/patches/SCardCancelTransaction.patch	2011-03-25 20:01:32 UTC (rev 16232)
@@ -0,0 +1,61 @@
+Description: Remove support for SCardCancelTransaction(). It is not used
+on Windows and removed oin pcsc-lite >= 1.6.5
+
+This function was not exported at the Python interface. So no regression
+planned.  This change will just avoid a warning message on the console:
+Failed to load symbol for: SCardCancelTransaction,
+/usr/lib/libpcsclite.so.1: undefined symbol: SCardCancelTransaction!
+Origin: upstream, http://pyscard.svn.sourceforge.net/viewvc/pyscard?view=revision&revision=516
+Bug-Debian: http://bugs.debian.org/618841
+--- a/smartcard/scard/winscarddll.c
++++ b/smartcard/scard/winscarddll.c
+@@ -463,15 +463,6 @@
+ }
+ 
+ static WINSCARDAPI SCARDRETCODE
+-WINAPI _defaultSCARDCANCELTRANSACTION(
+-    IN      SCARDHANDLE hCard)
+-{
+-	(void)hCard;
+-
+-    return SCARD_E_NO_SERVICE;
+-}
+-
+-static WINSCARDAPI SCARDRETCODE
+ WINAPI _defaultSCARDCONNECTA(
+     IN      SCARDCONTEXT hContext,
+     IN      LPCTSTR szReader,
+@@ -651,7 +642,6 @@
+ 
+ SCARDBEGINTRANSACTION           mySCardBeginTransaction             = _defaultSCARDBEGINTRANSACTION;
+ SCARDCANCEL                     mySCardCancel                       = _defaultSCARDCANCEL;
+-SCARDCANCELTRANSACTION          mySCardCancelTransaction            = _defaultSCARDCANCELTRANSACTION;
+ SCARDCONNECTA                   mySCardConnectA                     = _defaultSCARDCONNECTA;
+ SCARDCONTROL                    mySCardControl                      = _defaultSCARDCONTROL;
+ SCARDDISCONNECT                 mySCardDisconnect                   = _defaultSCARDDISCONNECT;
+@@ -695,7 +685,6 @@
+                 GETPROCADDRESS( SCARDACCESSSTARTEDEVENT         , SCardAccessStartedEvent );
+                 GETPROCADDRESS( SCARDBEGINTRANSACTION           , SCardBeginTransaction );
+                 GETPROCADDRESS( SCARDCANCEL                     , SCardCancel );
+-                GETPROCADDRESS( SCARDCANCELTRANSACTION          , SCardCancelTransaction );
+                 GETPROCADDRESS( SCARDCONNECTA                   , SCardConnectA );
+                 GETPROCADDRESS( SCARDCONTROL                    , SCardControl );
+                 GETPROCADDRESS( SCARDDISCONNECT                 , SCardDisconnect );
+@@ -769,7 +758,6 @@
+                 lRetCode=SCARD_S_SUCCESS;
+                 GETPROCADDRESS( SCARDBEGINTRANSACTION  , SCardBeginTransaction  , SCardBeginTransaction  );
+                 GETPROCADDRESS( SCARDCANCEL            , SCardCancel            , SCardCancel );
+-                GETPROCADDRESS( SCARDCANCELTRANSACTION , SCardCancelTransaction , SCardCancelTransaction );
+                 GETPROCADDRESS( SCARDCONNECTA          , SCardConnectA          , SCardConnect           );
+                 GETPROCADDRESS( SCARDDISCONNECT        , SCardDisconnect        , SCardDisconnect        );
+                 GETPROCADDRESS( SCARDENDTRANSACTION    , SCardEndTransaction    , SCardEndTransaction    );
+--- a/smartcard/scard/winscarddll.h
++++ b/smartcard/scard/winscarddll.h
+@@ -348,7 +348,6 @@
+ 
+ extern SCARDBEGINTRANSACTION           mySCardBeginTransaction;
+ extern SCARDCANCEL                     mySCardCancel;
+-extern SCARDCANCELTRANSACTION          mySCardCancelTransaction;
+ extern SCARDCONNECTA                   mySCardConnectA;
+ extern SCARDCONTROL                    mySCardControl;
+ extern SCARDDISCONNECT                 mySCardDisconnect;

Modified: packages/pyscard/trunk/debian/patches/series
===================================================================
--- packages/pyscard/trunk/debian/patches/series	2011-03-25 19:18:32 UTC (rev 16231)
+++ packages/pyscard/trunk/debian/patches/series	2011-03-25 20:01:32 UTC (rev 16232)
@@ -0,0 +1 @@
+SCardCancelTransaction.patch