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

[sf at alioth.debian.org]

Author: sf
Date: Sat Jul 25 20:18:49 2009
New Revision: 991

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

Modified:
    trunk/apr-util/changelog
    trunk/apr-util/rules

Modified: trunk/apr-util/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/changelog?rev=991&op=diff
==============================================================================
--- trunk/apr-util/changelog (original)
+++ trunk/apr-util/changelog Sat Jul 25 20:18:49 2009
@@ -1,3 +1,10 @@
+apr-util (1.3.8+dfsg-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 21:33:32 +0200
+
 apr-util (1.3.8+dfsg-1) unstable; urgency=low
 
   * New upstream version.

Modified: trunk/apr-util/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/rules?rev=991&op=diff
==============================================================================
--- trunk/apr-util/rules (original)
+++ trunk/apr-util/rules Sat Jul 25 20:18:49 2009
@@ -17,12 +17,8 @@
 LDFLAGS := $(LDFLAGS) $(shell apr-1-config --ldflags)
 
 # 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
 
 # Enable debug builds
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))