6 files changed, 66 insertions, 31 deletions

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index d1010271d497..be939071bbc8 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	e2fsprogs
-PORTVERSION=	1.40.11
+PORTVERSION=	1.41.0
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
@@ -16,6 +16,7 @@ MAINTAINER?=	matthias.andree@gmx.de
 COMMENT?=	Utilities & library to manipulate ext2/3/4 filesystems
 
 PATCH_STRIP=	-p1
+USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-fsck --disable-e2initrd-helper \
@@ -32,8 +33,9 @@ OPTIONS=	NLS "Enable national language support" on
 MAN1=	chattr.1 lsattr.1
 MAN5=	e2fsck.conf.5 mke2fs.conf.5
 MAN8=	badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 \
-	mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \
-	fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8 \
+	e2undo.8 mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \
+	fsck.ext2.8 fsck.ext3.8 fsck.ext4.8 fsck.ext4dev.8 \
+	mkfs.ext2.8 mkfs.ext3.8 mkfs.ext4.8 mkfs.ext4dev.8 \
 	findfs.8 blkid.8 logsave.8 fsck_ext2fs.8
 
 post-extract:
@@ -65,7 +67,7 @@ post-build:
 # else we're in trouble if e2fsck is needed for boot:
 # (we don't use e2fsck.static, since we can link libc.so dynamically)
 	cd ${WRKSRC}/e2fsck && ${RM} -f e2fsck \
-		&& ${MAKE} e2fsck \
+		&& ${GMAKE} e2fsck \
 		STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
 		../lib/libblkid.a  ../lib/libuuid.a" \
 		LIBINTL="${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
@@ -81,7 +83,7 @@ post-build:
 	    echo 'FAIL' ; echo '===>  e2fsck depends on:' ; echo "$$a" ; exit 1 ; fi
 # Update translation binary files
 .if !defined(WITHOUT_NLS)
-	cd ${WRKSRC}/po && ${MAKE} update-gmo
+	cd ${WRKSRC}/po && ${GMAKE} update-gmo
 .endif
 # Build fsck(8) wrapper
 	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s ${LIBS} \
@@ -94,7 +96,7 @@ post-build:
 # There have been subtle failures induced by Linux-isms in the past.
 # -- Matthias Andree, package maintainer, 2007-09-18
 	@${ECHO_CMD} '===>  Running e2fsprogs self-test suite'
-	cd ${WRKSRC}/tests && ${MAKE} check \
+	cd ${WRKSRC}/tests && ${GMAKE} check \
 	    || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; }
 
 post-install:
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index 07eeea3ce722..13395e7d84f0 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,3 +1,3 @@
-MD5 (e2fsprogs-1.40.11.tar.gz) = 004cea70d724fdc7f1a952dffe4c9db8
-SHA256 (e2fsprogs-1.40.11.tar.gz) = 3eeb0c3513b3b251f5d51ec3413bc77e3a21cb8bc84a1979022a67fe733c897b
-SIZE (e2fsprogs-1.40.11.tar.gz) = 4116013
+MD5 (e2fsprogs-1.41.0.tar.gz) = 83144fa7e0e63647f920b77650ea1836
+SHA256 (e2fsprogs-1.41.0.tar.gz) = db02fb36dae963eda7e8d8c11d1e178e5992f53893c5f0e76493d412758a1675
+SIZE (e2fsprogs-1.41.0.tar.gz) = 4260246
diff --git a/sysutils/e2fsprogs/files/patch-lib_ext2fs_bitmaps.c b/sysutils/e2fsprogs/files/patch-lib_ext2fs_bitmaps.c
deleted file mode 100644
index 8dff9eda3796..000000000000
--- a/sysutils/e2fsprogs/files/patch-lib_ext2fs_bitmaps.c
+++ /dev/null
@@ -1,16 +0,0 @@
-# To fix bitops related crash
-# patch provided by Ted Ts'o to Frantisek Holop (OpenBSD porter)
-
-diff --git a/lib/ext2fs/bitmaps.c b/lib/ext2fs/bitmaps.c
-index 696baad..843a75f 100644
---- a/lib/ext2fs/bitmaps.c
-+++ b/lib/ext2fs/bitmaps.c
-@@ -56,7 +56,7 @@ static errcode_t make_bitmap(__u32 start, __u32 end, __u32 real_end,
- 	} else
- 		bitmap->description = 0;
- 
--	size = (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1);
-+	size = (size_t) (((bitmap->real_end - bitmap->start) / 8) + 2);
- 	retval = ext2fs_get_mem(size, &bitmap->bitmap);
- 	if (retval) {
- 		ext2fs_free_mem(&bitmap->description);
diff --git a/sysutils/e2fsprogs/files/patch-misc_Makefile.in b/sysutils/e2fsprogs/files/patch-misc_Makefile.in
index a645b1b88cc8..483e691ddaea 100644
--- a/sysutils/e2fsprogs/files/patch-misc_Makefile.in
+++ b/sysutils/e2fsprogs/files/patch-misc_Makefile.in
@@ -1,15 +1,15 @@
---- a/misc/Makefile.in.orig	Tue Jan  1 04:35:42 2008
-+++ b/misc/Makefile.in	Sun Jan 13 10:46:31 2008
+--- a/misc/Makefile.in.orig	2008-06-18 05:53:42.000000000 +0200
++++ b/misc/Makefile.in	2008-07-13 12:55:25.000000000 +0200
 @@ -19,14 +19,14 @@
  
  SPROGS=		mke2fs badblocks tune2fs dumpe2fs blkid logsave \
- 			$(E2IMAGE_PROG) @FSCK_PROG@
+ 			$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
 -USPROGS=	mklost+found filefrag $(UUIDD_PROG)
 +USPROGS=	mklost+found
  SMANPAGES=	tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
  			e2label.8 findfs.8 blkid.8 $(E2IMAGE_MAN) \
--			logsave.8 filefrag.8 $(UUIDD_MAN) @FSCK_MAN@
-+			logsave.8 @FSCK_MAN@
+-			logsave.8 filefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
++			logsave.8 e2undo.8 @FSCK_MAN@
  FMANPAGES=	mke2fs.conf.5
  
 -UPROGS=		chattr lsattr uuidgen
@@ -19,7 +19,7 @@
  
  LPROGS=		@E2INITRD_PROG@
  
-@@ -315,11 +314,9 @@
+@@ -337,11 +337,9 @@
  		echo "	INSTALL_DATA $(man5dir)/$$i"; \
  		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
  	done
diff --git a/sysutils/e2fsprogs/files/patch-tests-md5sum b/sysutils/e2fsprogs/files/patch-tests-md5sum
new file mode 100644
index 000000000000..55bbfa336d8e
--- /dev/null
+++ b/sysutils/e2fsprogs/files/patch-tests-md5sum
@@ -0,0 +1,44 @@
+--- a/tests/u_mke2fs/script.orig	2008-06-18 05:53:42.000000000 +0200
++++ b/tests/u_mke2fs/script	2008-07-13 13:31:23.000000000 +0200
+@@ -10,16 +10,16 @@
+ 
+ echo mke2fs -q -F -o Linux -b 1024 test.img  > $OUT
+ $MKE2FS -F -o Linux -I 128 -b 1024 $TMPFILE  >> $OUT 2>&1
+-md5=$(md5sum $TMPFILE | cut -d " " -f 1)
++md5=$(md5 -q $TMPFILE)
+ echo md5sum before mke2fs $md5 >> $OUT
+ 
+ echo using mke2fs to test e2undo >> $OUT
+ $MKE2FS -q -F -o Linux -I 256 -O uninit_bg -E lazy_itable_init=1 -b 1024 $TMPFILE  >> $OUT 2>&1
+-new_md5=$(md5sum $TMPFILE | cut -d " " -f 1)
++new_md5=$(md5 -q $TMPFILE)
+ echo md5sum after mke2fs $new_md5 >> $OUT
+ 
+ $E2UNDO_EXE  $TDB_FILE $TMPFILE  >> $OUT 2>&1
+-new_md5=$(md5sum $TMPFILE | cut -d " " -f 1)
++new_md5=$(md5 -q $TMPFILE)
+ echo md5sum after e2undo $new_md5 >> $OUT
+ 
+ if [ $md5 = $new_md5 ]; then
+--- a/tests/u_tune2fs/script.orig	2008-06-18 05:53:42.000000000 +0200
++++ b/tests/u_tune2fs/script	2008-07-13 13:32:10.000000000 +0200
+@@ -10,16 +10,16 @@
+ 
+ echo mke2fs -q -F -o Linux -b 1024 $TMPFILE  > $OUT
+ $MKE2FS -q -F -o Linux -I 128 -b 1024 $TMPFILE  >> $OUT 2>&1
+-md5=$(md5sum $TMPFILE | cut -d " " -f 1)
++md5=$(md5 -q $TMPFILE)
+ echo md5sum before tune2fs $md5 >> $OUT
+ 
+ echo using tune2fs to test e2undo >> $OUT
+ $TUNE2FS -I 256 $TMPFILE  >> $OUT 2>&1
+-new_md5=$(md5sum $TMPFILE | cut -d " " -f 1)
++new_md5=$(md5 -q $TMPFILE)
+ echo md5sum after tune2fs $new_md5 >> $OUT
+ 
+ $E2UNDO_EXE  $TDB_FILE $TMPFILE  >> $OUT 2>&1
+-new_md5=$(md5sum $TMPFILE | cut -d " " -f 1)
++new_md5=$(md5 -q $TMPFILE)
+ echo md5sum after e2undo $new_md5 >> $OUT
+ 
+ if [ $md5 = $new_md5 ]; then
diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist
index 661a2725ac9e..830697ae66a9 100644
--- a/sysutils/e2fsprogs/pkg-plist
+++ b/sysutils/e2fsprogs/pkg-plist
@@ -11,9 +11,12 @@ sbin/dumpe2fs
 sbin/e2fsck
 sbin/e2image
 sbin/e2label
+sbin/e2undo
 sbin/findfs
 sbin/fsck.ext2
 sbin/fsck.ext3
+sbin/fsck.ext4
+sbin/fsck.ext4dev
 sbin/fsck_ext2fs
 @exec ln -f %D/sbin/e2fsck /sbin 2>/dev/null || cp -p %D/sbin/e2fsck /sbin
 @exec ln -f %D/sbin/fsck_ext2fs /sbin 2>/dev/null || cp -p %D/sbin/fsck_ext2fs /sbin
@@ -22,6 +25,8 @@ sbin/logsave
 sbin/mke2fs
 sbin/mkfs.ext2
 sbin/mkfs.ext3
+sbin/mkfs.ext4
+sbin/mkfs.ext4dev
 sbin/mklost+found
 sbin/resize2fs
 sbin/tune2fs