5 files changed, 23 insertions, 24 deletions

diff --git a/meta/recipes-devtools/m4/m4-1.4.16.inc b/meta/recipes-devtools/m4/m4-1.4.16.inc
deleted file mode 100644
index 01016d643b..0000000000
--- a/meta/recipes-devtools/m4/m4-1.4.16.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-require m4.inc
-
-LICENSE = "GPLv3"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
-                    file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d"
-
-PR = "r4"
-SRC_URI += "file://ac_config_links.patch \
-            file://remove-gets.patch \
-           "
-
-SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280"
-SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da"
-
-
diff --git a/meta/recipes-devtools/m4/m4-1.4.17.inc b/meta/recipes-devtools/m4/m4-1.4.17.inc
new file mode 100644
index 0000000000..790678e288
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4-1.4.17.inc
@@ -0,0 +1,13 @@
+require m4.inc
+
+LICENSE = "GPLv3"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
+                    file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede"
+
+SRC_URI += "file://ac_config_links.patch \
+            file://remove-gets.patch \
+           "
+
+SRC_URI[md5sum] = "a5e9954b1dae036762f7b13673a2cf76"
+SRC_URI[sha256sum] = "3ce725133ee552b8b4baca7837fb772940b25e81b2a9dc92537aeaf733538c9e"
diff --git a/meta/recipes-devtools/m4/m4-native_1.4.16.bb b/meta/recipes-devtools/m4/m4-native_1.4.17.bb
index 06d8aa244e..06d8aa244e 100644
--- a/meta/recipes-devtools/m4/m4-native_1.4.16.bb
+++ b/meta/recipes-devtools/m4/m4-native_1.4.17.bb
diff --git a/meta/recipes-devtools/m4/m4/remove-gets.patch b/meta/recipes-devtools/m4/m4/remove-gets.patch
index 9c396d94f0..effb353f11 100644
--- a/meta/recipes-devtools/m4/m4/remove-gets.patch
+++ b/meta/recipes-devtools/m4/m4/remove-gets.patch
@@ -4,18 +4,20 @@ undefining it.
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Index: m4-1.4.16/lib/stdio.in.h
+Index: m4-1.4.17/lib/stdio.in.h
 ===================================================================
---- m4-1.4.16.orig/lib/stdio.in.h       2011-03-01 08:39:29.000000000 -0800
-+++ m4-1.4.16/lib/stdio.in.h    2012-07-03 08:32:08.145935928 -0700
-@@ -161,8 +161,10 @@
+--- m4-1.4.17.orig/lib/stdio.in.h       2013-10-16 14:41:01.678496227 +0300
++++ m4-1.4.17/lib/stdio.in.h    2013-10-16 14:41:48.849427839 +0300
+@@ -717,10 +717,12 @@
  /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
+    so any use of gets warrants an unconditional warning; besides, C11
+    removed it.  */
 +#if defined gets
  #undef gets
+ #if HAVE_RAW_DECL_GETS
  _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
 +#endif
  
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/meta/recipes-devtools/m4/m4_1.4.16.bb b/meta/recipes-devtools/m4/m4_1.4.17.bb
index b12c0adf3a..b12c0adf3a 100644
--- a/meta/recipes-devtools/m4/m4_1.4.16.bb
+++ b/meta/recipes-devtools/m4/m4_1.4.17.bb