maradns: Upgrade to version 1.4.03

* Patch the Makefiles so LDFLAGS is passed to the linker

3 files changed, 66 insertions, 6 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 8abd64e2c0..df4eda7dc1 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -18574,10 +18574,6 @@ sha256=59b1c19817ed65ba8f0d3a2ac8f06ecf5c12f452d10170fa04f6824ea257437f
 md5=5ac39978f55ecaf6e887cd5be027b1c3
 sha256=4ac5940d25a9b5a52d0ff1f8223bb85462f9cfcceb4ac547e3ca9b6690aad394
 
-[http://www.maradns.org/download/1.0/maradns-1.0.41.tar.bz2]
-md5=9abc13da25c1103d788ee9def1c8e764
-sha256=42930f57e2fb965360a31de35d8eb8c2b0cdd06172e413e8cfec5745b6a236b8
-
 [ftp://ftp.debian.org/debian/pool/main/m/masqmail/masqmail_0.2.21.orig.tar.gz]
 md5=7e989a8b0562054aea22c654507f2cb5
 sha256=2257099c760c12daf094744c6b2269d476e3bc6b523366168ad81bdd2ebd2445
diff --git a/recipes/maradns/files/compile-1.4.0.3.patch b/recipes/maradns/files/compile-1.4.0.3.patch
new file mode 100644
index 0000000000..ad7d1f8617
--- /dev/null
+++ b/recipes/maradns/files/compile-1.4.0.3.patch
@@ -0,0 +1,61 @@
+Index: maradns-1.4.03/server/Makefile.recursive
+===================================================================
+--- maradns-1.4.03.orig/server/Makefile.recursive	2010-03-17 13:04:16.831313185 +0800
++++ maradns-1.4.03/server/Makefile.recursive	2010-03-17 13:04:31.304869993 +0800
+@@ -52,8 +52,8 @@
+ 	$(CC) -c $(FLAGS) -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 $(LDFLAGS)
+ 
+ simple: simple.c $(XOBJECTS) MaraDNS_locale.h
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c 
++	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c $(LDFLAGS)
+ 
+Index: maradns-1.4.03/tcp/Makefile.recursive
+===================================================================
+--- maradns-1.4.03.orig/tcp/Makefile.recursive	2010-03-17 13:20:21.270078031 +0800
++++ maradns-1.4.03/tcp/Makefile.recursive	2010-03-17 13:20:37.020069979 +0800
+@@ -26,11 +26,11 @@
+ 	rm -f core $(EXECS) $(TCPOBJS) *.exe
+ 
+ getzone: getzone.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS)
++	$(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS) $(LDFLAGS)
+ 
+ fetchzone: fetchzone.c $(OBJECTS) 
+-	$(CC) $(FLAGS) -o fetchzone fetchzone.c $(OBJECTS) 
++	$(CC) $(FLAGS) -o fetchzone fetchzone.c $(OBJECTS) $(LDFLAGS)
+ 
+ zoneserver: zoneserver.c zoneserver_en.h $(OBJECTS)
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS)
++	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS) $(LDFLAGS)
+ 
+Index: maradns-1.4.03/tools/Makefile.recursive
+===================================================================
+--- maradns-1.4.03.orig/tools/Makefile.recursive	2010-03-17 13:05:46.600079208 +0800
++++ maradns-1.4.03/tools/Makefile.recursive	2010-03-17 13:10:39.090763025 +0800
+@@ -18,17 +18,17 @@
+ 	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) $(FLAGS) -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ) $(LDFLAGS)
+ 
+ askmara-tcp: askmara-tcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS)
+-	$(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS)
++	$(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS) $(LDFLAGS)
+ 
+ benchmark: benchmark.c askmara_labels_en.h $(OBJECTS) $(POBJECTS)
+-	$(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS)
++	$(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS) $(LDFLAGS)
+ 
+ duende: duende.c 
+-	$(CC) $(FLAGS) -o duende duende.c
++	$(CC) $(FLAGS) -o duende duende.c $(LDFLAGS)
+ 
+ strip.control: strip.control.c
+-	$(CC) $(FLAGS) -o strip.control strip.control.c
++	$(CC) $(FLAGS) -o strip.control strip.control.c $(LDFLAGS)
+ 
diff --git a/recipes/maradns/maradns_1.0.41.bb b/recipes/maradns/maradns_1.4.03.bb
index a8bed6f05e..4d547a2788 100644
--- a/recipes/maradns/maradns_1.0.41.bb
+++ b/recipes/maradns/maradns_1.4.03.bb
@@ -3,9 +3,12 @@ SECTION = "console/network"
 HOMEPAGE = "http://www.maradns.org"
 LICENSE = "PD"
 
-SRC_URI = "http://www.maradns.org/download/1.0/maradns-${PV}.tar.bz2 \
+SRC_URI = "http://www.maradns.org/download/1.4/${PV}/maradns-${PV}.tar.bz2;name=src \
            file://init \
-           file://rng-makefile-build-cc.patch;patch=1;pnum=0"
+           file://rng-makefile-build-cc.patch;patch=1;pnum=0 \
+           file://compile-1.4.0.3.patch;patch=1 "
+SRC_URI[src.md5sum] = "071b3a3df07e18855a7edf9a6281641a"
+SRC_URI[src.sha256sum] = "a611b6ac0f3abee62c227b128c1773be4a2a41de75a37ca123d684db33793b23"
 
 do_install() {
 	install -d ${D}${bindir}