e2fsprogs: upgrade to 1.42

Refactored quotefix.patch to apply cleanly.

(From OE-Core rev: 1749f35bc92acd971eda245b93781305f79c2bef)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

6 files changed, 48 insertions, 52 deletions

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/quotefix.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/quotefix.patch
deleted file mode 100644
index f260f034fa..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/quotefix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Mei Lei <lei.mei@intel.com>
-
-
-These macros are underquoted and break with recent autoconf+automake
-combinations.
-
-RP 1/2/10
-
-Index: e2fsprogs-1.41.5/configure.in
-===================================================================
---- e2fsprogs-1.41.5.orig/configure.in  2010-02-01 11:40:10.547790252 +0000
-+++ e2fsprogs-1.41.5/configure.in       2010-02-01 11:44:51.577876485 +0000
-@@ -397,11 +397,11 @@
-                AC_MSG_ERROR([pkg-config not installed; please install it.])
-        fi
- 
--       AC_CHECK_LIB(blkid, blkid_get_cache,
-+       [AC_CHECK_LIB(blkid, blkid_get_cache,
-                [LIBBLKID=`$PKG_CONFIG --libs blkid`;
-                 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
-                [AC_MSG_ERROR([external blkid library not found])],
--               [$LIBBLKID])
-+               [$LIBBLKID])]
-        BLKID_CMT=#
-        AC_MSG_RESULT([Disabling private blkid library])
- else
-@@ -786,15 +786,15 @@
- dnl
- SEM_INIT_LIB=''
- AC_CHECK_FUNC(sem_init, ,
--  AC_CHECK_LIB(pthread, sem_init,
-+  [AC_CHECK_LIB(pthread, sem_init,
-        AC_DEFINE(HAVE_SEM_INIT)
-        SEM_INIT_LIB=-lpthread,
--  AC_CHECK_LIB(rt, sem_init,
-+  [AC_CHECK_LIB(rt, sem_init,
-        AC_DEFINE(HAVE_SEM_INIT)
-        SEM_INIT_LIB=-lrt,
--  AC_CHECK_LIB(posix4, sem_init,
-+  [AC_CHECK_LIB(posix4, sem_init,
-        AC_DEFINE(HAVE_SEM_INIT)
--       SEM_INIT_LIB=-lposix4))))dnl
-+       SEM_INIT_LIB=-lposix4)])])])dnl
- AC_SUBST(SEM_INIT_LIB)
- dnl
- dnl Check for unified diff
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/acinclude.m4 b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4
index 4b00668476..4b00668476 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/acinclude.m4
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/mkdir.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch
index e91ffa96c4..e91ffa96c4 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/mkdir.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/quotefix.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/quotefix.patch
new file mode 100644
index 0000000000..e576f35ccc
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/quotefix.patch
@@ -0,0 +1,44 @@
+Upstream-Status: Pending
+
+These macros are underquoted and break with recent autoconf+automake
+combinations. - RP 2010-01-02
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
+diff -urN e2fsprogs-1.42.orig//configure.in e2fsprogs-1.42/configure.in
+--- e2fsprogs-1.42.orig//configure.in   2011-11-28 09:28:22.000000000 -0800
++++ e2fsprogs-1.42/configure.in 2012-01-12 14:42:54.820531407 -0800
+@@ -439,11 +439,11 @@
+                AC_MSG_ERROR([pkg-config not installed; please install it.])
+        fi
+ 
+-       AC_CHECK_LIB(uuid, uuid_generate,
++       [AC_CHECK_LIB(uuid, uuid_generate,
+                [LIBUUID=`$PKG_CONFIG --libs uuid`;
+                 STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`],
+                [AC_MSG_ERROR([external uuid library not found])],
+-               [$LIBUUID])
++               [$LIBUUID])]
+        UUID_CMT=#
+        AC_MSG_RESULT([Disabling private uuid library])
+ else
+@@ -939,15 +939,15 @@
+ AH_TEMPLATE([HAVE_SEM_INIT], [Define to 1 if sem_init() exists])
+ SEM_INIT_LIB=''
+ AC_CHECK_FUNC(sem_init, ,
+-  AC_CHECK_LIB(pthread, sem_init,
++  [AC_CHECK_LIB(pthread, sem_init,
+        AC_DEFINE(HAVE_SEM_INIT, 1)
+        SEM_INIT_LIB=-lpthread,
+-  AC_CHECK_LIB(rt, sem_init,
++  [AC_CHECK_LIB(rt, sem_init,
+        AC_DEFINE(HAVE_SEM_INIT, 1)
+        SEM_INIT_LIB=-lrt,
+-  AC_CHECK_LIB(posix4, sem_init,
++  [AC_CHECK_LIB(posix4, sem_init,
+        AC_DEFINE(HAVE_SEM_INIT, 1)
+-       SEM_INIT_LIB=-lposix4))))dnl
++       SEM_INIT_LIB=-lposix4)])])])dnl
+ AC_SUBST(SEM_INIT_LIB)
+ dnl
+ dnl Check for unified diff
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index 1a1a7b8836..527e701d18 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -21,7 +21,7 @@ SECTION = "base"
 DEPENDS = "util-linux"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
-           file://mkdir.patch;apply=yes"
+           file://mkdir.patch"
 
 inherit autotools gettext
 
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
index a956247a18..9ff85a2d51 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
@@ -1,13 +1,12 @@
 require e2fsprogs.inc
 
-PR = "r4"
+PR = "r0"
 
 SRC_URI += "file://quotefix.patch \
             file://acinclude.m4"
 
-SRC_URI[md5sum] = "05f70470aea2ef7efbb0845b2b116720"
-SRC_URI[sha256sum] = "3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aad7b176"
-#file://no-hardlinks.patch
+SRC_URI[md5sum] = "a3c4ffd7352310ab5e9412965d575610"
+SRC_URI[sha256sum] = "55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46"
 
 PARALLEL_MAKE = ""