[hdf5] 01/03: Patch format-not-a-string-literal-and-no-format-arguments.patch

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master
in repository hdf5.

commit c468d792680901c875d73c2d215935fc551e53b4
Author: Gilles Filippini <pini at debian.org>
Date:   Mon May 18 16:41:39 2015 +0200

    Patch format-not-a-string-literal-and-no-format-arguments.patch
    
    to fix a couple of build errors raised by "-Werror=format-security".
---
 debian/changelog                                   |  4 +++-
 ...-a-string-literal-and-no-format-arguments.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d188820..c45bee9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,9 @@ hdf5 (1.8.15+docs-1) UNRELEASED; urgency=medium
     constructor has been deprecated.
   * Drop parts of patch ullong_force.diff which were applied upstream.
 
-  * Acknowledge upstream bug number in path_max.diff.
+  * New patch format-not-a-string-literal-and-no-format-arguments.patch
+    to fix a couple of build errors raised by "-Werror=format-security".
+  * Acknowledge upstream bug number in patch path_max.diff.
 
  -- Gilles Filippini <pini at debian.org>  Mon, 18 May 2015 14:20:41 +0200
 
diff --git a/debian/patches/format-not-a-string-literal-and-no-format-arguments.patch b/debian/patches/format-not-a-string-literal-and-no-format-arguments.patch
new file mode 100644
index 0000000..cb0234b
--- /dev/null
+++ b/debian/patches/format-not-a-string-literal-and-no-format-arguments.patch
@@ -0,0 +1,26 @@
+Description: fix a couple of "format not a string literal and no format
+ arguments" errors due to hardening with gcc compilation flag
+ "-Werror=format-security".
+Author: Gilles Filippini <pini at debian.org>
+Index: hdf5/test/error_test.c
+===================================================================
+--- hdf5.orig/test/error_test.c
++++ hdf5/test/error_test.c
+@@ -498,7 +498,7 @@ test_create(void)
+     if(err_num != 0) TEST_ERROR
+ 
+     /* Push an error with a long description */
+-    if(H5Epush(estack_id, __FILE__, err_func, __LINE__, ERR_CLS, ERR_MAJ_TEST, ERR_MIN_SUBROUTINE, err_msg) < 0) TEST_ERROR;
++    if(H5Epush(estack_id, __FILE__, err_func, __LINE__, ERR_CLS, ERR_MAJ_TEST, ERR_MIN_SUBROUTINE, "%s", err_msg) < 0) TEST_ERROR;
+ 
+     /* Check the number of errors on stack */
+     err_num = H5Eget_num(estack_id);
+@@ -543,7 +543,7 @@ test_copy(void)
+     herr_t      ret;                 /* Generic return value */
+ 
+     /* Push an error with a long description */
+-    if(H5Epush(H5E_DEFAULT, __FILE__, err_func, __LINE__, ERR_CLS, ERR_MAJ_TEST, ERR_MIN_SUBROUTINE, err_msg) < 0) TEST_ERROR;
++    if(H5Epush(H5E_DEFAULT, __FILE__, err_func, __LINE__, ERR_CLS, ERR_MAJ_TEST, ERR_MIN_SUBROUTINE, "%s", err_msg) < 0) TEST_ERROR;
+ 
+     /* Check the number of errors on stack */
+     err_num = H5Eget_num(H5E_DEFAULT);
diff --git a/debian/patches/series b/debian/patches/series
index e0ac21e..6f0886f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ flavor-configure-option.patch
 path_max.diff
 ullong_force.diff
 relax-version-check.patch
+format-not-a-string-literal-and-no-format-arguments.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git