upgrade maradns to the latest version (#511)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3919 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/maradns/Makefile b/openwrt/package/maradns/Makefile
index 4625ed7..3af8350 100644 (file)
--- a/openwrt/package/maradns/Makefile
+++ b/openwrt/package/maradns/Makefile
@@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=maradns
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=maradns

-PKG_VERSION:=1.0.35
+PKG_VERSION:=1.2.07.2

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=1b2ba196ddde5f545af177b4531e0d70
+PKG_MD5SUM:=dc67f6a496e668127871382a40367733

 
 

-PKG_SOURCE_URL:=http://www.maradns.org/download
+PKG_SOURCE_URL:=http://www.maradns.org/download/1.2/1.2.07.2/

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 


@@ -22,27 +22,6 @@ $(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                ./configure \
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                ./configure \

-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
-               --build=$(GNU_HOST_NAME) \
-               --program-prefix="" \
-               --program-suffix="" \
-               --prefix=/usr \
-               --exec-prefix=/usr \
-               --bindir=/usr/bin \
-               --datadir=/usr/share \
-               --includedir=/usr/include \
-               --infodir=/usr/share/info \
-               --libdir=/usr/lib \
-               --libexecdir=/usr/lib \
-               --localstatedir=/var \
-               --mandir=/usr/share/man \
-               --sbindir=/usr/sbin \
-               --sysconfdir=/etc \
-                 $(DISABLE_LARGEFILE) \
-                 $(DISABLE_NLS) \
-                 --enable-shared \
-                 --disable-static \

        );
        touch $@
 
        );
        touch $@
 


@@ -66,7 +45,7 @@ $(IPKG_MARADNS):
        install -d -m0755 $(IDIR_MARADNS)/etc/init.d
        install -m0755 ./files/maradns.init $(IDIR_MARADNS)/etc/init.d/S60maradns
        install -d -m0755 $(IDIR_MARADNS)/usr/bin
        install -d -m0755 $(IDIR_MARADNS)/etc/init.d
        install -m0755 ./files/maradns.init $(IDIR_MARADNS)/etc/init.d/S60maradns
        install -d -m0755 $(IDIR_MARADNS)/usr/bin

-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone} $(IDIR_MARADNS)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone,fetchzone,duende} $(IDIR_MARADNS)/usr/bin/

        install -d -m0755 $(IDIR_MARADNS)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(IDIR_MARADNS)/usr/sbin/
        $(RSTRIP) $(IDIR_MARADNS)
        install -d -m0755 $(IDIR_MARADNS)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(IDIR_MARADNS)/usr/sbin/
        $(RSTRIP) $(IDIR_MARADNS)

diff --git a/openwrt/package/maradns/files/maradns.init b/openwrt/package/maradns/files/maradns.init
index eec174e..1b3df1f 100644 (file)
--- a/openwrt/package/maradns/files/maradns.init
+++ b/openwrt/package/maradns/files/maradns.init
@@ -1,3 +1,5 @@
 #!/bin/sh
 [ -d /etc/maradns ] || mkdir -p /etc/maradns
 #!/bin/sh
 [ -d /etc/maradns ] || mkdir -p /etc/maradns

-/usr/sbin/maradns >/dev/null 2>&1 &
+[ -d /etc/maradns/logger ] || mkdir -p /etc/maradns/logger
+duende /usr/sbin/maradns
+duende /usr/sbin/zoneserver