[SCM] grass branch, master, updated. upstream/6.4.1-117-g54d8f6f

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 54d8f6f75fa685c0069c7c24819bd39d734d88dc
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Mon Jul 29 21:53:51 2013 +1200

    add hardening flags, but keep format-security non-fatal for now

diff --git a/debian/rules b/debian/rules
index 7e4f5e2..fd4e4e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,16 @@ ABI=$(shell echo `head -3 $(CURDIR)/include/VERSION` | sed -e 's/ //g' -e 's/RC/
 BASE_NAME=grass$(VERSION)
 PKG_NAME=grass
 
-CFLAGS=-Wall -g
+include /usr/share/hardening-includes/hardening.make
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS)
+
+# TODO: fix these
+CFLAGS+=-Wno-error=format-security
+
+CFLAGS+=-Wall
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0

-- 
Geographic Resources Analysis Support System