5 files changed, 7 insertions, 43 deletions

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index b1c885eaaf6e..4029e6573585 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	e2fsprogs
-PORTVERSION=	1.41.10
-PORTREVISION?=	1
+PORTVERSION=	1.41.11
+PORTREVISION?=	0
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index 339b4dd200a2..b3b18e8533ea 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,3 +1,3 @@
-MD5 (e2fsprogs-1.41.10.tar.gz) = f9c7bb5c036a119453ce02fa871038da
-SHA256 (e2fsprogs-1.41.10.tar.gz) = 4109d45dd220bc450e3198056a135164bdcee21855de97eda4e863a461eed8c9
-SIZE (e2fsprogs-1.41.10.tar.gz) = 4466866
+MD5 (e2fsprogs-1.41.11.tar.gz) = fb507a40c2706bc38306f150d069e345
+SHA256 (e2fsprogs-1.41.11.tar.gz) = 5c9f367f6d5131f90d91dfd2f6c639d5e2c9455cac1f0d8ccc886239c90d775e
+SIZE (e2fsprogs-1.41.11.tar.gz) = 4472354
diff --git a/sysutils/e2fsprogs/files/patch-53fbfb2 b/sysutils/e2fsprogs/files/patch-53fbfb2
deleted file mode 100644
index 3094e067b4e7..000000000000
--- a/sysutils/e2fsprogs/files/patch-53fbfb2
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 53fbfb2bc3490d0ff317666322dd077c08116e0c
-Author: Theodore Ts'o <tytso@mit.edu>
-Date:   Mon Feb 22 23:51:26 2010 -0500
-
-    e2fsck: Fix bug which can cause e2fsck -fD to corrupt non-indexed directories
-    
-    E2fsprogs 1.41.10 introduced a regression (in commit b71e018) where
-    e2fsck -fD can corrupt non-indexed directories when are exists one or
-    more file names which alphabetically sort before ".".  This can happen
-    with ext2 filesystems or for small directories (take less than a
-    block) which contain filenames that begin with a space or some other
-    punctuation mark.
-    
-    Fix this by making sure we never reorder the '.' or '..' entry in the
-    directory, since they must be first.
-    
-    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-
-diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
-index 780742e..ceb8543 100644
---- a/e2fsck/rehash.c
-+++ b/e2fsck/rehash.c
-@@ -763,7 +763,12 @@ retry_nohash:
- 
- 	/* Sort the list */
- resort:
--	qsort(fd.harray, fd.num_array, sizeof(struct hash_entry), hash_cmp);
-+	if (fd.compress)
-+		qsort(fd.harray+2, fd.num_array-2, sizeof(struct hash_entry),
-+		      hash_cmp);
-+	else
-+		qsort(fd.harray, fd.num_array, sizeof(struct hash_entry),
-+		      hash_cmp);
- 
- 	/*
- 	 * Look for duplicates
diff --git a/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c b/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c
index eb3ef48d2da7..df7bd1d18669 100644
--- a/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c
+++ b/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c
@@ -52,7 +52,7 @@
  static void signal_progress_off(int sig EXT2FS_ATTR((unused)))
  {
  	e2fsck_t ctx = e2fsck_global_ctx;
-@@ -847,6 +874,8 @@
+@@ -862,6 +889,8 @@
  	sigaction(SIGUSR1, &sa, 0);
  	sa.sa_handler = signal_progress_off;
  	sigaction(SIGUSR2, &sa, 0);
diff --git a/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h b/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h
index 6c7a76bede6d..30c14d1bedfd 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
-@@ -421,7 +421,7 @@
+@@ -422,7 +422,7 @@
  
  #define i_size_high	i_dir_acl