[SCM] grass branch, master, updated. upstream/6.4.1-122-g6fe3071

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 6fe30711e6395ba9ab804d87bbba9f2d3544226f
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Tue Sep 10 19:17:15 2013 +1200

    add (commented out) build flags needed for building Wheezy-backport with hardening enabled

diff --git a/debian/rules b/debian/rules
index fd4e4e7..46486c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,10 @@ PKG_NAME=grass
 include /usr/share/hardening-includes/hardening.make
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+# in Wheezy -fPIE conflicts with -fPIC. See example in the hardening.make file.
+#CFLAGS += $(HARDENING_CFLAGS_PIC) \
+#	$(filter-out $(HARDENING_DISABLE_PIE_CFLAGS_FILTER),$(HARDENING_CFLAGS))
+# in Jessie & Sid the problem seems fixed so we can proceed normally.
 CFLAGS+=$(HARDENING_CFLAGS)
 LDFLAGS+=$(HARDENING_LDFLAGS)
 

-- 
Geographic Resources Analysis Support System