[netfilter-cvslog] r6725 - trunk/iptables

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2007-01-10 14:56:05 +0100 (Wed, 10 Jan 2007)
New Revision: 6725

Modified:
   trunk/iptables/Makefile
Log:
[PATCH]: Fix greedy debug grep

>From Bugzilla #527:

if you have a kernel with say a '-g' in it, then KERNEL_DIR will include the
'-g' in it, CFLAGS will include the '-g' in it, and then the grep will think you
have -g in your CFLAGS

for example, if you use the grsec or gentoo patchset:
$ uname -r
2.6.19.1-grsec
$ uname -r
2.6.19-gentoo-r2

then your CFLAGS will look like:
-O2 -Wall -Wunused -I"/lib/modules/2.6.19.1-grsec/build"/include -Iinclude/
-DIPTABLES_VERSION=\"1.3.7\"

and the greedy check grep will incorrectly flag this:
egrep -e '-g|-pg|IPTC_DEBUG'


Modified: trunk/iptables/Makefile
===================================================================
--- trunk/iptables/Makefile	2007-01-10 06:44:10 UTC (rev 6724)
+++ trunk/iptables/Makefile	2007-01-10 13:56:05 UTC (rev 6725)
@@ -249,7 +249,7 @@
 # -g -pg -DIPTC_DEBUG
 .PHONY: check
 check:
-	@if echo $(CFLAGS) | egrep -e '-g|-pg|IPTC_DEBUG' >/dev/null; then echo Remove debugging flags; exit 1; else exit 0; fi
+	@if echo $(CFLAGS) | egrep -e '(^|[[:space:]])(-g|-pg|-DIPTC_DEBUG)([[:space:]]|$)' >/dev/null; then echo Remove debugging flags; exit 1; else exit 0; fi
 
 .PHONY: nowhitespace
 nowhitespace: