[Pkg-apache-commits] r992 - in /trunk/apr: changelog rules

[sf at alioth.debian.org]

Author: sf
Date: Sat Jul 25 20:23:45 2009
New Revision: 992

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=992
Log:
Enable -fstack-protector for arm/armel

Modified:
    trunk/apr/changelog
    trunk/apr/rules

Modified: trunk/apr/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/changelog?rev=992&op=diff
==============================================================================
--- trunk/apr/changelog (original)
+++ trunk/apr/changelog Sat Jul 25 20:23:45 2009
@@ -1,3 +1,10 @@
+apr (1.3.7-2) UNRELEASED; urgency=low
+
+  * Enable -fstack-protector for arm/armel. A workaround has been added to
+    gcc.
+
+ -- Stefan Fritsch <sf at debian.org>  Sat, 25 Jul 2009 22:22:59 +0200
+
 apr (1.3.7-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/apr/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/rules?rev=992&op=diff
==============================================================================
--- trunk/apr/rules (original)
+++ trunk/apr/rules Sat Jul 25 20:23:45 2009
@@ -17,12 +17,8 @@
 CFLAGS := $(CFLAGS) -pipe -Wall -g
 
 # hardening options
-H_CFLAGS := -Wformat -Wformat-security -D_FORTIFY_SOURCE=2
+H_CFLAGS := -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
 H_LDFLAGS := -Wl,-z,relro
-# do not enable -fstack-protector on arm and armel, see #477772, #469517
-ifeq (,$(findstring arm,$(DEB_HOST_GNU_TYPE)))
-	H_CFLAGS += -fstack-protector
-endif
 
 CONFFLAGS += ac_cv_prog_AWK=mawk apr_cv_sctp=no