e2fsprogs-diet.patch

   1 --- e2fsprogs-1.41.13/configure.in.orig 2010-12-15 17:40:23.706122774 +0100
   2 +++ e2fsprogs-1.41.13/configure.in      2010-12-15 17:43:42.738121936 +0100
   3 @@ -441,7 +441,7 @@
   4                 [LIBUUID=`$PKG_CONFIG --libs uuid`;
   5                  STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`],
   6                 [AC_MSG_ERROR([external uuid library not found])],
   7 -               [$LIBUUID])
   8 +               [$LIBUUID_LIBADD])
   9         UUID_CMT=#
  10         AC_MSG_RESULT([Disabling private uuid library])
  11  else
  12 @@ -492,7 +492,7 @@
  13                 [LIBBLKID=`$PKG_CONFIG --libs blkid`;
  14                  STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
  15                 [AC_MSG_ERROR([external blkid library not found])],
  16 -               [$LIBBLKID])
  17 +               [$LIBBLKID_LIBADD])
  18         BLKID_CMT=#
  19         AC_MSG_RESULT([Disabling private blkid library])
  20  else
  21 @@ -988,6 +988,7 @@
  22         setresgid
  23         setresuid
  24         srandom
  25 +       stat64
  26         strcasecmp
  27         strdup
  28         strnlen
  29 --- e2fsprogs-1.42.2/lib/ext2fs/unix_io.c~      2012-03-18 19:18:33.000000000 +0100
  30 +++ e2fsprogs-1.42.2/lib/ext2fs/unix_io.c       2012-03-30 18:55:04.613560295 +0200
  31 @@ -888,7 +888,7 @@
  32                               unsigned long long count)
  33  {
  34         struct unix_private_data *data;
  35 -       __uint64_t      range[2];
  36 +       u_int64_t       range[2];
  37         int             ret;
  38
  39         EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
  40 @@ -897,8 +897,8 @@
  41
  42         if (channel->flags & CHANNEL_FLAGS_BLOCK_DEVICE) {
  43  #ifdef BLKDISCARD
  44 -               range[0] = (__uint64_t)(block) * channel->block_size;
  45 -               range[1] = (__uint64_t)(count) * channel->block_size;
  46 +               range[0] = (u_int64_t)(block) * channel->block_size;
  47 +               range[1] = (u_int64_t)(count) * channel->block_size;
  48
  49                 ret = ioctl(data->dev, BLKDISCARD, &range);
  50  #else