10 files changed, 61 insertions, 71 deletions

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 05fbf54462a1..8b54a0862e5e 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -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 @@ 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
+		findfs.8 blkid.8 logsave.8 fsck_ext2fs.8 e2freefrag.8
 PORTDOCS=	COPYING RELEASE-NOTES
 
 post-extract:
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index eae5f7ef6ad9..49391a883fe6 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -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 --git a/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c b/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c
index 3bc9b7c351b4..eb3ef48d2da7 100644
--- a/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c
+++ b/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c
@@ -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 --git a/sysutils/e2fsprogs/files/patch-configure b/sysutils/e2fsprogs/files/patch-configure
deleted file mode 100644
index 7f0792aebceb..000000000000
--- a/sysutils/e2fsprogs/files/patch-configure
+++ /dev/null
@@ -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 --git a/sysutils/e2fsprogs/files/patch-intl_Makefile.in b/sysutils/e2fsprogs/files/patch-intl_Makefile.in
deleted file mode 100644
index 2dc7b72e2688..000000000000
--- a/sysutils/e2fsprogs/files/patch-intl_Makefile.in
+++ /dev/null
@@ -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 --git a/sysutils/e2fsprogs/files/patch-lib-uuid-gen_uuid.c b/sysutils/e2fsprogs/files/patch-lib-uuid-gen_uuid.c
new file mode 100644
index 000000000000..e605a1f1b868
--- /dev/null
+++ b/sysutils/e2fsprogs/files/patch-lib-uuid-gen_uuid.c
@@ -0,0 +1,42 @@
+This patch contributed by Douglas William Thrift to enable libuuid to
+obtain the ethernet hardware address.
+
+--- ./lib/uuid/gen_uuid.c.orig	2009-06-30 20:41:09.000000000 -0700
++++ ./lib/uuid/gen_uuid.c	2009-07-28 06:46:12.380950940 -0700
+@@ -89,6 +89,7 @@
+ #ifdef HAVE_SYS_RESOURCE_H
+ #include <sys/resource.h>
+ #endif
++#include <ifaddrs.h>
+ 
+ #include "uuidP.h"
+ #include "uuidd.h"
+@@ -295,6 +296,28 @@
+ 		}
+ 	}
+ 	close(sd);
++#else
++	struct ifaddrs *ifaddrsp, *ifaddrp;
++	unsigned char 	*a;
++
++	if (getifaddrs(&ifaddrsp) < 0)
++		return -1;
++	for (ifaddrp = ifaddrsp; ifaddrp != NULL; ifaddrp = ifaddrp->ifa_next)
++	{
++		if (ifaddrp->ifa_addr == NULL)
++			continue;
++		if (ifaddrp->ifa_addr->sa_family != AF_LINK)
++			continue;
++		a = LLADDR((struct sockaddr_dl *)ifaddrp->ifa_addr);
++		if (!a[0] && !a[1] && !a[2] && !a[3] && !a[4] && !a[5])
++			continue;
++		if (node_id) {
++			memcpy(node_id, a, 6);
++			freeifaddrs(ifaddrsp);
++			return 1;
++		}
++	}
++	freeifaddrs(ifaddrsp);
+ #endif
+ 	return 0;
+ }
diff --git a/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h b/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h
index 4c6667079709..6c7a76bede6d 100644
--- a/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h
+++ b/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h
@@ -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 --git a/sysutils/e2fsprogs/files/patch-misc_Makefile.in b/sysutils/e2fsprogs/files/patch-misc_Makefile.in
index 5d45b8a77a75..adf881eca57c 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	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 --git a/sysutils/e2fsprogs/files/patch-version.h b/sysutils/e2fsprogs/files/patch-version.h
deleted file mode 100644
index fb1cee2685ee..000000000000
--- a/sysutils/e2fsprogs/files/patch-version.h
+++ /dev/null
@@ -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 --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist
index 8e6ffcd90f1c..5be0861734d4 100644
--- a/sysutils/e2fsprogs/pkg-plist
+++ b/sysutils/e2fsprogs/pkg-plist
@@ -5,6 +5,7 @@ sbin/badblocks
 sbin/blkid
 sbin/debugfs
 sbin/dumpe2fs
+sbin/e2freefrag
 sbin/e2fsck
 sbin/e2image
 sbin/e2label