From 2c1e0ac433a4eb51372bdd37faa332499a8f64e6 Mon Sep 17 00:00:00 2001 From: martti Date: Wed, 6 Jun 2007 09:35:17 +0000 Subject: Updated sysutils/e2fsprogs to 1.39 This release contains a number of bug fixes and enhancements over the previous releases. For details, see http://e2fsprogs.sourceforge.net/e2fsprogs-release.html --- sysutils/e2fsprogs/Makefile | 11 ++++------- sysutils/e2fsprogs/PLIST.Linux | 4 ++-- sysutils/e2fsprogs/PLIST.common | 21 ++++++++++++++++++++- sysutils/e2fsprogs/distinfo | 19 +++++-------------- sysutils/e2fsprogs/patches/patch-aa | 12 ------------ sysutils/e2fsprogs/patches/patch-ab | 13 ------------- sysutils/e2fsprogs/patches/patch-ac | 13 ------------- sysutils/e2fsprogs/patches/patch-ae | 14 -------------- sysutils/e2fsprogs/patches/patch-af | 8 ++++---- sysutils/e2fsprogs/patches/patch-ag | 12 ------------ sysutils/e2fsprogs/patches/patch-ah | 12 ------------ sysutils/e2fsprogs/patches/patch-ai | 12 ------------ sysutils/e2fsprogs/patches/patch-aj | 16 ---------------- sysutils/e2fsprogs/patches/patch-ak | 12 ------------ 14 files changed, 35 insertions(+), 144 deletions(-) delete mode 100644 sysutils/e2fsprogs/patches/patch-aa delete mode 100644 sysutils/e2fsprogs/patches/patch-ab delete mode 100644 sysutils/e2fsprogs/patches/patch-ac delete mode 100644 sysutils/e2fsprogs/patches/patch-ae delete mode 100644 sysutils/e2fsprogs/patches/patch-ag delete mode 100644 sysutils/e2fsprogs/patches/patch-ah delete mode 100644 sysutils/e2fsprogs/patches/patch-ai delete mode 100644 sysutils/e2fsprogs/patches/patch-aj delete mode 100644 sysutils/e2fsprogs/patches/patch-ak (limited to 'sysutils/e2fsprogs') diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 5061c0321ae..9bbf4495571 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -1,12 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2006/04/07 19:54:16 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2007/06/06 09:35:17 martti Exp $ # -DISTNAME= e2fsprogs-1.32 +DISTNAME= e2fsprogs-1.39 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} \ - ftp://ftp.dei.uc.pt/.d4/linuxberg/files/console/system/ \ - ftp://tsx-11.mit.edu/pub/linux/packages/ext2fs/ \ - ftp://ftp.gwdg.de/pub/linux/mirrors/tsx-11/packages/ext2fs/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://e2fsprogs.sourceforge.net/ @@ -14,7 +11,7 @@ COMMENT= Second extended file system (ext2fs) management programs GNU_CONFIGURE= yes USE_TOOLS+= makeinfo -INFO_FILES= # PLIST.common +INFO_FILES= YES .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/e2fsprogs/PLIST.Linux b/sysutils/e2fsprogs/PLIST.Linux index 1208db58540..c43d345dce8 100644 --- a/sysutils/e2fsprogs/PLIST.Linux +++ b/sysutils/e2fsprogs/PLIST.Linux @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST.Linux,v 1.2 2003/02/16 19:21:16 jschauma Exp $ -sbin/fsck +@comment $NetBSD: PLIST.Linux,v 1.3 2007/06/06 09:35:17 martti Exp $ man/man8/fsck.8 +sbin/fsck diff --git a/sysutils/e2fsprogs/PLIST.common b/sysutils/e2fsprogs/PLIST.common index 2c6b8581591..3a1818a5a04 100644 --- a/sysutils/e2fsprogs/PLIST.common +++ b/sysutils/e2fsprogs/PLIST.common @@ -1,20 +1,26 @@ -@comment $NetBSD: PLIST.common,v 1.4 2006/04/07 19:54:16 jlam Exp $ +@comment $NetBSD: PLIST.common,v 1.5 2007/06/06 09:35:17 martti Exp $ bin/chattr bin/lsattr bin/uuidgen info/libext2fs.info +lib/e2initrd_helper man/man1/chattr.1 man/man1/lsattr.1 man/man1/uuidgen.1 +man/man5/e2fsck.conf.5 +man/man5/mke2fs.conf.5 man/man8/badblocks.8 +man/man8/blkid.8 man/man8/debugfs.8 man/man8/dumpe2fs.8 man/man8/e2fsck.8 man/man8/e2image.8 man/man8/e2label.8 +man/man8/filefrag.8 man/man8/findfs.8 man/man8/fsck.ext2.8 man/man8/fsck.ext3.8 +man/man8/logsave.8 man/man8/mke2fs.8 man/man8/mkfs.ext2.8 man/man8/mkfs.ext3.8 @@ -22,17 +28,30 @@ man/man8/mklost+found.8 man/man8/resize2fs.8 man/man8/tune2fs.8 sbin/badblocks +sbin/blkid sbin/debugfs sbin/dumpe2fs sbin/e2fsck sbin/e2image sbin/e2label +sbin/filefrag sbin/findfs sbin/fsck.ext2 sbin/fsck.ext3 +sbin/logsave sbin/mke2fs sbin/mkfs.ext2 sbin/mkfs.ext3 sbin/mklost+found sbin/resize2fs sbin/tune2fs +share/locale/cs/LC_MESSAGES/e2fsprogs.mo +share/locale/de/LC_MESSAGES/e2fsprogs.mo +share/locale/es/LC_MESSAGES/e2fsprogs.mo +share/locale/fr/LC_MESSAGES/e2fsprogs.mo +share/locale/it/LC_MESSAGES/e2fsprogs.mo +share/locale/nl/LC_MESSAGES/e2fsprogs.mo +share/locale/pl/LC_MESSAGES/e2fsprogs.mo +share/locale/rw/LC_MESSAGES/e2fsprogs.mo +share/locale/sv/LC_MESSAGES/e2fsprogs.mo +share/locale/tr/LC_MESSAGES/e2fsprogs.mo diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo index d2a4a84b91e..5b8a9cec77e 100644 --- a/sysutils/e2fsprogs/distinfo +++ b/sysutils/e2fsprogs/distinfo @@ -1,15 +1,6 @@ -$NetBSD: distinfo,v 1.10 2006/04/07 19:54:16 jlam Exp $ +$NetBSD: distinfo,v 1.11 2007/06/06 09:35:17 martti Exp $ -SHA1 (e2fsprogs-1.32.tar.gz) = 409bbdbc48b5f8ec5006e283962d8432d971d51f -RMD160 (e2fsprogs-1.32.tar.gz) = eeaaee7dd9eb202a9f2abccdf1f3acb65c0f216d -Size (e2fsprogs-1.32.tar.gz) = 2894603 bytes -SHA1 (patch-aa) = 61561b5c12345aceee3d8b46249b805a3f97822b -SHA1 (patch-ab) = 932d19e15eed6589e124de60c35712b32e86eb83 -SHA1 (patch-ac) = 171e7e887f62831ebf8c48c6aa84cd3804f02067 -SHA1 (patch-ae) = 85d394a64681882006854beee6826d4c6a6cd442 -SHA1 (patch-af) = dcdd61ea70b6eb322733249c9fb38d764243d6c4 -SHA1 (patch-ag) = 4afd200cd9a8a9afa429b15438e480d975312190 -SHA1 (patch-ah) = a45ffe108a40da9908bd0369c5b2d498da695a3d -SHA1 (patch-ai) = 12880227e26dc53aa7a3d091d8b7687e26d6757f -SHA1 (patch-aj) = 8d152b19ee4f2160f0cc1480858d0e2682b450db -SHA1 (patch-ak) = 5b592e902dd3ac0299e91fc9451a0d70f1b1781d +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 diff --git a/sysutils/e2fsprogs/patches/patch-aa b/sysutils/e2fsprogs/patches/patch-aa deleted file mode 100644 index 2dc5b4dc3a1..00000000000 --- a/sysutils/e2fsprogs/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2003/04/14 23:15:54 hubertf Exp $ - ---- lib/ext2fs/flushb.c.orig Thu Oct 31 12:17:24 2002 -+++ lib/ext2fs/flushb.c -@@ -11,6 +11,7 @@ - */ - - #include -+#include - #if HAVE_ERRNO_H - #include - #endif diff --git a/sysutils/e2fsprogs/patches/patch-ab b/sysutils/e2fsprogs/patches/patch-ab deleted file mode 100644 index 63985361780..00000000000 --- a/sysutils/e2fsprogs/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2003/04/14 23:15:54 hubertf Exp $ - ---- e2fsck/journal.c.orig Thu Apr 10 13:59:22 2003 -+++ e2fsck/journal.c -@@ -13,6 +13,8 @@ - */ - - #ifdef HAVE_SYS_MOUNT_H -+#include -+#include - #include - #define MNT_FL (MS_MGC_VAL | MS_RDONLY) - #endif diff --git a/sysutils/e2fsprogs/patches/patch-ac b/sysutils/e2fsprogs/patches/patch-ac deleted file mode 100644 index 326ca7233a2..00000000000 --- a/sysutils/e2fsprogs/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2003/04/14 23:15:55 hubertf Exp $ - ---- e2fsck/pass1.c.orig Fri Nov 8 17:37:28 2002 -+++ e2fsck/pass1.c -@@ -162,7 +162,7 @@ - * Incredibly, libc5 doesn't appear to have strnlen. So we have to - * provide our own. - */ --static int strnlen(const char * s, int count) -+int strnlen(const char * s, int count) - { - const char *cp = s; - diff --git a/sysutils/e2fsprogs/patches/patch-ae b/sysutils/e2fsprogs/patches/patch-ae deleted file mode 100644 index 98d93e3dca6..00000000000 --- a/sysutils/e2fsprogs/patches/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2004/05/23 23:28:29 danw Exp $ - ---- e2fsck/unix.c.orig Fri Nov 8 18:42:33 2002 -+++ e2fsck/unix.c -@@ -34,7 +34,9 @@ extern int optind; - #include - #endif - #include -+#ifdef HAVE_MALLOC_H - #include -+#endif - - #include "et/com_err.h" - #include "e2fsck.h" diff --git a/sysutils/e2fsprogs/patches/patch-af b/sysutils/e2fsprogs/patches/patch-af index 2ab5f1f4a69..8692a628c97 100644 --- a/sysutils/e2fsprogs/patches/patch-af +++ b/sysutils/e2fsprogs/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.2 2005/09/08 22:28:03 abs Exp $ +$NetBSD: patch-af,v 1.3 2007/06/06 09:35:18 martti Exp $ ---- lib/ext2fs/ismounted.c.orig 2002-10-31 20:17:24.000000000 +0000 -+++ lib/ext2fs/ismounted.c -@@ -193,7 +193,11 @@ static errcode_t check_mntent(const char +--- 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 @@ static errcode_t check_getmntinfo(const char *file, int *mount_flags, char *mtpt, int mtlen) { diff --git a/sysutils/e2fsprogs/patches/patch-ag b/sysutils/e2fsprogs/patches/patch-ag deleted file mode 100644 index 1e9e2f6e2ce..00000000000 --- a/sysutils/e2fsprogs/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2006/01/13 18:14:54 joerg Exp $ - ---- lib/e2p/fgetversion.c.orig 2006-01-13 18:03:42.000000000 +0000 -+++ lib/e2p/fgetversion.c -@@ -51,7 +51,6 @@ int fgetversion (const char * name, unsi - errno = save_errno; - return r; - #else /* ! HAVE_EXT2_IOCTLS */ -- extern int errno; - errno = EOPNOTSUPP; - return -1; - #endif /* ! HAVE_EXT2_IOCTLS */ diff --git a/sysutils/e2fsprogs/patches/patch-ah b/sysutils/e2fsprogs/patches/patch-ah deleted file mode 100644 index f683bac94ed..00000000000 --- a/sysutils/e2fsprogs/patches/patch-ah +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2006/01/13 18:14:54 joerg Exp $ - ---- lib/e2p/fsetversion.c.orig 2006-01-13 18:04:22.000000000 +0000 -+++ lib/e2p/fsetversion.c -@@ -51,7 +51,6 @@ int fsetversion (const char * name, unsi - errno = save_errno; - return r; - #else /* ! HAVE_EXT2_IOCTLS */ -- extern int errno; - errno = EOPNOTSUPP; - return -1; - #endif /* ! HAVE_EXT2_IOCTLS */ diff --git a/sysutils/e2fsprogs/patches/patch-ai b/sysutils/e2fsprogs/patches/patch-ai deleted file mode 100644 index c1c48ba15ff..00000000000 --- a/sysutils/e2fsprogs/patches/patch-ai +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2006/01/13 18:14:54 joerg Exp $ - ---- lib/e2p/getversion.c.orig 2006-01-13 18:04:55.000000000 +0000 -+++ lib/e2p/getversion.c -@@ -30,7 +30,6 @@ int getversion (int fd, unsigned long * - *version = ver; - return 0; - #else /* ! HAVE_EXT2_IOCTLS */ -- extern int errno; - errno = EOPNOTSUPP; - return -1; - #endif /* ! HAVE_EXT2_IOCTLS */ diff --git a/sysutils/e2fsprogs/patches/patch-aj b/sysutils/e2fsprogs/patches/patch-aj deleted file mode 100644 index e3ca29fa735..00000000000 --- a/sysutils/e2fsprogs/patches/patch-aj +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2006/01/13 18:14:54 joerg Exp $ - ---- lib/e2p/iod.c.orig 2006-01-13 18:05:23.000000000 +0000 -+++ lib/e2p/iod.c -@@ -54,7 +54,11 @@ int iterate_on_dir (const char * dir_nam - return -1; - } - while ((dep = readdir (dir))) { -+#if defined(__DragonFly__) && defined(_DIRENT_MINSIZ) -+ len = _DIRENT_MINSIZ(dep); -+#else - len = dep->d_reclen; -+#endif - if (len < (sizeof(struct dirent))) - len = sizeof(struct dirent); - if (len > max_len) diff --git a/sysutils/e2fsprogs/patches/patch-ak b/sysutils/e2fsprogs/patches/patch-ak deleted file mode 100644 index f4c3dd7fb60..00000000000 --- a/sysutils/e2fsprogs/patches/patch-ak +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2006/01/13 18:14:54 joerg Exp $ - ---- lib/e2p/setversion.c.orig 2006-01-13 18:08:12.000000000 +0000 -+++ lib/e2p/setversion.c -@@ -29,7 +29,6 @@ int setversion (int fd, unsigned long ve - ver = (int) version; - return ioctl (fd, EXT2_IOC_SETVERSION, &ver); - #else /* ! HAVE_EXT2_IOCTLS */ -- extern int errno; - errno = EOPNOTSUPP; - return -1; - #endif /* ! HAVE_EXT2_IOCTLS */ -- cgit v1.2.3