[Pkg-coolkey-commits] r49 - in /coolkey/trunk/debian: changelog patches/coolkey-latest.patch

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Sun Mar 27 13:17:55 2011
New Revision: 49

URL: http://svn.debian.org/wsvn/pkg-coolkey/?sc=1&rev=49
Log:
debian/patches/coolkey-latest.patch: refresh

Modified:
    coolkey/trunk/debian/changelog
    coolkey/trunk/debian/patches/coolkey-latest.patch

Modified: coolkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/changelog?rev=49&op=diff
==============================================================================
--- coolkey/trunk/debian/changelog (original)
+++ coolkey/trunk/debian/changelog Sun Mar 27 13:17:55 2011
@@ -1,3 +1,9 @@
+coolkey (1.1.0-9) unstable; urgency=low
+
+  * debian/patches/coolkey-latest.patch: refresh
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Sun, 27 Mar 2011 15:17:21 +0200
+
 coolkey (1.1.0-8) unstable; urgency=low
 
   * Fix "FTBFS: cky_card.h:44: error: expected ')' before '*' token"

Modified: coolkey/trunk/debian/patches/coolkey-latest.patch
URL: http://svn.debian.org/wsvn/pkg-coolkey/coolkey/trunk/debian/patches/coolkey-latest.patch?rev=49&op=diff
==============================================================================
--- coolkey/trunk/debian/patches/coolkey-latest.patch (original)
+++ coolkey/trunk/debian/patches/coolkey-latest.patch Sun Mar 27 13:17:55 2011
@@ -405,10 +405,13 @@
      return ret;
  }
  
-@@ -1036,6 +1091,44 @@
- }
- 
- /*
+@@ -1033,6 +1088,44 @@
+     } while ((size > 0) && (ret == CKYSUCCESS));
+ 
+     return ret;
++}
++
++/*
 + * Write Object
 + * This makes multiple APDU calls to write the entire object.
 + *
@@ -444,12 +447,9 @@
 +    } while ((size > 0) && (ret == CKYSUCCESS));
 +
 +    return ret;
-+}
-+
-+/*
-  * List Object cluster
-  */
- static CKYStatus
+ }
+ 
+ /*
 --- a/src/libckyapplet/cky_applet.h
 +++ b/src/libckyapplet/cky_applet.h
 @@ -192,6 +192,14 @@
@@ -496,7 +496,7 @@
  CKYStatus CKYApplet_GetStatus(CKYCardConnection *conn, 
 --- a/src/libckyapplet/cky_card.c
 +++ b/src/libckyapplet/cky_card.c
-@@ -129,6 +129,7 @@
+@@ -128,6 +128,7 @@
      SCardGetStatusChangeFn SCardGetStatusChange;
      SCardCancelFn SCardCancel;
      SCARD_IO_REQUEST *SCARD_PCI_T0_;
@@ -504,7 +504,7 @@
  } SCard;
  
  #define GET_ADDRESS(library, scard, name) \
-@@ -195,6 +196,12 @@
+@@ -194,6 +195,12 @@
      if( status != CKYSUCCESS ) {
          goto fail;
      }
@@ -517,7 +517,7 @@
      return scard;
  
  fail:
-@@ -884,6 +891,7 @@
+@@ -883,6 +890,7 @@
      SCARDHANDLE      cardHandle;
      unsigned long    lastError;
      CKYBool           inTransaction;
@@ -525,7 +525,7 @@
  };
  
  static void
-@@ -894,6 +902,7 @@
+@@ -893,6 +901,7 @@
      conn->cardHandle = 0;
      conn->lastError = 0;
      conn->inTransaction = 0;
@@ -533,7 +533,7 @@
  }
  
  CKYCardConnection *
-@@ -934,14 +943,13 @@
+@@ -933,14 +942,13 @@
  {
      CKYStatus ret;
      unsigned long rv;
@@ -549,7 +549,7 @@
      if (rv != SCARD_S_SUCCESS) {
  	conn->lastError = rv;
  	return CKYSCARDERR;
-@@ -978,7 +986,7 @@
+@@ -977,7 +985,7 @@
      unsigned long protocol;
  
      rv = conn->scard->SCardReconnect(conn->cardHandle,
@@ -558,7 +558,7 @@
      if (rv != SCARD_S_SUCCESS) {
  	conn->lastError = rv;
  	return CKYSCARDERR;
-@@ -1039,10 +1047,17 @@
+@@ -1038,10 +1046,17 @@
  	return ret;
      }
  
@@ -605,10 +605,14 @@
  CKYStatus
  CKYAPDUFactory_CreateObject(CKYAPDU *apdu, unsigned long objectID, CKYSize size,
      unsigned short readACL, unsigned short writeACL, unsigned short deleteACL)
-@@ -419,6 +420,58 @@
- }
- 
- CKYStatus
+@@ -415,6 +416,58 @@
+ fail:
+     CKYBuffer_FreeData(&buf);
+     return ret;
++
++}
++
++CKYStatus
 +CKYAPDUFactory_WriteObject(CKYAPDU *apdu, unsigned long objectID,
 +                                    CKYOffset offset,CKYSize size,CKYBuffer *data)
 +{
@@ -657,13 +661,9 @@
 +fail:
 +    CKYBuffer_FreeData(&buf);
 +    return ret;
-+
-+}
-+
-+CKYStatus
- CKYAPDUFactory_ListObjects(CKYAPDU *apdu, CKYByte sequence)
- {
-     CKYAPDU_SetCLA(apdu, CKY_CLASS_COOLKEY);
+ 
+ }
+ 
 --- a/src/libckyapplet/cky_factory.h
 +++ b/src/libckyapplet/cky_factory.h
 @@ -190,7 +190,8 @@