Attachment #86718 for bug #123198

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




#

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

MAINTAINER?=	matthias.andree@gmx.de
COMMENT?=	Utilities & library to manipulate ext2/ext3/ext4 filesystems

PATCH_STRIP=	-p1
USE_LDCONFIG=	yes

Lines 1-3 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/distinfo (-3 / +3 lines)
1	MD5 (e2fsprogs-1.40.8.tar.gz) = 450e2fb2461b2296fec770ff8fc147ed	1	MD5 (e2fsprogs-1.40.9.tar.gz) = 3b785d2cbe374818ca3f89a5cdb6144f
2	SHA256 (e2fsprogs-1.40.8.tar.gz) = 38df70f8b5ba121b11b02101cc399306a199d3c66c8185d8a2c0d07f5688eead	2	SHA256 (e2fsprogs-1.40.9.tar.gz) = ab6852230dcb30d75f640125a5d0c7b496bbc31502afdb76528e3bcd4089c9e4
3	SIZE (e2fsprogs-1.40.8.tar.gz) = 4102707	3	SIZE (e2fsprogs-1.40.9.tar.gz) = 4092812




--- a/e2fsck/unix.c.orig	2008-04-23 20:56:25.000000000 +0200
+++ b/e2fsck/unix.c	2008-04-29 09:05:01.000000000 +0200
@@ -462,6 +462,24 @@
 	return 0;
 }
 

 
 static void reserve_stdio_fds(void)
@@ -493,6 +511,17 @@
 	ctx->progress = e2fsck_update_progress;
 }
 
+static void signal_progress_now(int sig EXT2FS_ATTR((unused)))

 static void signal_progress_off(int sig EXT2FS_ATTR((unused)))
 {
 	e2fsck_t ctx = e2fsck_global_ctx;
@@ -830,6 +859,8 @@
 	sigaction(SIGUSR1, &sa, 0);
 	sa.sa_handler = signal_progress_off;
 	sigaction(SIGUSR2, &sa, 0);




--- a/configure.orig	Thu Jun  8 15:30:16 2006
+++ b/configure	Thu Jun  8 15:30:34 2006
@@ -9045,7 +9045,7 @@
 
 
 

 stdlib.h string.h unistd.h sys/param.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -15105,7 +15105,7 @@
 fi
 { echo "$as_me:$LINENO: checking for unified diff option" >&5
 echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6; }
-if diff -u $0 $0 >& /dev/null ; then
+if diff -u $0 $0 >/dev/null 2>&1 ; then
    UNI_DIFF_OPTS=-u
 else
    UNI_DIFF_OPTS=-c

Lines 19-25 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in (-1 / +1 lines)
19		19
20	LPROGS= @E2INITRD_PROG@	20	LPROGS= @E2INITRD_PROG@
21		21
22	@@ -311,11 +310,9 @@	22	@@ -315,11 +314,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

Lines 1-3 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/pkg-descr (-1 / +1 lines)
1	Set of utilities and library to manipulate an ext2 or ext3 filesystem.	1	Set of utilities and library to manipulate an ext2, ext3 or ext4 filesystem.
2		2
3	WWW: http://e2fsprogs.sourceforge.net/	3	WWW: http://e2fsprogs.sourceforge.net/

Return to bug 123198

Lines 6-19 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= e2fsprogs	8	PORTNAME= e2fsprogs
9	PORTVERSION= 1.40.8	9	PORTVERSION= 1.40.9
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}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
14		14
15	MAINTAINER?= matthias.andree@gmx.de	15	MAINTAINER?= matthias.andree@gmx.de
16	COMMENT?= Utilities and library to manipulate ext2/ext3 filesystems	16	COMMENT?= Utilities & library to manipulate ext2/ext3/ext4 filesystems
17		17
18	PATCH_STRIP= -p1	18	PATCH_STRIP= -p1
19	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes

Lines 1-6 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c (-5 / +5 lines)
1	--- e2fsprogs-1.35/e2fsck/unix.c~ Sun Dec 7 18:11:38 2003	1	--- a/e2fsck/unix.c.orig 2008-04-23 20:56:25.000000000 +0200
2	+++ e2fsprogs-1.35/e2fsck/unix.c Tue Feb 24 22:13:52 2004	2	+++ b/e2fsck/unix.c 2008-04-29 09:05:01.000000000 +0200
3	@@ -461,6 +461,24 @@	3	@@ -462,6 +462,24 @@
4	return 0;	4	return 0;
5	}	5	}
6		6
Lines 26-32 Link Here
26		26
27	static void reserve_stdio_fds(void)	27	static void reserve_stdio_fds(void)
28	@@ -493,6 +511,17 @@	28	@@ -493,6 +511,17 @@
29	ctx->progress_fd = 0;	29	ctx->progress = e2fsck_update_progress;
30	}	30	}
31		31
32	+static void signal_progress_now(int sig EXT2FS_ATTR((unused)))	32	+static void signal_progress_now(int sig EXT2FS_ATTR((unused)))
Lines 43-49 Link Here
43	static void signal_progress_off(int sig EXT2FS_ATTR((unused)))	43	static void signal_progress_off(int sig EXT2FS_ATTR((unused)))
44	{	44	{
45	e2fsck_t ctx = e2fsck_global_ctx;	45	e2fsck_t ctx = e2fsck_global_ctx;
46	@@ -825,6 +854,8 @@	46	@@ -830,6 +859,8 @@
47	sigaction(SIGUSR1, &sa, 0);	47	sigaction(SIGUSR1, &sa, 0);
48	sa.sa_handler = signal_progress_off;	48	sa.sa_handler = signal_progress_off;
49	sigaction(SIGUSR2, &sa, 0);	49	sigaction(SIGUSR2, &sa, 0);

Lines 1-6 Link Here

(-)/usr/home/emma/ports/sysutils/e2fsprogs/files/patch-configure (-10 / +1 lines)
1	--- a/configure.orig Thu Jun 8 15:30:16 2006	1	--- a/configure.orig Thu Jun 8 15:30:16 2006
2	+++ b/configure Thu Jun 8 15:30:34 2006	2	+++ b/configure Thu Jun 8 15:30:34 2006
3	@@ -9044,7 +9044,7 @@	3	@@ -9045,7 +9045,7 @@
4		4
5		5
6		6
Lines 9-20 Link Here
9	stdlib.h string.h unistd.h sys/param.h	9	stdlib.h string.h unistd.h sys/param.h
10	do	10	do
11	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`	11	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
12	@@ -15105,7 +15105,7 @@
13	fi
14	{ echo "$as_me:$LINENO: checking for unified diff option" >&5
15	echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6; }
16	-if diff -u $0 $0 >& /dev/null ; then
17	+if diff -u $0 $0 >/dev/null 2>&1 ; then
18	UNI_DIFF_OPTS=-u
19	else
20	UNI_DIFF_OPTS=-c