dev-util/nfcutils: adjust patch for new version

2 files changed, 32 insertions, 16 deletions

diff --git a/dev-util/nfcutils/Manifest b/dev-util/nfcutils/Manifest
index 2a6ab74..4359721 100644
--- a/dev-util/nfcutils/Manifest
+++ b/dev-util/nfcutils/Manifest
@@ -1,4 +1,4 @@
-AUX nfcutils-fix-segfault.patch 1787 RMD160 e46b4bed7d89eeeda9cf9d196fb19dc5c56ee6cf SHA1 7cd85f1ecbf03c9388715cfd039192010904ef68 SHA256 0ca9114197858f35fdcdb898a3f89b810f835e0fc182f09d4e0c5fe962eb9e7e
-DIST nfcutils-0.3.0.tar.gz 107469 RMD160 c817737e776a92342603234e5347d45f07b74b52 SHA1 7a9371b3df8daf3f43bad8f75810dc052d7c2c83 SHA256 14aa1bce319fa37e0179725a118eea78f28ef19763b8f70ae7a24fa1569c06bc
-EBUILD nfcutils-0.3.0.ebuild 530 RMD160 97d8ce375bd4d2cd9b07485a6935e69c4cd1f6f4 SHA1 ccb0fd7e4a20dab385a27d1191c63c03f283fd77 SHA256 21d83b19a4924c780827d796ecb6f076598308f4c2a0d59fee4431c7ad7c5cb1
-EBUILD nfcutils-9999.ebuild 686 RMD160 1ca2ee8bdc7ba448033f1dd1e0e4a2b404f41e34 SHA1 ff605f22ba0f4001475615be61f615fe8b0c2a6c SHA256 923996e808f6ce7b80301dc2e8a596edab95926ec90a8a502b71bae2e291b5f6
+AUX nfcutils-fix-segfault.patch 2151 SHA256 eb2196f58d2adc9faf386970175fe6f38c5779e0bca1973d75f1f7a53513264e SHA512 a0cdccd6781f1f9375001d025387feed70af3a2698d169fa47a62814b031653829f24f97d7195ded161e32bc7e057bdf720ad4754e3e1e39343f5b6224c2174f WHIRLPOOL 6d41b9038441530a0ee4c6cdfea04ab75497f6f059146e45776a3303bf20c28216cc7b5f0d13ae2a261b6592adaed15f60f1f143881c1ec3e87bfc03aa57749f
+DIST nfcutils-0.3.0.tar.gz 107469 SHA256 14aa1bce319fa37e0179725a118eea78f28ef19763b8f70ae7a24fa1569c06bc SHA512 7d133a59cf26b1b60ca01116d104f6efa646f01835f941fbcf2bba99a4f55e5f0a3fb524e331b7dd9ac19af60804a9808b1c5547631bbf3c272b9a7e642fdfe4 WHIRLPOOL 0b8f35e7140186e47d8d74a47d8553f53ee2241bd8ed6a81042f0a056b402c58c1dd5f70d80c110910b3021c04290cff05643fe41cb74d0ccc86cc5f093bd13f
+EBUILD nfcutils-0.3.0.ebuild 530 SHA256 21d83b19a4924c780827d796ecb6f076598308f4c2a0d59fee4431c7ad7c5cb1 SHA512 0ef197e27cf45a448b8f237f881d1410c71047526a75883badb6bcba205173e67291e00c866e9299d4ecb73a8c74f303ffb8cd6adc7d92684ad53fea29dca02c WHIRLPOOL 551d088dc37a508be03d7ff417e024854d903988e433bae62850c97038acb7bbb65663e3bda1c0eefa532e3449d753f811fc0d31701d10bec6539b04fd02b33a
+EBUILD nfcutils-9999.ebuild 686 SHA256 923996e808f6ce7b80301dc2e8a596edab95926ec90a8a502b71bae2e291b5f6 SHA512 78c47042ff00a082b0a162b79b34da7552bbe173b20dd0e53219c01db579b27ebd9ae2eaf4f632b48f7a24616e6e9825e8fcec488408fcd46bc40c7f7c5cb9e9 WHIRLPOOL ff940a20478e4cdd0def3671561001775913ef00b127198cf96aa86658ebd51068a5fea431b276a2a9d5af342da063b46cae97445fd77ba8781570ee912298ec
diff --git a/dev-util/nfcutils/files/nfcutils-fix-segfault.patch b/dev-util/nfcutils/files/nfcutils-fix-segfault.patch
index 91e381c..cd1c675 100644
--- a/dev-util/nfcutils/files/nfcutils-fix-segfault.patch
+++ b/dev-util/nfcutils/files/nfcutils-fix-segfault.patch
@@ -1,30 +1,46 @@
 --- src/lsnfc.c	(revision 1072)
 +++ src/lsnfc.c	(working copy)
-@@ -88,7 +88,8 @@
+@@ -76,6 +76,7 @@
+ {
+   uint8_t abtCmd[2];
+   uint8_t abtRx[265];
++  size_t szRxLen;
+   int res = 0;
+ 
+   abtCmd[0] = 0x1A;  // MIFARE UltralightC Auth command
+@@ -87,7 +88,8 @@
    };
-   if((res = nfc_initiator_select_passive_target(pnd, nm, nai.abtUid, nai.szUidLen, NULL)) >= 0 ) {
-     nfc_device_set_property_bool (pnd, NP_EASY_FRAMING, false);
--    if ((res = nfc_initiator_transceive_bytes(pnd, abtCmd,sizeof(abtCmd), abtRx, sizeof(abtRx), 0)) >= 0) {
+   if ((res = nfc_initiator_select_passive_target(pnd, nm, nai.abtUid, nai.szUidLen, NULL)) >= 0) {
+     nfc_device_set_property_bool(pnd, NP_EASY_FRAMING, false);
+-    if ((res = nfc_initiator_transceive_bytes(pnd, abtCmd, sizeof(abtCmd), abtRx, sizeof(abtRx), 0)) >= 0) {
 +    szRxLen = sizeof(abtRx);
-+    if ((res = nfc_initiator_transceive_bytes(pnd, abtCmd,sizeof(abtCmd), abtRx, &szRxLen, 0)) >= 0) {
++    if ((res = nfc_initiator_transceive_bytes(pnd, abtCmd, sizeof(abtCmd), abtRx, &szRxLen, 0)) >= 0) {
        // AUTH step1 command success, so it's a Ultralight C
-       nfc_device_set_property_bool (pnd, NP_EASY_FRAMING, true);
+       nfc_device_set_property_bool(pnd, NP_EASY_FRAMING, true);
        nfc_initiator_deselect_target(pnd);
-@@ -126,12 +127,14 @@
+@@ -115,6 +117,7 @@
+ {
+   uint8_t abtCmd[] = { 0x60 }; // MIFARE DESFire GetVersion command
+   uint8_t abtRx[265];
++  size_t szRxLen;
+   uint8_t abtDESFireVersion[14];
+   char *res = NULL;
+   int nfcRes = 0;
+@@ -124,12 +127,14 @@
      .nbr = NBR_106
    };
-   if((nfcRes = nfc_initiator_select_passive_target(pnd, nm, nai.abtUid, nai.szUidLen, NULL)) >= 0 ) {
+   if ((nfcRes = nfc_initiator_select_passive_target(pnd, nm, nai.abtUid, nai.szUidLen, NULL)) >= 0) {
 -    if ((nfcRes = nfc_initiator_transceive_bytes(pnd, abtCmd, sizeof(abtCmd), abtRx, sizeof(abtRx), 0)) >= 0) {
 +    szRxLen = sizeof(abtRx);
 +    if ((nfcRes = nfc_initiator_transceive_bytes(pnd, abtCmd, sizeof(abtCmd), abtRx, &szRxLen, 0)) >= 0) {
        // MIFARE DESFire GetVersion command success, decoding...
-       if( nfcRes == 8 ) { // GetVersion should reply 8 bytes
-         memcpy( abtDESFireVersion, abtRx + 1, 7 );
+       if (nfcRes == 8) {  // GetVersion should reply 8 bytes
+         memcpy(abtDESFireVersion, abtRx + 1, 7);
          abtCmd[0] = 0xAF; // ask for GetVersion next bytes
 -        if ((nfcRes = nfc_initiator_transceive_bytes(pnd, abtCmd, sizeof(abtCmd), abtRx, sizeof(abtRx), 0)) >= 0) {
 +        szRxLen = sizeof(abtRx);
 +        if ((nfcRes = nfc_initiator_transceive_bytes(pnd, abtCmd, sizeof(abtCmd), abtRx, &szRxLen, 0)) >= 0) {
-           if( nfcRes == 8 ) { // GetVersion should reply 8 bytes
-             memcpy( abtDESFireVersion + 7, abtRx + 1, 7 );
+           if (nfcRes == 8) {  // GetVersion should reply 8 bytes
+             memcpy(abtDESFireVersion + 7, abtRx + 1, 7);
              res = malloc(16); // We can alloc res: we will be able to provide information