From d6223f9583f0ec94c99ee8fd3cb7e584c0978231 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Tue, 10 Jul 2018 11:18:55 +0000
Subject: [PATCH] e2fsprogs: bump to 1.44.3, reorder SOURCE_URI.

---
 ...rogs-1.44.2.recipe => e2fsprogs-1.44.3.recipe} | 15 +++++++++++----
 ...-1.44.2.patchset => e2fsprogs-1.44.3.patchset} | 10 +++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)
 rename sys-fs/e2fsprogs/{e2fsprogs-1.44.2.recipe => e2fsprogs-1.44.3.recipe} (83%)
 rename sys-fs/e2fsprogs/patches/{e2fsprogs-1.44.2.patchset => e2fsprogs-1.44.3.patchset} (94%)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.2.recipe b/sys-fs/e2fsprogs/e2fsprogs-1.44.3.recipe
similarity index 83%
rename from sys-fs/e2fsprogs/e2fsprogs-1.44.2.recipe
rename to sys-fs/e2fsprogs/e2fsprogs-1.44.3.recipe
index c516cc50a..db213e9ca 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.44.2.recipe
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.3.recipe
@@ -4,10 +4,10 @@ HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 COPYRIGHT="2004-2017 Theodore Ts'o"
 LICENSE="GNU GPL v2"
 REVISION="1"
-SOURCE_URI="https://sourceforge.mirrorservice.org/e/e2/e2fsprogs/e2fsprogs/v$portVersion/e2fsprogs-$portVersion.tar.gz
-	https://fossies.org/linux/misc/e2fsprogs-$portVersion.tar.gz
-	https://downloads.sourceforge.net/e2fsprogs/e2fsprogs-$portVersion.tar.gz"
-CHECKSUM_SHA256="e5c05a5ba4a9a1766f4b500ad7ef3220843860bfa64ebdda1b462b23bcb37f68"
+SOURCE_URI="https://downloads.sourceforge.net/e2fsprogs/e2fsprogs-$portVersion.tar.gz
+	https://sourceforge.mirrorservice.org/e/e2/e2fsprogs/e2fsprogs/v$portVersion/e2fsprogs-$portVersion.tar.gz
+	https://fossies.org/linux/misc/e2fsprogs-$portVersion.tar.gz"
+CHECKSUM_SHA256="c2ae6d8ce6fb96b55886cf761411fc22ab41976f4f8297fc54c706df442483be"
 PATCHES="e2fsprogs-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -33,6 +33,7 @@ PROVIDES="
 	cmd:e2fsck$commandSuffix
 	cmd:e2image$commandSuffix
 	cmd:e2label$commandSuffix
+	cmd:e2mmpstatus$commandSuffix
 	cmd:e2undo$commandSuffix
 	cmd:filefrag$commandSuffix
 	cmd:findfs$commandSuffix
@@ -92,3 +93,9 @@ INSTALL()
 {
 	make install
 }
+
+TEST()
+{
+	LIBRARY_PATH="$sourceDir/lib${LIBRARY_PATH:+:$LIBRARY_PATH}" \
+	make check
+}
diff --git a/sys-fs/e2fsprogs/patches/e2fsprogs-1.44.2.patchset b/sys-fs/e2fsprogs/patches/e2fsprogs-1.44.3.patchset
similarity index 94%
rename from sys-fs/e2fsprogs/patches/e2fsprogs-1.44.2.patchset
rename to sys-fs/e2fsprogs/patches/e2fsprogs-1.44.3.patchset
index dbcf3ceef..63ea16533 100644
--- a/sys-fs/e2fsprogs/patches/e2fsprogs-1.44.2.patchset
+++ b/sys-fs/e2fsprogs/patches/e2fsprogs-1.44.3.patchset
@@ -5,7 +5,7 @@ Subject: Ugly hacks to get things building on Haiku.
 
 
 diff --git a/configure.ac b/configure.ac
-index 7392959..7d44b90 100644
+index 5e837c9..0d49ae5 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -101,7 +101,8 @@ AC_MSG_ERROR([--with-ldopts no longer supported; use LDFLAGS= instead]))
@@ -18,7 +18,7 @@ index 7392959..7d44b90 100644
     AC_SUBST(RDYNAMIC)
  fi
  AC_PROG_CPP
-@@ -1174,7 +1175,7 @@ dnl Check to see if -lsocket is required (solaris) to make something
+@@ -1175,7 +1176,7 @@ dnl Check to see if -lsocket is required (solaris) to make something
  dnl that uses socket() to compile; this is needed for the UUID library
  dnl
  SOCKET_LIB=''
@@ -28,7 +28,7 @@ index 7392959..7d44b90 100644
  dnl
  dnl See if libmagic exists
 diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
-index e43d340..b76c7e8 100644
+index 8fe05e0..14d6196 100644
 --- a/e2fsck/Makefile.in
 +++ b/e2fsck/Makefile.in
 @@ -16,7 +16,7 @@ MANPAGES=	e2fsck.8
@@ -41,7 +41,7 @@ index e43d340..b76c7e8 100644
  	 $(DEPLIBUUID) $(DEPLIBE2P)
  
 diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
-index 5269650..2c134c8 100644
+index cd5cba2..6e1a7b9 100644
 --- a/e2fsck/e2fsck.h
 +++ b/e2fsck/e2fsck.h
 @@ -19,9 +19,7 @@
@@ -55,7 +55,7 @@ index 5269650..2c134c8 100644
  #include <setjmp.h>
  #endif
 diff --git a/misc/create_inode.c b/misc/create_inode.c
-index caa3609..04e5eb5 100644
+index 05aa636..0d0d27c 100644
 --- a/misc/create_inode.c
 +++ b/misc/create_inode.c
 @@ -38,6 +38,11 @@