disable test which requires pty; rel 2

[packages/cryptsetup.git] / diet.patch

diff --git a/diet.patch b/diet.patch
index 0d08bf412af35b98f0d48db041434d9c63c8a2cf..33c7bcafe8f76c1c55ca121b96dbe37ab6813105 100644 (file)
--- a/diet.patch
+++ b/diet.patch
@@ -1,5 +1,5 @@
---- cryptsetup-1.1.2/luks/pbkdf.c~     2009-09-11 16:11:50.000000000 +0200
-+++ cryptsetup-1.1.2/luks/pbkdf.c      2010-06-21 11:16:57.353421474 +0200
+--- cryptsetup-1.2.0/lib/luks1/pbkdf.c~        2009-09-11 16:11:50.000000000 +0200
++++ cryptsetup-1.2.0/lib/luks1/pbkdf.c 2010-06-21 11:16:57.353421474 +0200
 @@ -174,7 +174,7 @@
        if (gcry_md_setkey(prf, P, Plen))
                goto out;
@@ -27,24 +27,24 @@
        }
        rc = 0;
  out:
---- cryptsetup-1.1.2/luks/keymanage.c.org      2010-06-21 11:25:41.010034880 +0200
-+++ cryptsetup-1.1.2/luks/keymanage.c  2010-06-21 11:25:47.149697130 +0200
+--- cryptsetup-1.5.1/lib/luks1/keymanage.c.orig        2012-09-19 13:55:25.000000000 +0200
++++ cryptsetup-1.5.1/lib/luks1/keymanage.c     2012-10-27 10:40:19.872153257 +0200
 @@ -20,6 +20,7 @@
+ 
  #include <sys/types.h>
  #include <sys/stat.h>
- #include <sys/ioctl.h>
 +#include <limits.h>
- #include <linux/fs.h>
  #include <netinet/in.h>
  #include <fcntl.h>
-@@ -37,6 +38,10 @@
- #include <uuid/uuid.h>
- #include <../lib/internal.h>
+ #include <errno.h>
+@@ -36,6 +37,10 @@
+ #include "pbkdf.h"
+ #include "internal.h"
  
 +#ifndef UINT32_MAX
 +#define UINT32_MAX UINT_MAX
 +#endif
 +
- #define div_round_up(a,b) ({           \
-       typeof(a) __a = (a);          \
-       typeof(b) __b = (b);          \
+ /* Get size of struct luks_phdr with all keyslots material space */
+ static size_t LUKS_device_sectors(size_t keyLen)
+ {