[pkgsrc/trunk]: pkgsrc/sysutils/e2fsprogs New patches.

[martti <martti%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c484058aa52
branches:  trunk
changeset: 529492:6c484058aa52
user:      martti <martti%pkgsrc.org@localhost>
date:      Wed Jun 06 10:29:14 2007 +0000

description:
New patches.

diffstat:

 sysutils/e2fsprogs/distinfo         |   5 +++--
 sysutils/e2fsprogs/patches/patch-aa |  11 +++++++++++
 sysutils/e2fsprogs/patches/patch-af |  32 +++++++++++++++++++++++++++-----
 3 files changed, 41 insertions(+), 7 deletions(-)

diffs (71 lines):

diff -r 0f390010fb0f -r 6c484058aa52 sysutils/e2fsprogs/distinfo
--- a/sysutils/e2fsprogs/distinfo       Wed Jun 06 09:35:32 2007 +0000
+++ b/sysutils/e2fsprogs/distinfo       Wed Jun 06 10:29:14 2007 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.11 2007/06/06 09:35:17 martti Exp $
+$NetBSD: distinfo,v 1.12 2007/06/06 10:29:14 martti Exp $
 
 SHA1 (e2fsprogs-1.39.tar.gz) = c2dad0c9bd76701eafe3804e2a7d072aa198f046
 RMD160 (e2fsprogs-1.39.tar.gz) = 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b
 Size (e2fsprogs-1.39.tar.gz) = 3695111 bytes
-SHA1 (patch-af) = 50539534e9e916e75196e697a66fa315b1c88047
+SHA1 (patch-aa) = a02135c39559a691f022063351ccb974f9930afb
+SHA1 (patch-af) = 4477e239e166295b06a5664d4ec7a92fa29c4f84
diff -r 0f390010fb0f -r 6c484058aa52 sysutils/e2fsprogs/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/e2fsprogs/patches/patch-aa       Wed Jun 06 10:29:14 2007 +0000
@@ -0,0 +1,11 @@
+--- e2fsck/unix.c.orig 2007-06-06 13:04:31.000000000 +0300
++++ e2fsck/unix.c      2007-06-06 13:19:33.000000000 +0300
+@@ -173,7 +173,7 @@
+       retval = ext2fs_check_if_mounted(ctx->filesystem_name,
+                                        &ctx->mount_flags);
+       if (retval) {
+-              com_err("ext2fs_check_if_mount", retval,
++              com_err("ext2fs_check_if_mounted", retval,
+                       _("while determining whether %s is mounted."),
+                       ctx->filesystem_name);
+               return;
diff -r 0f390010fb0f -r 6c484058aa52 sysutils/e2fsprogs/patches/patch-af
--- a/sysutils/e2fsprogs/patches/patch-af       Wed Jun 06 09:35:32 2007 +0000
+++ b/sysutils/e2fsprogs/patches/patch-af       Wed Jun 06 10:29:14 2007 +0000
@@ -1,8 +1,19 @@
-$NetBSD: patch-af,v 1.3 2007/06/06 09:35:18 martti Exp $
-
---- lib/ext2fs/ismounted.c.orig        2005-09-06 12:40:14.000000000 +0300
-+++ lib/ext2fs/ismounted.c     2007-06-06 12:09:36.000000000 +0300
-@@ -196,7 +196,11 @@
+$NetBSD: patch-af,v 1.4 2007/06/06 10:29:15 martti Exp $
+--- lib/ext2fs/ismounted.c.orig        2007-06-06 13:22:30.000000000 +0300
++++ lib/ext2fs/ismounted.c     2007-06-06 13:23:15.000000000 +0300
+@@ -29,7 +29,11 @@
+ #include <sys/mount.h>
+ #endif /* HAVE_GETMNTINFO */
+ #include <string.h>
++#if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900
++#include <sys/statvfs.h>
++#else
+ #include <sys/stat.h>
++#endif
+ 
+ #include "ext2_fs.h"
+ #include "ext2fs.h"
+@@ -196,7 +200,11 @@
  static errcode_t check_getmntinfo(const char *file, int *mount_flags,
                                  char *mtpt, int mtlen)
  {
@@ -14,3 +25,14 @@
          int    len, n;
          const  char   *s1;
        char    *s2;
+@@ -325,9 +333,9 @@
+                       *mount_flags |= EXT2_MF_BUSY;
+       } else
+               close(fd);
++#endif
+ 
+       return 0;
+-#endif
+ }
+ 
+ /*