Source: expat
Severity: important
Tags: patch

Please use hardened build flags based on dpkg-buildflags.

Patch attached.

Cheers,
        Moritz
diff -aur expat-2.0.1.orig/debian/rules expat-2.0.1/debian/rules
--- expat-2.0.1.orig/debian/rules	2011-12-29 05:07:00.000000000 +0100
+++ expat-2.0.1/debian/rules	2011-12-29 05:10:43.000000000 +0100
@@ -35,35 +35,35 @@
 endif
 
 # -pthread -D_REENTRANT #551079
-CFLAGS  = -Wall -g
+CFLAGS  = `dpkg-buildflags --get CFLAGS`
+CFLAGS  += -Wall
+
 LDFLAGS = -Wl,-Bsymbolic-functions
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+LDFLAGS += `dpkg-buildflags --get LDFLAGS`
+
+CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
 
 UPACKAGE = $(shell dh_listpackages | grep -- -udeb$$)
 
 build/config.status: configure
 	dh_testdir
-	(mkdir -p $(@D); cd $(@D); CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+	(mkdir -p $(@D); cd $(@D); CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
 	 ../configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH))
 
 buildw/config.status: configure
 	dh_testdir
-	(mkdir -p $(@D); cd $(@D); CFLAGS="$(CFLAGS) -DXML_UNICODE" LDFLAGS="$(LDFLAGS)" \
+	(mkdir -p $(@D); cd $(@D); CFLAGS="$(CFLAGS) -DXML_UNICODE" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
 	 ../configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH))
 
 build64/config.status: configure
 	dh_testdir
-	(mkdir -p $(@D); cd $(@D); CFLAGS="-m64 $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+	(mkdir -p $(@D); cd $(@D); CFLAGS="-m64 $(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"  LDFLAGS="$(LDFLAGS)" \
 	 ../configure $(CONFFLAGS) $(HOST64FLAG) --prefix=/usr --mandir=\$${prefix}/share/man \
 	 --libdir=\$${prefix}/lib64)
 
 buildw64/config.status: configure
 	dh_testdir
-	(mkdir -p $(@D); cd $(@D); CFLAGS="-m64 $(CFLAGS) -DXML_UNICODE" LDFLAGS="$(LDFLAGS)" \
+	(mkdir -p $(@D); cd $(@D); CFLAGS="-m64 $(CFLAGS) -DXML_UNICODE" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
 	 ../configure $(CONFFLAGS) $(HOST64FLAG) --prefix=/usr --mandir=\$${prefix}/share/man \
 	 --libdir=\$${prefix}/lib64)
 
Nur in expat-2.0.1/debian: rules~.

Reply via email to