Attachment #88730 for bug #125561

View | Details | Raw Unified | Return to bug 125561
Collapse All | Expand All




#

PORTNAME=	e2fsprogs
PORTVERSION=	1.41.0
PORTREVISION?=	0
CATEGORIES?=	sysutils
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}

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 \

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 \
	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:

# 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 \
		&& ${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"

	    echo 'FAIL' ; echo '===>  e2fsck depends on:' ; echo "$$a" ; exit 1 ; fi
# Update translation binary files
.if !defined(WITHOUT_NLS)
	cd ${WRKSRC}/po && ${GMAKE} update-gmo
.endif
# Build fsck(8) wrapper
	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s ${LIBS} \

# 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 && ${GMAKE} check \
	    || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; }

post-install:

Lines 1-3 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/distinfo (-3 / +3 lines)
1	MD5 (e2fsprogs-1.40.11.tar.gz) = 004cea70d724fdc7f1a952dffe4c9db8	1	MD5 (e2fsprogs-1.41.0.tar.gz) = 83144fa7e0e63647f920b77650ea1836
2	SHA256 (e2fsprogs-1.40.11.tar.gz) = 3eeb0c3513b3b251f5d51ec3413bc77e3a21cb8bc84a1979022a67fe733c897b	2	SHA256 (e2fsprogs-1.41.0.tar.gz) = db02fb36dae963eda7e8d8c11d1e178e5992f53893c5f0e76493d412758a1675
3	SIZE (e2fsprogs-1.40.11.tar.gz) = 4116013	3	SIZE (e2fsprogs-1.41.0.tar.gz) = 4260246




# 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);




--- 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@ 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 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
+			logsave.8 e2undo.8 @FSCK_MAN@
 FMANPAGES=	mke2fs.conf.5
 
-UPROGS=		chattr lsattr uuidgen

 
 LPROGS=		@E2INITRD_PROG@
 
@@ -337,11 +337,9 @@
 		echo "	INSTALL_DATA $(man5dir)/$$i"; \
 		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
 	done




--- 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

Lines 11-19 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/pkg-plist (+5 lines)
11	sbin/e2fsck	11	sbin/e2fsck
12	sbin/e2image	12	sbin/e2image
13	sbin/e2label	13	sbin/e2label
		14	sbin/e2undo
14	sbin/findfs	15	sbin/findfs
15	sbin/fsck.ext2	16	sbin/fsck.ext2
16	sbin/fsck.ext3	17	sbin/fsck.ext3
		18	sbin/fsck.ext4
		19	sbin/fsck.ext4dev
17	sbin/fsck_ext2fs	20	sbin/fsck_ext2fs
18	@exec ln -f %D/sbin/e2fsck /sbin 2>/dev/null \|\| cp -p %D/sbin/e2fsck /sbin	21	@exec ln -f %D/sbin/e2fsck /sbin 2>/dev/null \|\| cp -p %D/sbin/e2fsck /sbin
19	@exec ln -f %D/sbin/fsck_ext2fs /sbin 2>/dev/null \|\| cp -p %D/sbin/fsck_ext2fs /sbin	22	@exec ln -f %D/sbin/fsck_ext2fs /sbin 2>/dev/null \|\| cp -p %D/sbin/fsck_ext2fs /sbin
Lines 22-27 Link Here
22	sbin/mke2fs	25	sbin/mke2fs
23	sbin/mkfs.ext2	26	sbin/mkfs.ext2
24	sbin/mkfs.ext3	27	sbin/mkfs.ext3
		28	sbin/mkfs.ext4
		29	sbin/mkfs.ext4dev
25	sbin/mklost+found	30	sbin/mklost+found
26	sbin/resize2fs	31	sbin/resize2fs
27	sbin/tune2fs	32	sbin/tune2fs

Return to bug 125561

Lines 6-12 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/Makefile (-6 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= e2fsprogs	8	PORTNAME= e2fsprogs
9	PORTVERSION= 1.40.11	9	PORTVERSION= 1.41.0
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	CATEGORIES?= sysutils	11	CATEGORIES?= sysutils
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
Lines 16-21 Link Here
16	COMMENT?= Utilities & library to manipulate ext2/3/4 filesystems	16	COMMENT?= Utilities & library to manipulate ext2/3/4 filesystems
17		17
18	PATCH_STRIP= -p1	18	PATCH_STRIP= -p1
		19	USE_GMAKE= yes
19	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
20	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
21	CONFIGURE_ARGS+=--disable-fsck --disable-e2initrd-helper \	22	CONFIGURE_ARGS+=--disable-fsck --disable-e2initrd-helper \
Lines 32-39 Link Here
32	MAN1= chattr.1 lsattr.1	33	MAN1= chattr.1 lsattr.1
33	MAN5= e2fsck.conf.5 mke2fs.conf.5	34	MAN5= e2fsck.conf.5 mke2fs.conf.5
34	MAN8= badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 \	35	MAN8= badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 \
35	mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \	36	e2undo.8 mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \
36	fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8 \	37	fsck.ext2.8 fsck.ext3.8 fsck.ext4.8 fsck.ext4dev.8 \
		38	mkfs.ext2.8 mkfs.ext3.8 mkfs.ext4.8 mkfs.ext4dev.8 \
37	findfs.8 blkid.8 logsave.8 fsck_ext2fs.8	39	findfs.8 blkid.8 logsave.8 fsck_ext2fs.8
38		40
39	post-extract:	41	post-extract:
Lines 65-71 Link Here
65	# else we're in trouble if e2fsck is needed for boot:	67	# else we're in trouble if e2fsck is needed for boot:
66	# (we don't use e2fsck.static, since we can link libc.so dynamically)	68	# (we don't use e2fsck.static, since we can link libc.so dynamically)
67	cd ${WRKSRC}/e2fsck && ${RM} -f e2fsck \	69	cd ${WRKSRC}/e2fsck && ${RM} -f e2fsck \
68	&& ${MAKE} e2fsck \	70	&& ${GMAKE} e2fsck \
69	STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \	71	STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
70	../lib/libblkid.a ../lib/libuuid.a" \	72	../lib/libblkid.a ../lib/libuuid.a" \
71	LIBINTL="${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"	73	LIBINTL="${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
Lines 81-87 Link Here
81	echo 'FAIL' ; echo '===> e2fsck depends on:' ; echo "$$a" ; exit 1 ; fi	83	echo 'FAIL' ; echo '===> e2fsck depends on:' ; echo "$$a" ; exit 1 ; fi
82	# Update translation binary files	84	# Update translation binary files
83	.if !defined(WITHOUT_NLS)	85	.if !defined(WITHOUT_NLS)
84	cd ${WRKSRC}/po && ${MAKE} update-gmo	86	cd ${WRKSRC}/po && ${GMAKE} update-gmo
85	.endif	87	.endif
86	# Build fsck(8) wrapper	88	# Build fsck(8) wrapper
87	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s ${LIBS} \	89	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s ${LIBS} \
Lines 94-100 Link Here
94	# There have been subtle failures induced by Linux-isms in the past.	96	# There have been subtle failures induced by Linux-isms in the past.
95	# -- Matthias Andree, package maintainer, 2007-09-18	97	# -- Matthias Andree, package maintainer, 2007-09-18
96	@${ECHO_CMD} '===> Running e2fsprogs self-test suite'	98	@${ECHO_CMD} '===> Running e2fsprogs self-test suite'
97	cd ${WRKSRC}/tests && ${MAKE} check \	99	cd ${WRKSRC}/tests && ${GMAKE} check \
98	\|\| { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; }	100	\|\| { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; }
99		101
100	post-install:	102	post-install:

Lines 1-16 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_bitmaps.c (-16 lines)
1	# To fix bitops related crash
2	# patch provided by Ted Ts'o to Frantisek Holop (OpenBSD porter)
3
4	diff --git a/lib/ext2fs/bitmaps.c b/lib/ext2fs/bitmaps.c
5	index 696baad..843a75f 100644
6	--- a/lib/ext2fs/bitmaps.c
7	+++ b/lib/ext2fs/bitmaps.c
8	@@ -56,7 +56,7 @@ static errcode_t make_bitmap(__u32 start, __u32 end, __u32 real_end,
9	} else
10	bitmap->description = 0;
11
12	- size = (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1);
13	+ size = (size_t) (((bitmap->real_end - bitmap->start) / 8) + 2);
14	retval = ext2fs_get_mem(size, &bitmap->bitmap);
15	if (retval) {
16	ext2fs_free_mem(&bitmap->description);

Lines 1-15 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in (-6 / +6 lines)
1	--- a/misc/Makefile.in.orig Tue Jan 1 04:35:42 2008	1	--- a/misc/Makefile.in.orig 2008-06-18 05:53:42.000000000 +0200
2	+++ b/misc/Makefile.in Sun Jan 13 10:46:31 2008	2	+++ b/misc/Makefile.in 2008-07-13 12:55:25.000000000 +0200
3	@@ -19,14 +19,14 @@	3	@@ -19,14 +19,14 @@
4		4
5	SPROGS= mke2fs badblocks tune2fs dumpe2fs blkid logsave \	5	SPROGS= mke2fs badblocks tune2fs dumpe2fs blkid logsave \
6	$(E2IMAGE_PROG) @FSCK_PROG@	6	$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
7	-USPROGS= mklost+found filefrag $(UUIDD_PROG)	7	-USPROGS= mklost+found filefrag $(UUIDD_PROG)
8	+USPROGS= mklost+found	8	+USPROGS= mklost+found
9	SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \	9	SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
10	e2label.8 findfs.8 blkid.8 $(E2IMAGE_MAN) \	10	e2label.8 findfs.8 blkid.8 $(E2IMAGE_MAN) \
11	- logsave.8 filefrag.8 $(UUIDD_MAN) @FSCK_MAN@	11	- logsave.8 filefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
12	+ logsave.8 @FSCK_MAN@	12	+ logsave.8 e2undo.8 @FSCK_MAN@
13	FMANPAGES= mke2fs.conf.5	13	FMANPAGES= mke2fs.conf.5
14		14
15	-UPROGS= chattr lsattr uuidgen	15	-UPROGS= chattr lsattr uuidgen
Lines 19-25 Link Here
19		19
20	LPROGS= @E2INITRD_PROG@	20	LPROGS= @E2INITRD_PROG@
21		21
22	@@ -315,11 +314,9 @@	22	@@ -337,11 +337,9 @@
23	echo " INSTALL_DATA $(man5dir)/$$i"; \	23	echo " INSTALL_DATA $(man5dir)/$$i"; \
24	$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \	24	$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
25	done	25	done

Line 0 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-tests-md5sum (+44 lines)
	1	--- a/tests/u_mke2fs/script.orig 2008-06-18 05:53:42.000000000 +0200
	2	+++ b/tests/u_mke2fs/script 2008-07-13 13:31:23.000000000 +0200
	3	@@ -10,16 +10,16 @@
	4
	5	echo mke2fs -q -F -o Linux -b 1024 test.img > $OUT
	6	$MKE2FS -F -o Linux -I 128 -b 1024 $TMPFILE >> $OUT 2>&1
	7	-md5=$(md5sum $TMPFILE \| cut -d " " -f 1)
	8	+md5=$(md5 -q $TMPFILE)
	9	echo md5sum before mke2fs $md5 >> $OUT
	10
	11	echo using mke2fs to test e2undo >> $OUT
	12	$MKE2FS -q -F -o Linux -I 256 -O uninit_bg -E lazy_itable_init=1 -b 1024 $TMPFILE >> $OUT 2>&1
	13	-new_md5=$(md5sum $TMPFILE \| cut -d " " -f 1)
	14	+new_md5=$(md5 -q $TMPFILE)
	15	echo md5sum after mke2fs $new_md5 >> $OUT
	16
	17	$E2UNDO_EXE $TDB_FILE $TMPFILE >> $OUT 2>&1
	18	-new_md5=$(md5sum $TMPFILE \| cut -d " " -f 1)
	19	+new_md5=$(md5 -q $TMPFILE)
	20	echo md5sum after e2undo $new_md5 >> $OUT
	21
	22	if [ $md5 = $new_md5 ]; then
	23	--- a/tests/u_tune2fs/script.orig 2008-06-18 05:53:42.000000000 +0200
	24	+++ b/tests/u_tune2fs/script 2008-07-13 13:32:10.000000000 +0200
	25	@@ -10,16 +10,16 @@
	26
	27	echo mke2fs -q -F -o Linux -b 1024 $TMPFILE > $OUT
	28	$MKE2FS -q -F -o Linux -I 128 -b 1024 $TMPFILE >> $OUT 2>&1
	29	-md5=$(md5sum $TMPFILE \| cut -d " " -f 1)
	30	+md5=$(md5 -q $TMPFILE)
	31	echo md5sum before tune2fs $md5 >> $OUT
	32
	33	echo using tune2fs to test e2undo >> $OUT
	34	$TUNE2FS -I 256 $TMPFILE >> $OUT 2>&1
	35	-new_md5=$(md5sum $TMPFILE \| cut -d " " -f 1)
	36	+new_md5=$(md5 -q $TMPFILE)
	37	echo md5sum after tune2fs $new_md5 >> $OUT
	38
	39	$E2UNDO_EXE $TDB_FILE $TMPFILE >> $OUT 2>&1
	40	-new_md5=$(md5sum $TMPFILE \| cut -d " " -f 1)
	41	+new_md5=$(md5 -q $TMPFILE)
	42	echo md5sum after e2undo $new_md5 >> $OUT
	43
	44	if [ $md5 = $new_md5 ]; then