-#inherit gettext
-inherit autotools
+SRC_URI += "file://configure.ac.patch \
+ file://stdio.in.h.patch \
+ file://diffutils.spec.patch "
+
+
+inherit update-alternatives gettext
+
+do_patch_append () {
+ echo RLM begining of do_patch
+
+ cat ${WORKDIR}/configure.ac.patch | patch -s -p1 --fuzz=2
+ cat ${WORKDIR}/stdio.in.h.patch | patch -s -p1 --fuzz=2
+ cat ${WORKDIR}/diffutils.spec.patch | patch -s -p1 --fuzz=2
+
+ for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do
+ rm -f ${S}/m4/$i
+ done
+
+ echo RLM end of do_patch
+}
\ No newline at end of file
--- /dev/null
+diff --git a/configure.ac b/configure.ac
+index ab6af5c..f913239 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,6 @@ AC_CONFIG_HEADER([lib/config.h:lib/config.hin])
+
+ AC_PROG_AWK
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AM_MISSING_PROG([HELP2MAN], [help2man])
+ AC_PROG_RANLIB
+ gl_EARLY
--- /dev/null
+diff --git a/packaging/diffutils.spec b/packaging/diffutils.spec
+index 67ed0c9..458c315 100644
+--- a/packaging/diffutils.spec
++++ b/packaging/diffutils.spec
+@@ -56,4 +56,4 @@ rm -rf %{buildroot}
+ %{_datadir}/license/%{name}
+ %{_bindir}/*
+ %{_mandir}/*/*
+-%{_infodir}/diff.info*gz
++%{_infodir}/diff.info
--- /dev/null
+check for gets before using it
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+Index: diffutils-3.2/lib/stdio.in.h
+===================================================================
+--- diffutils-3.2.orig/lib/stdio.in.h 2011-08-28 04:57:28.000000000 -0700
++++ diffutils-3.2/lib/stdio.in.h 2012-07-03 10:45:07.518322117 -0700
+@@ -693,11 +693,13 @@
+ _GL_CXXALIAS_SYS (gets, char *, (char *s));
+ # undef gets
+ # endif
++# if defined gets
+ _GL_CXXALIASWARN (gets);
+ /* 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. */
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++# endif
+ #endif
+
+
--- /dev/null
+diff --git a/lib/stdio.in.h b/lib/stdio.in.h
+index df9f0eb..8d3934a 100644
+--- a/lib/stdio.in.h
++++ b/lib/stdio.in.h
+@@ -139,7 +139,7 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
+ so any use of gets warrants an unconditional warning. Assume it is
+ always declared, since it is required by C89. */
+ #undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++/*_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");*/
+
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@