debian/changelog | 2 ++
debian/rules | 15 ++++++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 11b849b9b42047585675dc62386fef8743175a64
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Dec 28 23:27:59 2011 +0100
Enable hardened build flags through dpkg-buildflags (closes: #653488).
Based on patch by Moritz Muehlenhoff, thanks!
diff --git a/debian/changelog b/debian/changelog
index 9c24076..6cdb44c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xterm (276-2) UNRELEASED; urgency=low
* Update copyright year in debian/copyright.
* Bump Standards-Version to 3.9.2, no changes needed.
* Remove David Nusinow from Uploaders.
+ * Enable hardened build flags through dpkg-buildflags (closes: #653488).
+ Based on patch by Moritz Muehlenhoff, thanks!
[ Sven Joachim ]
* Update 900_debian_xterm.diff:
diff --git a/debian/rules b/debian/rules
index ab7c20c..ebb8b5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,12 +20,12 @@ else
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
-CFLAGS = -g -Wall
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS += -Wall
+
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -37,7 +37,7 @@ DESKTOP_FLAGS = --vendor debian \
--dir=$(DEBTREEDIR)/usr/share/applications
# disable some unsafe operations
-CPPFLAGS = \
+CPPFLAGS += \
-DDEF_ALLOW_FONT=False \
-DDEF_ALLOW_TCAP=False \
-DDEF_DISALLOWED_WINDOW=\\\"1,2,3,4,5,6,7,8,9,11,13,14,18,19,20,21,GetSelection,SetSelection,SetWinLines,SetXprop\\\"
@@ -67,6 +67,7 @@ $(STAMP_DIR)/configure: $(STAMP_DIR)/patch
DESKTOP_FLAGS="$(DESKTOP_FLAGS)" \
CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
+ LDFLAGS="$(LDFLAGS)" \
LUIT=/usr/bin/luit
>$@
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rg1zf-0008q9...@vasks.debian.org
