From d4574145085218e93f55724924e3e99c39ea3afd Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 17 Mar 2010 13:37:41 +0800 Subject: maradns: Upgrade to version 1.4.03 * Patch the Makefiles so LDFLAGS is passed to the linker --- recipes/maradns/files/compile-1.4.0.3.patch | 61 +++++++++++++++++++++++++++++ recipes/maradns/maradns_1.0.41.bb | 43 -------------------- recipes/maradns/maradns_1.4.03.bb | 46 ++++++++++++++++++++++ 3 files changed, 107 insertions(+), 43 deletions(-) create mode 100644 recipes/maradns/files/compile-1.4.0.3.patch delete mode 100644 recipes/maradns/maradns_1.0.41.bb create mode 100644 recipes/maradns/maradns_1.4.03.bb (limited to 'recipes') 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.0.41.bb deleted file mode 100644 index a8bed6f05e..0000000000 --- a/recipes/maradns/maradns_1.0.41.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "A security-aware DNS server" -SECTION = "console/network" -HOMEPAGE = "http://www.maradns.org" -LICENSE = "PD" - -SRC_URI = "http://www.maradns.org/download/1.0/maradns-${PV}.tar.bz2 \ - file://init \ - file://rng-makefile-build-cc.patch;patch=1;pnum=0" - -do_install() { - install -d ${D}${bindir} - install -d ${D}${sbindir} - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/mararc - install -d ${D}${sysconfdir}/init.d - install -d ${D}${mandir}/man1 - install -d ${D}${mandir}/man5 - install -d ${D}${mandir}/man8 - - sed -i -e "s:PREFIX/man:PREFIX/share/man:" \ - -e "s:PREFIX/doc/maradns-\$VERSION:PREFIX/share/doc/${PF}:" \ - build/install.locations - - oe_runmake \ - TOPLEVEL=${S} \ - BUILDDIR=${S}/build \ - RPM_BUILD_ROOT=${D} \ - PREFIX=${D}/usr \ - MAN1=${D}${mandir}/man1 \ - MAN5=${D}${mandir}/man5 \ - MAN8=${D}${mandir}/man8 \ - install - - mv ${D}${sysconfdir}/mararc/example_mararc ${D}${sysconfdir}/maradns/mararc - rm -r ${D}${sysconfdir}/mararc/ - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/maradns -} - -PACKAGES =+ "maradns-zone maradns-ask" -FILES_maradns-zone = "${sbindir}/zoneserver ${bindir}/getzone" -FILES_maradns-ask = "${bindir}/askmara" - -CONFFILES_${PN}_nylon = "/etc/maradns/mararc" diff --git a/recipes/maradns/maradns_1.4.03.bb b/recipes/maradns/maradns_1.4.03.bb new file mode 100644 index 0000000000..4d547a2788 --- /dev/null +++ b/recipes/maradns/maradns_1.4.03.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "A security-aware DNS server" +SECTION = "console/network" +HOMEPAGE = "http://www.maradns.org" +LICENSE = "PD" + +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://compile-1.4.0.3.patch;patch=1 " +SRC_URI[src.md5sum] = "071b3a3df07e18855a7edf9a6281641a" +SRC_URI[src.sha256sum] = "a611b6ac0f3abee62c227b128c1773be4a2a41de75a37ca123d684db33793b23" + +do_install() { + install -d ${D}${bindir} + install -d ${D}${sbindir} + install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir}/mararc + install -d ${D}${sysconfdir}/init.d + install -d ${D}${mandir}/man1 + install -d ${D}${mandir}/man5 + install -d ${D}${mandir}/man8 + + sed -i -e "s:PREFIX/man:PREFIX/share/man:" \ + -e "s:PREFIX/doc/maradns-\$VERSION:PREFIX/share/doc/${PF}:" \ + build/install.locations + + oe_runmake \ + TOPLEVEL=${S} \ + BUILDDIR=${S}/build \ + RPM_BUILD_ROOT=${D} \ + PREFIX=${D}/usr \ + MAN1=${D}${mandir}/man1 \ + MAN5=${D}${mandir}/man5 \ + MAN8=${D}${mandir}/man8 \ + install + + mv ${D}${sysconfdir}/mararc/example_mararc ${D}${sysconfdir}/maradns/mararc + rm -r ${D}${sysconfdir}/mararc/ + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/maradns +} + +PACKAGES =+ "maradns-zone maradns-ask" +FILES_maradns-zone = "${sbindir}/zoneserver ${bindir}/getzone" +FILES_maradns-ask = "${bindir}/askmara" + +CONFFILES_${PN}_nylon = "/etc/maradns/mararc" -- cgit v1.2.3