Attachment 100267 Details for Bug 139531 – e2fsprogs-1.41.9.patch

[patch] e2fsprogs-1.41.9.patch

e2fsprogs-1.41.9.patch (text/plain), 7.87 KB, created by Matthias Andree on 2009-10-11 22:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2009-10-11 22:20:02 UTC

Size: 7.87 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/Makefile /usr/home/mandree/ports/sysutils/e2fsprogs/Makefile
>--- /usr/ports/sysutils/e2fsprogs/Makefile	2009-08-24 20:45:23.000000000 +0200
>+++ /usr/home/mandree/ports/sysutils/e2fsprogs/Makefile	2009-10-11 23:08:41.000000000 +0200
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	e2fsprogs
>-PORTVERSION=	1.41.8
>+PORTVERSION=	1.41.9
> PORTREVISION?=	0
> CATEGORIES?=	sysutils
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
>@@ -35,7 +35,7 @@
> 		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
>+		findfs.8 blkid.8 logsave.8 fsck_ext2fs.8 e2freefrag.8
> PORTDOCS=	COPYING RELEASE-NOTES
> 
> post-extract:
>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/distinfo /usr/home/mandree/ports/sysutils/e2fsprogs/distinfo
>--- /usr/ports/sysutils/e2fsprogs/distinfo	2009-07-16 23:41:37.000000000 +0200
>+++ /usr/home/mandree/ports/sysutils/e2fsprogs/distinfo	2009-10-10 21:27:50.000000000 +0200
>@@ -1,3 +1,3 @@
>-MD5 (e2fsprogs-1.41.8.tar.gz) = 6708cc8e484809fc5cfb232882e48489
>-SHA256 (e2fsprogs-1.41.8.tar.gz) = 782c9f281ca970d176c61759465beec12b40c7793bb5fa52c8d9a61741e33801
>-SIZE (e2fsprogs-1.41.8.tar.gz) = 4436913
>+MD5 (e2fsprogs-1.41.9.tar.gz) = 52f60a9e19a02f142f5546f1b5681927
>+SHA256 (e2fsprogs-1.41.9.tar.gz) = cbf1e34261a16b3d7911b60b91290b19f2010036d6ba628d45b5f0b2af2b66e8
>+SIZE (e2fsprogs-1.41.9.tar.gz) = 4452610
>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c /usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c
>--- /usr/ports/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c	2008-09-23 10:18:45.000000000 +0200
>+++ /usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c	2009-10-11 23:13:15.000000000 +0200
>@@ -1,5 +1,5 @@
>---- 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
>+--- 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%
>   */
>@@ -9,7 +9,7 @@
>  #include <stdio.h>
>  #ifdef HAVE_STDLIB_H
>  #include <stdlib.h>
>-@@ -462,6 +462,24 @@
>+@@ -497,6 +495,24 @@
>  	return 0;
>  }
>  
>@@ -34,7 +34,7 @@
>  #define PATH_SET "PATH=/sbin"
>  
>  static void reserve_stdio_fds(void)
>-@@ -493,6 +511,17 @@
>+@@ -528,6 +544,17 @@
>  	ctx->progress = e2fsck_update_progress;
>  }
>  
>@@ -52,7 +52,7 @@
>  static void signal_progress_off(int sig EXT2FS_ATTR((unused)))
>  {
>  	e2fsck_t ctx = e2fsck_global_ctx;
>-@@ -830,6 +859,8 @@
>+@@ -847,6 +874,8 @@
>  	sigaction(SIGUSR1, &sa, 0);
>  	sa.sa_handler = signal_progress_off;
>  	sigaction(SIGUSR2, &sa, 0);
>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-configure /usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-configure
>--- /usr/ports/sysutils/e2fsprogs/files/patch-configure	2009-07-16 23:41:37.000000000 +0200
>+++ /usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
>@@ -1,20 +0,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
>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-intl_Makefile.in /usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-intl_Makefile.in
>--- /usr/ports/sysutils/e2fsprogs/files/patch-intl_Makefile.in	2009-07-16 23:41:37.000000000 +0200
>+++ /usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-intl_Makefile.in	1970-01-01 01:00:00.000000000 +0100
>@@ -1,25 +0,0 @@
>---- ./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
>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h /usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h
>--- /usr/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h	2008-02-13 00:07:35.000000000 +0100
>+++ /usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h	2009-10-11 23:13:53.000000000 +0200
>@@ -1,6 +1,6 @@
> --- a/lib/ext2fs/ext2_fs.h.orig	Sat Jun 30 16:36:37 2007
> +++ b/lib/ext2fs/ext2_fs.h	Sat Jun 30 16:36:43 2007
>-@@ -418,7 +418,7 @@
>+@@ -421,7 +421,7 @@
>  
>  #define i_size_high	i_dir_acl
>  
>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in /usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in
>--- /usr/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in	2009-07-16 23:41:37.000000000 +0200
>+++ /usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in	2009-10-11 23:10:04.000000000 +0200
>@@ -1,15 +1,15 @@
>---- a/misc/Makefile.in.orig	2009-07-11 21:25:17.000000000 +0200
>-+++ b/misc/Makefile.in	2009-07-15 15:56:29.000000000 +0200
>+--- 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 $(UUIDD_PROG)
>-+USPROGS=	mklost+found
>+-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 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
>-+			logsave.8 e2undo.8 @FSCK_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
>@@ -19,7 +19,7 @@
>  
>  LPROGS=		@E2INITRD_PROG@
>  
>-@@ -457,34 +457,9 @@
>+@@ -466,34 +466,9 @@
>  		echo "	INSTALL_DATA $(man5dir)/$$i"; \
>  		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
>  	done
>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-version.h /usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-version.h
>--- /usr/ports/sysutils/e2fsprogs/files/patch-version.h	2009-07-16 23:41:37.000000000 +0200
>+++ /usr/home/mandree/ports/sysutils/e2fsprogs/files/patch-version.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,8 +0,0 @@
>---- ./version.h~	2009-07-11 23:24:37.000000000 +0200
>-+++ ./version.h	2009-07-15 16:47:11.000000000 +0200
>-@@ -8,4 +8,4 @@
>-  */
>- 
>- #define E2FSPROGS_VERSION "1.41.8"
>--#define E2FSPROGS_DATE "11-July-2009"
>-+#define E2FSPROGS_DATE "11-Jul-2009"
>diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/pkg-plist /usr/home/mandree/ports/sysutils/e2fsprogs/pkg-plist
>--- /usr/ports/sysutils/e2fsprogs/pkg-plist	2009-04-26 00:25:12.000000000 +0200
>+++ /usr/home/mandree/ports/sysutils/e2fsprogs/pkg-plist	2009-10-11 23:08:50.000000000 +0200
>@@ -5,6 +5,7 @@
> sbin/blkid
> sbin/debugfs
> sbin/dumpe2fs
>+sbin/e2freefrag
> sbin/e2fsck
> sbin/e2image
> sbin/e2label

Actions: View | Diff

Attachments on bug 139531: 100267 | 100268