Attachment #100267 for bug #139531

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

Lines 6-12 Link Here

(-)/usr/home/mandree/ports/sysutils/e2fsprogs/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= e2fsprogs	8	PORTNAME= e2fsprogs
9	PORTVERSION= 1.41.8	9	PORTVERSION= 1.41.9
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	CATEGORIES?= sysutils	11	CATEGORIES?= sysutils
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}	12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
Lines 35-41 Link Here
35	e2undo.8 mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \	35	e2undo.8 mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \
36	fsck.ext2.8 fsck.ext3.8 fsck.ext4.8 fsck.ext4dev.8 \	36	fsck.ext2.8 fsck.ext3.8 fsck.ext4.8 fsck.ext4dev.8 \
37	mkfs.ext2.8 mkfs.ext3.8 mkfs.ext4.8 mkfs.ext4dev.8 \	37	mkfs.ext2.8 mkfs.ext3.8 mkfs.ext4.8 mkfs.ext4dev.8 \
38	findfs.8 blkid.8 logsave.8 fsck_ext2fs.8	38	findfs.8 blkid.8 logsave.8 fsck_ext2fs.8 e2freefrag.8
39	PORTDOCS= COPYING RELEASE-NOTES	39	PORTDOCS= COPYING RELEASE-NOTES
40		40
41	post-extract:	41	post-extract:

Lines 1-3 Link Here

(-)/usr/home/mandree/ports/sysutils/e2fsprogs/distinfo (-3 / +3 lines)
1	MD5 (e2fsprogs-1.41.8.tar.gz) = 6708cc8e484809fc5cfb232882e48489	1	MD5 (e2fsprogs-1.41.9.tar.gz) = 52f60a9e19a02f142f5546f1b5681927
2	SHA256 (e2fsprogs-1.41.8.tar.gz) = 782c9f281ca970d176c61759465beec12b40c7793bb5fa52c8d9a61741e33801	2	SHA256 (e2fsprogs-1.41.9.tar.gz) = cbf1e34261a16b3d7911b60b91290b19f2010036d6ba628d45b5f0b2af2b66e8
3	SIZE (e2fsprogs-1.41.8.tar.gz) = 4436913	3	SIZE (e2fsprogs-1.41.9.tar.gz) = 4452610




--- a/e2fsck/unix.c.orig	2009-08-23 04:44:35.000000000 +0200
+++ b/e2fsck/unix.c	2009-10-11 23:12:39.000000000 +0200
@@ -9,8 +9,6 @@
  * %End-Header%
  */

 #include <stdio.h>
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -497,6 +495,24 @@
 	return 0;
 }
 

 #define PATH_SET "PATH=/sbin"
 
 static void reserve_stdio_fds(void)
@@ -528,6 +544,17 @@
 	ctx->progress = e2fsck_update_progress;
 }
 

 static void signal_progress_off(int sig EXT2FS_ATTR((unused)))
 {
 	e2fsck_t ctx = e2fsck_global_ctx;
@@ -847,6 +874,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 @@
 
 
 
-for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+for ac_header in argz.h limits.h locale.h nl_types.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -16592,7 +16592,7 @@
 	lib/e2p/e2p.pc lib/blkid/blkid.pc lib/ext2fs/ext2fs.pc \
 	misc/Makefile ext2ed/Makefile e2fsck/Makefile \
 	debugfs/Makefile tests/Makefile tests/progs/Makefile \
-	resize/Makefile doc/Makefile intl/Makefile po/Makefile.in ; do
+	resize/Makefile doc/Makefile intl/Makefile intl/libgnuintl.h po/Makefile.in ; do
 	if test -d `dirname ${srcdir}/$i` ; then
 		outlist="$outlist $i"
 	fi




--- ./intl/Makefile.in.orig	2009-07-02 04:46:40.000000000 +0200
+++ ./intl/Makefile.in	2009-07-15 16:36:29.000000000 +0200
@@ -43,6 +43,22 @@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
+@SET_MAKE@
+
+@ifGNUmake@ V =
+@ifGNUmake@ ifeq ($(strip $(V)),)
+@ifGNUmake@ #  E = @echo
+@ifGNUmake@ #  Q = @
+@ifGNUmake@    E = @E@
+@ifGNUmake@    Q = @Q@
+@ifGNUmake@ else
+@ifGNUmake@    E = @\#
+@ifGNUmake@    Q =
+@ifGNUmake@ endif
+
+@ifNotGNUmake@ E = @E@
+@ifNotGNUmake@ Q = @Q@
+
 l = @INTL_LIBTOOL_SUFFIX_PREFIX@
 
 AR = ar

Lines 1-6 Link Here

(-)/usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h (-1 / +1 lines)
1	--- a/lib/ext2fs/ext2_fs.h.orig Sat Jun 30 16:36:37 2007	1	--- a/lib/ext2fs/ext2_fs.h.orig Sat Jun 30 16:36:37 2007
2	+++ b/lib/ext2fs/ext2_fs.h Sat Jun 30 16:36:43 2007	2	+++ b/lib/ext2fs/ext2_fs.h Sat Jun 30 16:36:43 2007
3	@@ -418,7 +418,7 @@	3	@@ -421,7 +421,7 @@
4		4
5	#define i_size_high i_dir_acl	5	#define i_size_high i_dir_acl
6		6




--- a/misc/Makefile.in.orig	2009-08-23 04:44:35.000000000 +0200
+++ b/misc/Makefile.in	2009-10-11 23:07:27.000000000 +0200
@@ -25,14 +25,14 @@
 
 SPROGS=		mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
 			$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
-USPROGS=	mklost+found filefrag e2freefrag $(UUIDD_PROG)
+USPROGS=	mklost+found e2freefrag
 SMANPAGES=	tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
 			e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \
-			logsave.8 filefrag.8 e2freefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
+			logsave.8 e2freefrag.8 e2undo.8 @FSCK_MAN@
 FMANPAGES=	mke2fs.conf.5
 
-UPROGS=		chattr lsattr @UUID_CMT@ uuidgen

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

Lines 1-8 Link Here

(-)/usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-version.h (-8 lines)
1	--- ./version.h~ 2009-07-11 23:24:37.000000000 +0200
2	+++ ./version.h 2009-07-15 16:47:11.000000000 +0200
3	@@ -8,4 +8,4 @@
4	*/
5
6	#define E2FSPROGS_VERSION "1.41.8"
7	-#define E2FSPROGS_DATE "11-July-2009"
8	+#define E2FSPROGS_DATE "11-Jul-2009"

Lines 5-10 Link Here

(-)/usr/home/mandree/ports/sysutils/e2fsprogs/pkg-plist (+1 lines)
5	sbin/blkid	5	sbin/blkid
6	sbin/debugfs	6	sbin/debugfs
7	sbin/dumpe2fs	7	sbin/dumpe2fs
		8	sbin/e2freefrag
8	sbin/e2fsck	9	sbin/e2fsck
9	sbin/e2image	10	sbin/e2image
10	sbin/e2label	11	sbin/e2label

Return to bug 139531

Lines 1-5 Link Here

(-)/usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c (-5 / +5 lines)
1	--- a/e2fsck/unix.c.orig 2008-04-23 20:56:25.000000000 +0200	1	--- a/e2fsck/unix.c.orig 2009-08-23 04:44:35.000000000 +0200
2	+++ b/e2fsck/unix.c 2008-04-29 09:05:01.000000000 +0200	2	+++ b/e2fsck/unix.c 2009-10-11 23:12:39.000000000 +0200
3	@@ -9,8 +9,6 @@	3	@@ -9,8 +9,6 @@
4	* %End-Header%	4	* %End-Header%
5	*/	5	*/
Lines 9-15 Link Here
9	#include <stdio.h>	9	#include <stdio.h>
10	#ifdef HAVE_STDLIB_H	10	#ifdef HAVE_STDLIB_H
11	#include <stdlib.h>	11	#include <stdlib.h>
12	@@ -462,6 +462,24 @@	12	@@ -497,6 +495,24 @@
13	return 0;	13	return 0;
14	}	14	}
15		15
Lines 34-40 Link Here
34	#define PATH_SET "PATH=/sbin"	34	#define PATH_SET "PATH=/sbin"
35		35
36	static void reserve_stdio_fds(void)	36	static void reserve_stdio_fds(void)
37	@@ -493,6 +511,17 @@	37	@@ -528,6 +544,17 @@
38	ctx->progress = e2fsck_update_progress;	38	ctx->progress = e2fsck_update_progress;
39	}	39	}
40		40
Lines 52-58 Link Here
52	static void signal_progress_off(int sig EXT2FS_ATTR((unused)))	52	static void signal_progress_off(int sig EXT2FS_ATTR((unused)))
53	{	53	{
54	e2fsck_t ctx = e2fsck_global_ctx;	54	e2fsck_t ctx = e2fsck_global_ctx;
55	@@ -830,6 +859,8 @@	55	@@ -847,6 +874,8 @@
56	sigaction(SIGUSR1, &sa, 0);	56	sigaction(SIGUSR1, &sa, 0);
57	sa.sa_handler = signal_progress_off;	57	sa.sa_handler = signal_progress_off;
58	sigaction(SIGUSR2, &sa, 0);	58	sigaction(SIGUSR2, &sa, 0);

Lines 1-20 Link Here

(-)/usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-configure (-20 lines)
1	--- a/configure.orig Thu Jun 8 15:30:16 2006
2	+++ b/configure Thu Jun 8 15:30:34 2006
3	@@ -9045,7 +9045,7 @@
4
5
6
7	-for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
8	+for ac_header in argz.h limits.h locale.h nl_types.h stddef.h \
9	stdlib.h string.h unistd.h sys/param.h
10	do
11	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
12	@@ -16592,7 +16592,7 @@
13	lib/e2p/e2p.pc lib/blkid/blkid.pc lib/ext2fs/ext2fs.pc \
14	misc/Makefile ext2ed/Makefile e2fsck/Makefile \
15	debugfs/Makefile tests/Makefile tests/progs/Makefile \
16	- resize/Makefile doc/Makefile intl/Makefile po/Makefile.in ; do
17	+ resize/Makefile doc/Makefile intl/Makefile intl/libgnuintl.h po/Makefile.in ; do
18	if test -d `dirname ${srcdir}/$i` ; then
19	outlist="$outlist $i"
20	fi

Lines 1-25 Link Here

(-)/usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-intl_Makefile.in (-25 lines)
1	--- ./intl/Makefile.in.orig 2009-07-02 04:46:40.000000000 +0200
2	+++ ./intl/Makefile.in 2009-07-15 16:36:29.000000000 +0200
3	@@ -43,6 +43,22 @@
4	MKINSTALLDIRS = @MKINSTALLDIRS@
5	mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
6
7	+@SET_MAKE@
8	+
9	+@ifGNUmake@ V =
10	+@ifGNUmake@ ifeq ($(strip $(V)),)
11	+@ifGNUmake@ # E = @echo
12	+@ifGNUmake@ # Q = @
13	+@ifGNUmake@ E = @E@
14	+@ifGNUmake@ Q = @Q@
15	+@ifGNUmake@ else
16	+@ifGNUmake@ E = @\#
17	+@ifGNUmake@ Q =
18	+@ifGNUmake@ endif
19	+
20	+@ifNotGNUmake@ E = @E@
21	+@ifNotGNUmake@ Q = @Q@
22	+
23	l = @INTL_LIBTOOL_SUFFIX_PREFIX@
24
25	AR = ar

Lines 1-15 Link Here

(-)/usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in (-7 / +7 lines)
1	--- a/misc/Makefile.in.orig 2009-07-11 21:25:17.000000000 +0200	1	--- a/misc/Makefile.in.orig 2009-08-23 04:44:35.000000000 +0200
2	+++ b/misc/Makefile.in 2009-07-15 15:56:29.000000000 +0200	2	+++ b/misc/Makefile.in 2009-10-11 23:07:27.000000000 +0200
3	@@ -25,14 +25,14 @@	3	@@ -25,14 +25,14 @@
4		4
5	SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \	5	SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
6	$(E2IMAGE_PROG) @FSCK_PROG@ e2undo	6	$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
7	-USPROGS= mklost+found filefrag $(UUIDD_PROG)	7	-USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG)
8	+USPROGS= mklost+found	8	+USPROGS= mklost+found e2freefrag
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_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \	10	e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \
11	- logsave.8 filefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@	11	- logsave.8 filefrag.8 e2freefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
12	+ logsave.8 e2undo.8 @FSCK_MAN@	12	+ logsave.8 e2freefrag.8 e2undo.8 @FSCK_MAN@
13	FMANPAGES= mke2fs.conf.5	13	FMANPAGES= mke2fs.conf.5
14		14
15	-UPROGS= chattr lsattr @UUID_CMT@ uuidgen	15	-UPROGS= chattr lsattr @UUID_CMT@ uuidgen
Lines 19-25 Link Here
19		19
20	LPROGS= @E2INITRD_PROG@	20	LPROGS= @E2INITRD_PROG@
21		21
22	@@ -457,34 +457,9 @@	22	@@ -466,34 +466,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