diffutils: Fix build (format security)

diff --git a/diffutils/diffutils.nm b/diffutils/diffutils.nm
index 1ef95de305575a0ac98f68ffc7f48d13fe0dc3f5..94d81d445188d72f748a466f08673ad9e2664edd 100644 (file)
--- a/diffutils/diffutils.nm
+++ b/diffutils/diffutils.nm
@@ -5,7 +5,7 @@
 
 name       = diffutils
 version    = 3.3
-release    = 1
+release    = 2
 
 groups     = Development/Tools
 url        = http://www.gnu.org/software/diffutils/diffutils.html

diff --git a/diffutils/patches/diffutils-format-security.patch b/diffutils/patches/diffutils-format-security.patch
new file mode 100644 (file)
index 0000000..9658644
--- /dev/null
+++ b/diffutils/patches/diffutils-format-security.patch
@@ -0,0 +1,17 @@
+diff -up diffutils-3.3/gnulib-tests/test-xvasprintf.c.format-security diffutils-3.3/gnulib-tests/test-xvasprintf.c
+--- diffutils-3.3/gnulib-tests/test-xvasprintf.c.format-security       2013-03-22 04:20:50.000000000 +0000
++++ diffutils-3.3/gnulib-tests/test-xvasprintf.c       2013-12-04 13:43:09.927443499 +0000
+@@ -16,6 +16,13 @@
+ 
+ /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
+ 
++/* Tell GCC not to warn about the specific edge cases tested here.  */
++#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
++# pragma GCC diagnostic ignored "-Wformat-zero-length"
++# pragma GCC diagnostic ignored "-Wformat-nonliteral"
++# pragma GCC diagnostic ignored "-Wformat-security"
++#endif
++
+ #include <config.h>
+ 
+ #include "xvasprintf.h"