[adios] 36/207: Fix hardening flags

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository adios.

commit 4c228f4333dd999720166ba137e56837f29263f2
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Mar 5 13:29:15 2012 +0000

    Fix hardening flags
---
 debian/patches/security.patch | 22 ++++++++++++++++++++++
 debian/patches/series         |  1 +
 debian/rules                  |  4 +++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/patches/security.patch b/debian/patches/security.patch
new file mode 100644
index 0000000..571c8e4
--- /dev/null
+++ b/debian/patches/security.patch
@@ -0,0 +1,22 @@
+Index: adios-1.3/utils/bpls/bpls.c
+===================================================================
+--- adios-1.3.orig/utils/bpls/bpls.c	2011-09-14 15:44:46.000000000 +0100
++++ adios-1.3/utils/bpls/bpls.c	2012-03-05 13:21:36.000000000 +0000
+@@ -364,7 +364,7 @@
+ 
+ 
+ #define PRINT_DIMS(str, v, n, loopvar) printf("%s = { ", str); \
+-    for (loopvar=0; loopvar<n;loopvar++) printf("%lld ", v[loopvar]);    \
++    for (loopvar=0; loopvar<n;loopvar++) printf("%lld ",(long long int) v[loopvar]);    \
+ printf("}")
+ 
+ void printSettings(void) {
+@@ -756,7 +756,7 @@
+     strcat(xtics, ")\n");
+ 
+     fprintf(out_plot, "start = -0.5\npos(x) = start + x * 1\nset boxwidth 1\nset style fill solid border 5#5lt6#6\n");
+-    fprintf(out_plot, xtics);
++    fprintf(out_plot, "%s", xtics); /* do it this way to silence false warning from error-security in gcc. sigh. */
+     fprintf(out_plot, "plot '%s' using 3 smooth frequency w boxes\n", hist_file);
+     fprintf(out_plot, "pause -1 'Press Enter to quit'\n");
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 27973f3..76fc805 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 sh4.patch
 mpi_in_place.patch
 nompi_flag.patch
+security.patch
diff --git a/debian/rules b/debian/rules
index c0a999a..969e77c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,8 +40,10 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
 	$(MAKE) install prefix=$(shell pwd)/debian/libadios-dev/usr 
-	chmod -x $(BINDIR)/adios_config.flags
+	# remove due to it not working in multi-arch;
+	rm -f  $(BINDIR)/adios_config.flags
 	# renamed as per Adios CCS issue #118716, Debbug #639257
 	mv $(BINDIR)/gpp.py $(BINDIR)/adiosxml2h
+	cp debian/adios_config $(BINDIR)/adios_config
 	mv $(BINDIR)/gpp_types.py $(BINDIR)/gpp_types
 	mv $(BINDIR)/xmlparser.py $(BINDIR)/xmlparser

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git