e2fsprogs-diet.patch

   1 diff -ur e2fsprogs-1.41.3/configure.in e2fsprogs-1.41.3-diet/configure.in
   2 --- e2fsprogs-1.41.3/configure.in       2009-03-17 22:03:38.000000000 +0100
   3 +++ e2fsprogs-1.41.3-diet/configure.in  2009-03-17 22:01:22.000000000 +0100
   4 @@ -817,7 +817,7 @@
   5    AC_SEARCH_LIBS([blkid_probe_all], [blkid])
   6  fi
   7  dnl
   8 -AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology)
   9 +AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 stat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology)
  10  dnl
  11  dnl Check to see if -lsocket is required (solaris) to make something
  12  dnl that uses socket() to compile; this is needed for the UUID library
  13 diff -ur e2fsprogs-1.41.3/misc/util.c e2fsprogs-1.41.3-diet/misc/util.c
  14 --- e2fsprogs-1.41.3/misc/util.c        2008-10-07 16:22:39.000000000 +0200
  15 +++ e2fsprogs-1.41.3-diet/misc/util.c   2009-03-17 22:01:31.000000000 +0100
  16 @@ -79,7 +79,7 @@
  17  void check_plausibility(const char *device)
  18  {
  19         int val;
  20 -#ifdef HAVE_OPEN64
  21 +#ifdef HAVE_STAT64
  22         struct stat64 s;
  23
  24         val = stat64(device, &s);
  25
  26 --- e2fsprogs-1.41.11/configure.in.orig 2010-05-09 13:54:54.850935070 +0200
  27 +++ e2fsprogs-1.41.11/configure.in      2010-05-09 20:34:13.650932556 +0200
  28 @@ -405,7 +405,7 @@
  29                 [LIBUUID=`$PKG_CONFIG --libs uuid`;
  30                  STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`],
  31                 [AC_MSG_ERROR([external uuid library not found])],
  32 -               [$LIBUUID])
  33 +               [$LIBUUID_LIBADD])
  34         UUID_CMT=#
  35         AC_MSG_RESULT([Disabling private uuid library])
  36  else
  37 @@ -456,7 +456,7 @@
  38                 [LIBBLKID=`$PKG_CONFIG --libs blkid`;
  39                  STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
  40                 [AC_MSG_ERROR([external blkid library not found])],
  41 -               [$LIBBLKID])
  42 +               [$LIBBLKID_LIBADD])
  43         BLKID_CMT=#
  44         AC_MSG_RESULT([Disabling private blkid library])
  45  else
  46 --- e2fsprogs-1.41.11/misc/mke2fs.c.orig        2010-03-15 05:13:56.000000000 +0100
  47 +++ e2fsprogs-1.41.11/misc/mke2fs.c     2010-05-09 20:44:41.178938422 +0200
  48 @@ -1927,7 +1927,7 @@
  49         int ret;
  50         int blocksize;
  51         __u64 blocks;
  52 -       __uint64_t range[2];
  53 +       uint64_t range[2];
  54
  55         blocks = fs->super->s_blocks_count;
  56         blocksize = EXT2_BLOCK_SIZE(fs->super);