activate GCC cflags check, cleanup FLAGS stuff in OpenADK.

 * remove TCFLAGS/TLDFLAGS/TCPPFLAGS and only use
   TARGET_CFLAGS/TARGET_LDFLAGS/TARGET_CPPFLAGS, ...
 * activate GCC_HONOUR_COPTS and fix all packages to
   honour CFLAGS
 * use CC_FOR_BUILD, CFLAGS_FOR_BUILD, ... for all
   build compilation, remove HOST* variants
 * introduce KERNEL_MODULE_FLAGS for external kernel
   modules
 * mark rpm package as broken, mark syslinux for native builds
   only, mark libhugetlb for eglibc/glibc only usage

15 files changed, 323 insertions, 38 deletions

diff --git a/package/maradns/Makefile b/package/maradns/Makefile
index f940c458f..097435650 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -4,22 +4,21 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		maradns
-PKG_VERSION:=		1.4.03
+PKG_VERSION:=		1.4.05
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9e715104234cc9bf01e2afaad27eb787
+PKG_MD5SUM:=		aff277f6ba0e1ff46d32a60ab84f16cb
 PKG_DESCR:=		small and secure DNS server
 PKG_SECTION:=		dns
-PKG_NOPARALLEL:=	1
 PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://www.maradns.org
 PKG_SITES:=		http://www.maradns.org/download/1.4/${PKG_VERSION}/
+PKG_NOPARALLEL:=	1
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MARADNS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-
 FAKE_FLAGS+=		PREFIX="${WRKINST}/usr" \
 			RPM_BUILD_ROOT="${WRKINST}"
 
diff --git a/package/maradns/patches/cross-compile-fix.patch b/package/maradns/patches/cross-compile-fix.patch
index 8277956c5..384cd6936 100644
--- a/package/maradns/patches/cross-compile-fix.patch
+++ b/package/maradns/patches/cross-compile-fix.patch
@@ -1,12 +1,20 @@
 diff -urN maradns-1.0.26.old/rng/Makefile maradns-1.0.26.dev/rng/Makefile
---- maradns-1.4.03.orig/rng/Makefile	2006-01-02 17:59:33.000000000 +0100
-+++ maradns-1.4.03/rng/Makefile	2010-02-06 00:19:48.241836878 +0100
-@@ -25,7 +25,7 @@ rng-api-fst.o: rng-alg-fst.o rng-api-fst
- 	$(CC) -c $(FLAGS) -o rng-api-fst.o rng-api-fst.c
+--- maradns-1.4.05.orig/rng/Makefile	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.05/rng/Makefile	2011-01-21 16:47:29.318658272 +0100
+@@ -19,13 +19,13 @@ superclean:
+ 	rm -f $(ROBJECTS) core make_32bit_tables $(TABLES)
+ 
+ rng-alg-fst.o: rng-alg-fst.c rng-alg-fst.h $(TABLES)
+-	$(CC) -c $(FLAGS) -o rng-alg-fst.o rng-alg-fst.c
++	$(CC) -c $(CFLAGS) -o rng-alg-fst.o rng-alg-fst.c
+ 
+ rng-api-fst.o: rng-alg-fst.o rng-api-fst.h 
+-	$(CC) -c $(FLAGS) -o rng-api-fst.o rng-api-fst.c
++	$(CC) -c $(CFLAGS) -o rng-api-fst.o rng-api-fst.c
  
  make_32bit_tables: make_32bit_tables.c
 -	$(CC) -o make_32bit_tables make_32bit_tables.c
-+	$(HOSTCC) -o make_32bit_tables make_32bit_tables.c
++	$(CC_FOR_BUILD) -o make_32bit_tables make_32bit_tables.c
  
  rng-32bit-tables.h: make_32bit_tables
  	./make_32bit_tables > rng-32bit-tables.h
diff --git a/package/maradns/patches/patch-Makefile b/package/maradns/patches/patch-Makefile
index d1fc651c4..c06bf9a64 100644
--- a/package/maradns/patches/patch-Makefile
+++ b/package/maradns/patches/patch-Makefile
@@ -1,12 +1,12 @@
---- maradns-1.4.03.orig/Makefile	2006-01-02 17:59:33.000000000 +0100
-+++ maradns-1.4.03/Makefile	2010-02-06 00:19:48.471836901 +0100
+--- maradns-1.4.05.orig/Makefile	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.05/Makefile	2011-01-21 16:48:06.124913980 +0100
 @@ -1,15 +1,82 @@
 -# This is a wrapper that runs "./configure ; make"
 -all:
 -	./compile.sh
-+VERSION=1.4.03
-+COMPILED="Linux system at Sat Feb 6 00:19:48 CET 2010"
-+COMPILED_DEBUG="Linux system at Sat Feb 6 00:19:48 CET 2010 (Debug)"
++VERSION=1.4.05
++COMPILED="Linux system at Fri Jan 21 16:48:06 CET 2011"
++COMPILED_DEBUG="Linux system at Fri Jan 21 16:48:06 CET 2011 (Debug)"
 +# Server objects
 +SOBJECTS=server/MaraBigHash.o
 +# js_string library (buffer overflow resistant string library) objects
@@ -34,23 +34,23 @@
 +# LDFLAGS=-L/usr/ucblib -lucb -lxnet
 +# end the Solaris section
 +# Non-Solaris version of "M"
-+V="VERSION=$(VERSION)"
++VER="VERSION=$(VERSION)"
 +Q="DEFINES=-DSELECT_PROBLEM"
 +
 +# Debug
 +
-+FLAGS = -O2 -Wall -DSELECT_PROBLEM
-+M="CC=$(CC) $(FLAGS)"
-+D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
++CFLAGS ?= -O2 -Wall -DSELECT_PROBLEM
++M="CC=$(CC)"
++D="CC=$(CC) -DDEBUG -DTHREADS"
 +#FLAGS = -g
 +
 +all: 
 +	cd libs ; make $(M) ; cd ../dns ; make $(M) ; \
 +	cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \
 +	cd ../qual ; make $(M) ; cd ../server ; \
-+	make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
++	make $(M) $(VER) COMPILED=\"$(COMPILED)\" ; \
 +	cd ../tools ; make $(M) ; \
-+	cd ../tcp ; make $(M) $(V) ; cat ../00README.FIRST
++	cd ../tcp ; make $(M) $(VER)
 +
 +debug: 
 +	cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \
diff --git a/package/maradns/patches/patch-build_Makefile_linux b/package/maradns/patches/patch-build_Makefile_linux
index 2e7dec5be..44b68b5a4 100644
--- a/package/maradns/patches/patch-build_Makefile_linux
+++ b/package/maradns/patches/patch-build_Makefile_linux
@@ -1,5 +1,5 @@
---- maradns-1.4.03.orig/build/Makefile.linux	2006-11-24 12:44:29.000000000 +0100
-+++ maradns-1.4.03/build/Makefile.linux	2010-02-06 00:23:58.393084387 +0100
+--- maradns-1.4.05.orig/build/Makefile.linux	2006-11-24 12:44:29.000000000 +0100
++++ maradns-1.4.05/build/Makefile.linux	2011-01-21 16:36:23.968658279 +0100
 @@ -23,23 +23,23 @@ EXECS=server/maradns
  # LDFLAGS=-L/usr/ucblib -lucb -lxnet
  # end the Solaris section
@@ -14,8 +14,8 @@
 -M="CC=$(CC) $(FLAGS)"
 -D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
 +CFLAGS ?= -O2 -Wall -DSELECT_PROBLEM
-+M="CC=$(CC) $(CFLAGS)"
-+D="CC=$(CC) $(CFLAGS) -DDEBUG -DTHREADS"
++M="CC=$(CC)"
++D="CC=$(CC) -DDEBUG -DTHREADS"
  #FLAGS = -g
  
  all: 
diff --git a/package/maradns/patches/patch-dns_Makefile b/package/maradns/patches/patch-dns_Makefile
index 70713032f..81855b3dc 100644
--- a/package/maradns/patches/patch-dns_Makefile
+++ b/package/maradns/patches/patch-dns_Makefile
@@ -1,5 +1,5 @@
---- maradns-1.4.03.orig/dns/Makefile	2005-12-20 11:10:40.000000000 +0100
-+++ maradns-1.4.03/dns/Makefile	2010-02-06 00:19:48.481829524 +0100
+--- maradns-1.4.05.orig/dns/Makefile	2005-12-20 11:10:40.000000000 +0100
++++ maradns-1.4.05/dns/Makefile	2011-01-21 16:48:06.144914132 +0100
 @@ -3,7 +3,7 @@ JOBJS=../libs/JsStr.o ../libs/JsStrOS.o 
  MHOBJS=../libs/MaraHash.o
  OBJECTS=$(DOBJECTS) $(JOBJS) $(MHOBJS)
@@ -9,3 +9,22 @@
  #FLAGS = -g $(DEBUG)
  
  all: Queries.o Compress.o bobbit.o Decompress.o
+@@ -12,14 +12,14 @@ clean:
+ 	rm -f Queries.o Compress.o bobbit.o Decompress.o
+ 
+ Queries.o: Queries.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Queries.o Queries.c 
++	$(CC) -c $(CFLAGS) -o Queries.o Queries.c 
+ 
+ Compress.o: Compress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Compress.o Compress.c 
++	$(CC) -c $(CFLAGS) -o Compress.o Compress.c 
+ 
+ Decompress.o: Decompress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Decompress.o Decompress.c 
++	$(CC) -c $(CFLAGS) -o Decompress.o Decompress.c 
+ 
+ bobbit.o: bobbit.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o bobbit.o bobbit.c 
++	$(CC) -c $(CFLAGS) -o bobbit.o bobbit.c 
+ 
diff --git a/package/maradns/patches/patch-dns_Makefile_recursive b/package/maradns/patches/patch-dns_Makefile_recursive
new file mode 100644
index 000000000..3e8339140
--- /dev/null
+++ b/package/maradns/patches/patch-dns_Makefile_recursive
@@ -0,0 +1,21 @@
+--- maradns-1.4.05.orig/dns/Makefile.recursive	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.05/dns/Makefile.recursive	2011-01-21 16:47:09.678658422 +0100
+@@ -12,14 +12,14 @@ clean:
+ 	rm -f Queries.o Compress.o bobbit.o Decompress.o
+ 
+ Queries.o: Queries.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Queries.o Queries.c 
++	$(CC) -c $(CFLAGS) -o Queries.o Queries.c 
+ 
+ Compress.o: Compress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Compress.o Compress.c 
++	$(CC) -c $(CFLAGS) -o Compress.o Compress.c 
+ 
+ Decompress.o: Decompress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o Decompress.o Decompress.c 
++	$(CC) -c $(CFLAGS) -o Decompress.o Decompress.c 
+ 
+ bobbit.o: bobbit.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o bobbit.o bobbit.c 
++	$(CC) -c $(CFLAGS) -o bobbit.o bobbit.c 
+ 
diff --git a/package/maradns/patches/patch-libs_Makefile b/package/maradns/patches/patch-libs_Makefile
new file mode 100644
index 000000000..4c8ec3255
--- /dev/null
+++ b/package/maradns/patches/patch-libs_Makefile
@@ -0,0 +1,31 @@
+--- maradns-1.4.05.orig/libs/Makefile	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.05/libs/Makefile	2011-01-21 16:46:50.568579851 +0100
+@@ -9,22 +9,22 @@ clean:
+ 	rm -f core $(OBJECTS) tests mtest *.exe
+ 
+ MaraHash.o: JsStr.h MaraHash.c
+-	$(CC) -c $(FLAGS) -o MaraHash.o MaraHash.c 
++	$(CC) -c $(CFLAGS) -o MaraHash.o MaraHash.c 
+ 
+ JsStr.o: JsStr.h JsStr.c
+-	$(CC) -c $(FLAGS) -o JsStr.o JsStr.c 
++	$(CC) -c $(CFLAGS) -o JsStr.o JsStr.c 
+ 
+ JsStrOS.o: JsStr.h JsStrOS.c
+-	$(CC) -c $(FLAGS) -o JsStrOS.o JsStrOS.c 
++	$(CC) -c $(CFLAGS) -o JsStrOS.o JsStrOS.c 
+ 
+ JsStrCP.o: JsStr.h JsStrCP.c
+-	$(CC) -c $(FLAGS) -o JsStrCP.o JsStrCP.c 
++	$(CC) -c $(CFLAGS) -o JsStrCP.o JsStrCP.c 
+ 
+ mtest: mtest.c $(OBJECTS)
+-	$(CC) $(FLAGS) -o mtest mtest.c $(OBJECTS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o mtest mtest.c $(OBJECTS)
+ 
+ tests: tests.c $(OBJECTS)
+-	$(CC) $(FLAGS) -o tests tests.c $(OBJECTS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o tests tests.c $(OBJECTS)
+ 
+ #onetime: $(OBJECTS) kiwi.h config.h onetime.c do_scramble.o cryptdate.o
+ #	$(CC) $(FLAGS) -o onetime onetime.c do_scramble.o cryptdate.o
diff --git a/package/maradns/patches/patch-parse_Makefile b/package/maradns/patches/patch-parse_Makefile
new file mode 100644
index 000000000..b7098c969
--- /dev/null
+++ b/package/maradns/patches/patch-parse_Makefile
@@ -0,0 +1,80 @@
+--- maradns-1.4.05.orig/parse/Makefile	2006-07-18 05:50:44.000000000 +0200
++++ maradns-1.4.05/parse/Makefile	2011-01-21 16:47:47.994913518 +0100
+@@ -8,8 +8,8 @@ DOBJECTS=../dns/Queries.o ../dns/Compres
+ OBJECTS=$(JOBJS) $(MHOBJS) $(POBJECTS) $(DOBJECTS) $(OUTOBJ)
+ EXECS=parsetest parsetest2
+ 
+-#FLAGS = -g -Wall $(DEBUG)
+-#FLAGS = -g $(DEBUG)
++#CFLAGS = -g -Wall $(DEBUG)
++#CFLAGS = -g $(DEBUG)
+ 
+ all: $(POBJECTS) $(OUTOBJ)
+ 
+@@ -20,50 +20,50 @@ clean:
+ 	cd libs ; make
+ 
+ ParseMaraRc.o: ParseMaraRc.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h ParseMaraRc_en.h
+-	$(CC) -c $(FLAGS) -o ParseMaraRc.o ParseMaraRc.c 
++	$(CC) -c $(CFLAGS) -o ParseMaraRc.o ParseMaraRc.c 
+ 
+ ParseCsv1.o: ParseCsv1.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o ParseCsv1.o ParseCsv1.c 
++	$(CC) -c $(CFLAGS) -o ParseCsv1.o ParseCsv1.c 
+ 
+ ParseIpAcl.o: ParseIpAcl.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c
++	$(CC) -c $(CFLAGS) -o ParseIpAcl.o ParseIpAcl.c
+ 
+ Parse_ipv6.o: Parse_ipv6.c ../libs/MaraHash.h
+-	$(CC) -c $(FLAGS) -o Parse_ipv6.o Parse_ipv6.c
++	$(CC) -c $(CFLAGS) -o Parse_ipv6.o Parse_ipv6.c
+ 
+ Csv2_esc_txt.o: Csv2_esc_txt.c ../libs/JsStr.h
+-	$(CC) -c $(FLAGS) -o Csv2_esc_txt.o Csv2_esc_txt.c
++	$(CC) -c $(CFLAGS) -o Csv2_esc_txt.o Csv2_esc_txt.c
+ 
+ Csv2_main.o: Csv2_main.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_main.o Csv2_main.c
++	$(CC) -c $(CFLAGS) -o Csv2_main.o Csv2_main.c
+ 
+ Csv2_read.o: Csv2_read.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_read.o Csv2_read.c
++	$(CC) -c $(CFLAGS) -o Csv2_read.o Csv2_read.c
+ 
+ Csv2_parse.o: Csv2_parse.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_parse.o Csv2_parse.c
++	$(CC) -c $(CFLAGS) -o Csv2_parse.o Csv2_parse.c
+ 
+ Csv2_rr_aaaa.o: Csv2_rr_aaaa.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_rr_aaaa.o Csv2_rr_aaaa.c
++	$(CC) -c $(CFLAGS) -o Csv2_rr_aaaa.o Csv2_rr_aaaa.c
+ 
+ Csv2_rr_wks.o: Csv2_rr_wks.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_rr_wks.o Csv2_rr_wks.c
++	$(CC) -c $(CFLAGS) -o Csv2_rr_wks.o Csv2_rr_wks.c
+ 
+ Csv2_rr_a.o: Csv2_rr_a.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_rr_a.o Csv2_rr_a.c
++	$(CC) -c $(CFLAGS) -o Csv2_rr_a.o Csv2_rr_a.c
+ 
+ Csv2_rr_soa.o: Csv2_rr_soa.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_rr_soa.o Csv2_rr_soa.c
++	$(CC) -c $(CFLAGS) -o Csv2_rr_soa.o Csv2_rr_soa.c
+ 
+ Csv2_rr_txt.o: Csv2_rr_txt.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_rr_txt.o Csv2_rr_txt.c
++	$(CC) -c $(CFLAGS) -o Csv2_rr_txt.o Csv2_rr_txt.c
+ 
+ Csv2_database.o: Csv2_database.c ../libs/JsStr.h Csv2_read.h
+-	$(CC) -c $(FLAGS) -o Csv2_database.o Csv2_database.c
++	$(CC) -c $(CFLAGS) -o Csv2_database.o Csv2_database.c
+ 
+ parsetest: parsetest.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) 
++	$(CC) $(CFLAGS) -o parsetest parsetest.c $(OBJECTS) 
+ 
+ parsetest2: parsetest2.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) 
++	$(CC) $(CFLAGS) -o parsetest2 parsetest2.c $(OBJECTS) 
+ 
diff --git a/package/maradns/patches/patch-qual_Makefile_threadsafe b/package/maradns/patches/patch-qual_Makefile_threadsafe
new file mode 100644
index 000000000..81ef93c77
--- /dev/null
+++ b/package/maradns/patches/patch-qual_Makefile_threadsafe
@@ -0,0 +1,9 @@
+--- maradns-1.4.05.orig/qual/Makefile.threadsafe	2006-01-22 06:22:01.000000000 +0100
++++ maradns-1.4.05/qual/Makefile.threadsafe	2011-01-21 16:48:40.348658539 +0100
+@@ -8,5 +8,5 @@ clean:
+ 	rm -f qual_timestamp.o
+ 
+ qual_timestamp.o: qual_timestamp.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o qual_timestamp.o qual_timestamp.c 
++	$(CC) -c $(CFLAGS) -o qual_timestamp.o qual_timestamp.c 
+ 
diff --git a/package/maradns/patches/patch-rng_rng-32bit-tables_h b/package/maradns/patches/patch-rng_rng-32bit-tables_h
index 61ebbff70..2f4647940 100644
--- a/package/maradns/patches/patch-rng_rng-32bit-tables_h
+++ b/package/maradns/patches/patch-rng_rng-32bit-tables_h
@@ -1,5 +1,5 @@
---- maradns-1.4.03.orig/rng/rng-32bit-tables.h	2010-02-02 18:12:47.000000000 +0100
-+++ maradns-1.4.03/rng/rng-32bit-tables.h	2010-02-06 00:19:49.965584207 +0100
+--- maradns-1.4.05.orig/rng/rng-32bit-tables.h	2010-09-25 16:14:04.000000000 +0200
++++ maradns-1.4.05/rng/rng-32bit-tables.h	2011-01-21 16:25:33.324914221 +0100
 @@ -1,332 +1,332 @@
  /* This file is automatically generated by the program make_32bit_tables.c */
  
diff --git a/package/maradns/patches/patch-server_Makefile b/package/maradns/patches/patch-server_Makefile
index 96595433b..571fba3eb 100644
--- a/package/maradns/patches/patch-server_Makefile
+++ b/package/maradns/patches/patch-server_Makefile
@@ -1,5 +1,5 @@
---- maradns-1.4.03.orig/server/Makefile	2006-01-02 17:59:33.000000000 +0100
-+++ maradns-1.4.03/server/Makefile	2010-02-06 00:19:48.471836901 +0100
+--- maradns-1.4.05.orig/server/Makefile	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.05/server/Makefile	2011-01-21 16:45:45.307408698 +0100
 @@ -1,11 +1,13 @@
 -SOBJECTS=MaraBigHash.o recursive.o timestamp.o read_kvars.o MaraAnyChain.o
 +SOBJECTS=MaraBigHash.o recursive.o timestamp.o read_kvars.o MaraAnyChain.o \
@@ -16,13 +16,37 @@
  POBJECTS=../parse/ParseMaraRc.o ../parse/ParseCsv1.o $(POBJ4) $(POBJ5)
  DOBJECTS=../dns/Queries.o ../dns/Compress.o ../dns/bobbit.o ../dns/Decompress.o
  ROBJECTS=../rng/rng-api-fst.o ../rng/rng-alg-fst.o
-@@ -46,6 +48,9 @@ timestamp.o: timestamp.c MaraDNS_locale.
- MaraAnyChain.o: MaraAnyChain.c
- 	$(CC) -c $(FLAGS) -o MaraAnyChain.o MaraAnyChain.c
+@@ -32,23 +34,26 @@ libs/tests:
+ 	cd libs ; make
  
-+udpsuccess.o: udpsuccess.c
-+	$(CC) -c $(FLAGS) -o udpsuccess.o udpsuccess.c
+ read_kvars.o: read_kvars.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o read_kvars.o read_kvars.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o read_kvars.o read_kvars.c
+ 
+ MaraBigHash.o: MaraBigHash.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h MaraBigHash_locale.h
+-	$(CC) -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o MaraBigHash.o MaraBigHash.c 
+ 
+ recursive.o: recursive.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o recursive.o recursive.c 
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o recursive.o recursive.c 
+ 
+ timestamp.o: timestamp.c MaraDNS_locale.h
+-	$(CC) -c $(FLAGS) -o timestamp.o timestamp.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o timestamp.o timestamp.c
+ 
+ MaraAnyChain.o: MaraAnyChain.c
+-	$(CC) -c $(FLAGS) -o MaraAnyChain.o MaraAnyChain.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o MaraAnyChain.o MaraAnyChain.c
 +
++udpsuccess.o: udpsuccess.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o udpsuccess.o udpsuccess.c
+ 
  maradns: MaraDNS.c $(OBJECTS) MaraDNS_locale.h
- 	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
+ 
+ simple: simple.c $(XOBJECTS) MaraDNS_locale.h
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c 
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c 
  
diff --git a/package/maradns/patches/patch-server_Makefile_recursive b/package/maradns/patches/patch-server_Makefile_recursive
new file mode 100644
index 000000000..cb0d5268c
--- /dev/null
+++ b/package/maradns/patches/patch-server_Makefile_recursive
@@ -0,0 +1,37 @@
+--- maradns-1.4.05.orig/server/Makefile.recursive	2007-08-16 15:35:43.000000000 +0200
++++ maradns-1.4.05/server/Makefile.recursive	2011-01-21 16:45:30.748658697 +0100
+@@ -34,26 +34,26 @@ libs/tests:
+ 	cd libs ; make
+ 
+ read_kvars.o: read_kvars.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o read_kvars.o read_kvars.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o read_kvars.o read_kvars.c
+ 
+ MaraBigHash.o: MaraBigHash.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h MaraBigHash_locale.h
+-	$(CC) -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o MaraBigHash.o MaraBigHash.c 
+ 
+ recursive.o: recursive.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-	$(CC) -c $(FLAGS) -o recursive.o recursive.c 
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o recursive.o recursive.c 
+ 
+ timestamp.o: timestamp.c MaraDNS_locale.h
+-	$(CC) -c $(FLAGS) -o timestamp.o timestamp.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o timestamp.o timestamp.c
+ 
+ MaraAnyChain.o: MaraAnyChain.c
+-	$(CC) -c $(FLAGS) -o MaraAnyChain.o MaraAnyChain.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o MaraAnyChain.o MaraAnyChain.c
+ 
+ udpsuccess.o: udpsuccess.c
+-	$(CC) -c $(FLAGS) -o udpsuccess.o udpsuccess.c
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o udpsuccess.o udpsuccess.c
+ 
+ maradns: MaraDNS.c $(OBJECTS) MaraDNS_locale.h
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
+ 
+ simple: simple.c $(XOBJECTS) MaraDNS_locale.h
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c 
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c 
+ 
diff --git a/package/maradns/patches/patch-tcp_Makefile b/package/maradns/patches/patch-tcp_Makefile
index cbb673b59..4b5d12cd4 100644
--- a/package/maradns/patches/patch-tcp_Makefile
+++ b/package/maradns/patches/patch-tcp_Makefile
@@ -1,5 +1,5 @@
---- maradns-1.4.03.orig/tcp/Makefile	2005-12-20 11:10:40.000000000 +0100
-+++ maradns-1.4.03/tcp/Makefile	2010-02-06 00:19:48.481829524 +0100
+--- maradns-1.4.05.orig/tcp/Makefile	2005-12-20 11:10:40.000000000 +0100
++++ maradns-1.4.05/tcp/Makefile	2011-01-21 16:41:10.254914344 +0100
 @@ -2,10 +2,11 @@ JOBJS=../libs/JsStr.o ../libs/JsStrOS.o 
  MJOBJS=../qual/qual_timestamp.o
  MHOBJS=../libs/MaraHash.o
@@ -22,3 +22,18 @@
  #FLAGS = -g $(DEBUG)
  
  all: $(EXECS)
+@@ -25,11 +26,11 @@ clean:
+ 	rm -f core $(EXECS) $(TCPOBJS) *.exe
+ 
+ getzone: getzone.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o getzone getzone.c $(OBJECTS)
+ 
+ fetchzone: fetchzone.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o fetchzone fetchzone.c $(OBJECTS) 
++	$(CC) $(CFLAGS) $(LDFLAGS) -o fetchzone fetchzone.c $(OBJECTS) 
+ 
+ zoneserver: zoneserver.c zoneserver_en.h $(OBJECTS)
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS)
+ 
diff --git a/package/maradns/patches/patch-tcp_Makefile_recursive b/package/maradns/patches/patch-tcp_Makefile_recursive
new file mode 100644
index 000000000..38a7a7047
--- /dev/null
+++ b/package/maradns/patches/patch-tcp_Makefile_recursive
@@ -0,0 +1,17 @@
+--- maradns-1.4.05.orig/tcp/Makefile.recursive	2006-07-18 05:50:44.000000000 +0200
++++ maradns-1.4.05/tcp/Makefile.recursive	2011-01-21 16:40:56.008658167 +0100
+@@ -26,11 +26,11 @@ clean:
+ 	rm -f core $(EXECS) $(TCPOBJS) *.exe
+ 
+ getzone: getzone.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o getzone getzone.c $(OBJECTS)
+ 
+ fetchzone: fetchzone.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o fetchzone fetchzone.c $(OBJECTS) 
++	$(CC) $(CFLAGS) $(LDFLAGS) -o fetchzone fetchzone.c $(OBJECTS) 
+ 
+ zoneserver: zoneserver.c zoneserver_en.h $(OBJECTS)
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS)
+ 
diff --git a/package/maradns/patches/patch-tools_Makefile_recursive b/package/maradns/patches/patch-tools_Makefile_recursive
new file mode 100644
index 000000000..bf0f20d6f
--- /dev/null
+++ b/package/maradns/patches/patch-tools_Makefile_recursive
@@ -0,0 +1,25 @@
+--- maradns-1.4.05.orig/tools/Makefile.recursive	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.05/tools/Makefile.recursive	2011-01-21 16:42:58.874910569 +0100
+@@ -18,17 +18,17 @@ clean:
+ 	rm -f core $(EXECS) *.exe
+ 
+ askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ)
+-	$(CC) $(FLAGS) -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ)
+ 
+ askmara-tcp: askmara-tcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS)
+-	$(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS)
+ 
+ benchmark: benchmark.c askmara_labels_en.h $(OBJECTS) $(POBJECTS)
+-	$(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS)
+ 
+ duende: duende.c 
+-	$(CC) $(FLAGS) -o duende duende.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o duende duende.c
+ 
+ strip.control: strip.control.c
+-	$(CC) $(FLAGS) -o strip.control strip.control.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o strip.control strip.control.c
+