Package: grep
Version: 2.20-1
Severity: normal
Tags: patch

Hello,

The (hardening) CPPFLAGS are not applied correctly because they
are overwritten in debian/rules. The attached patch fixes the
issue.

Regards
Simon
-- 
+ privacy is necessary
+ using gnupg http://gnupg.org
+ public key id: 0x92FEFDB7E44C32F9
diff -Nru grep-2.20/debian/rules grep-2.20/debian/rules
--- grep-2.20/debian/rules	2014-08-12 10:03:05.000000000 +0200
+++ grep-2.20/debian/rules	2014-08-14 01:07:02.000000000 +0200
@@ -10,6 +10,8 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+CPPFLAGS="-DHAVE_DYNAMIC_LIBPCRE"
+
 ##########################################################################
 # I need to investigate why CDBS doesn't export automatically build flags 
 # needed for hardening. This block should be temporal.
@@ -17,7 +19,7 @@
 CFLAGS += -O3
 LDFLAGS = `dpkg-buildflags --get LDFLAGS`
 LDFLAGS += -Wl,-z,defs
-CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+CPPFLAGS += `dpkg-buildflags --get CPPFLAGS`
 DEB_CONFIGURE_SCRIPT_ENV += CFLAGS="$(CFLAGS)"
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="$(LDFLAGS)"
 DEB_CONFIGURE_SCRIPT_ENV += CPPFLAGS="$(CPPFLAGS)"
@@ -28,7 +30,6 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --without-included-regex
 DEB_CONFIGURE_SCRIPT_ENV += LIBS="-Wl,--no-as-needed -ldl -Wl,--as-needed"
-DEB_CONFIGURE_SCRIPT_ENV += CPPFLAGS="-DHAVE_DYNAMIC_LIBPCRE"
 
 # FIXME: CDBS should include a specific var for this 
 # (e.g. DEB_CONFIGURE_EXECDIR in autotools-vars.mk)?

Attachment: signature.asc
Description: Digital signature

Reply via email to