Convert maradns to new packaging style

SVN-Revision: 927

diff --git a/openwrt/package/maradns/Makefile b/openwrt/package/maradns/Makefile
index 7394630c699170848b9f4be4177a00a2c31e751e..8ef1d84cbc2d3e480a273220b822c98fad219027 100644 (file)
--- a/openwrt/package/maradns/Makefile
+++ b/openwrt/package/maradns/Makefile
@@ -12,21 +12,14 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-IPKG_MARADNS:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-IDIR_MARADNS:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
-INFO_MARADNS:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+include $(TOPDIR)/package/rules.mk
 
-$(DL_DIR)/$(PKG_SOURCE):
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
-
-$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
-       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       $(PATCH) $(PKG_BUILD_DIR) ./patches
-       touch $(PKG_BUILD_DIR)/.prepared
+$(eval $(call PKG_template,MARADNS,maradns,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-       (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
@@ -46,42 +39,34 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                --mandir=/usr/share/man \
                --sbindir=/usr/sbin \
                --sysconfdir=/etc \
-               $(DISABLE_NLS) \
-               $(DISABLE_LARGEFILE) \
+                 $(DISABLE_LARGEFILE) \
+                 $(DISABLE_NLS) \
+                 --enable-shared \
+                 --disable-static \
        );
        touch $(PKG_BUILD_DIR)/.configured
 
-$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CFLAGS="$(TARGET_CFLAGS)" \
                FLAGS="$(TARGET_CFLAGS)" \
                CC=$(TARGET_CC) \
                HOSTCC="$(HOSTCC)"
+       mkdir -p $(PKG_INSTALL_DIR)/usr/{bin,sbin}
+       mkdir -p $(PKG_INSTALL_DIR)/usr/man/man{1,5,8}
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               PREFIX="$(PKG_INSTALL_DIR)/usr" \
+               install
+       touch $(PKG_BUILD_DIR)/.built
 
-$(IPKG_MARADNS): $(PKG_BUILD_DIR)/$(PKG_NAME)
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_MARADNS) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       mkdir -p $(IDIR_MARADNS)/usr/bin
-       mkdir -p $(IDIR_MARADNS)/usr/sbin
-       cp $(PKG_BUILD_DIR)/server/maradns $(IDIR_MARADNS)/usr/sbin/
-       cp $(PKG_BUILD_DIR)/tuzona/getzone $(IDIR_MARADNS)/usr/bin/
-       cp $(PKG_BUILD_DIR)/tuzona/zoneserver $(IDIR_MARADNS)/usr/sbin/
-       cp $(PKG_BUILD_DIR)/tools/askmara $(IDIR_MARADNS)/usr/bin/
-       $(STRIP) $(IDIR_MARADNS)/usr/sbin/*
-       $(STRIP) $(IDIR_MARADNS)/usr/bin/*
-       cp -a ./files/* $(IDIR_MARADNS)/
-       find $(IDIR_MARADNS) -name CVS | xargs rm -rf
-       echo "/etc/maradns/maradnsrc" > $(IDIR_MARADNS)/CONTROL/conffiles
-       chmod 755 $(IDIR_MARADNS)/etc/init.d/*
-       mkdir -p $(PACKAGE_DIR)
+$(IPKG_MARADNS):
+       install -d -m0755 $(IDIR_MARADNS)/etc
+       install -m0644 ./files/mararc $(IDIR_MARADNS)/etc/mararc
+       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 -fpR $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone} $(IDIR_MARADNS)/usr/bin/
+       install -d -m0755 $(IDIR_MARADNS)/usr/sbin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(IDIR_MARADNS)/usr/sbin/
+       $(RSTRIP) $(IDIR_MARADNS)
        $(IPKG_BUILD) $(IDIR_MARADNS) $(PACKAGE_DIR)
-
-$(INFO_MARADNS): $(IPKG_MARADNS)
-       $(IPKG) install $(IPKG_MARADNS)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(IPKG_MARADNS)
-install: $(INFO_MARADNS)
-
-clean:
-       rm -rf $(PKG_BUILD_DIR) $(IPKG_MARADNS)

diff --git a/openwrt/package/maradns/files/etc/init.d/S60maradns b/openwrt/package/maradns/files/etc/init.d/S60maradns
deleted file mode 100755 (executable)
index a7a92a8..0000000
--- a/openwrt/package/maradns/files/etc/init.d/S60maradns
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/sbin/maradns -f /etc/maradns/maradnsrc >/dev/null 2>&1 &

diff --git a/openwrt/package/maradns/files/etc/maradns/maradnsrc b/openwrt/package/maradns/files/etc/maradns/maradnsrc
deleted file mode 100644 (file)
index ee91cbc..0000000
--- a/openwrt/package/maradns/files/etc/maradns/maradnsrc
+++ /dev/null
@@ -1,9 +0,0 @@
-hide_disclaimer="YES"
-chroot_dir="/etc/maradns"
-bind_address="0.0.0.0"
-run_as_root=1
-maxprocs=10
-random_seed_file="/dev/urandom"
-recursive_acl="192.168.1.0/24"
-root_servers={}
-root_servers["."]="198.41.0.4,128.9.0.107,192.33.4.12,128.8.10.90,192.203.230.10,192.5.5.241,192.112.36.4,128.63.2.53,192.36.148.17,192.58.128.30,193.0.14.129,198.32.64.12,202.12.27.33"

diff --git a/openwrt/package/maradns/files/maradns.init b/openwrt/package/maradns/files/maradns.init
new file mode 100644 (file)
index 0000000..d469f9e
--- /dev/null
+++ b/openwrt/package/maradns/files/maradns.init
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/sbin/maradns >/dev/null 2>&1 &

diff --git a/openwrt/package/maradns/files/mararc b/openwrt/package/maradns/files/mararc
new file mode 100644 (file)
index 0000000..ee91cbc
--- /dev/null
+++ b/openwrt/package/maradns/files/mararc
@@ -0,0 +1,9 @@
+hide_disclaimer="YES"
+chroot_dir="/etc/maradns"
+bind_address="0.0.0.0"
+run_as_root=1
+maxprocs=10
+random_seed_file="/dev/urandom"
+recursive_acl="192.168.1.0/24"
+root_servers={}
+root_servers["."]="198.41.0.4,128.9.0.107,192.33.4.12,128.8.10.90,192.203.230.10,192.5.5.241,192.112.36.4,128.63.2.53,192.36.148.17,192.58.128.30,193.0.14.129,198.32.64.12,202.12.27.33"

diff --git a/openwrt/package/maradns/ipkg/maradns.conffiles b/openwrt/package/maradns/ipkg/maradns.conffiles
new file mode 100644 (file)
index 0000000..53fcab8
--- /dev/null
+++ b/openwrt/package/maradns/ipkg/maradns.conffiles
@@ -0,0 +1 @@
+/etc/mararc
\ No newline at end of file

diff --git a/openwrt/package/maradns/ipkg/maradns.control b/openwrt/package/maradns/ipkg/maradns.control
new file mode 100644 (file)
index 0000000..b217503
--- /dev/null
+++ b/openwrt/package/maradns/ipkg/maradns.control
@@ -0,0 +1,10 @@
+Package: maradns
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Section: net
+Priority: optional
+Depends: libpthread
+Description: MaraDNS is a small, secure DNS Server
+  MaraDNS is intended for environments where a DNS 
+  server must be secure and where the server must use
+  the absolute minimum number of resources possible.

diff --git a/openwrt/package/maradns/maradns.control b/openwrt/package/maradns/maradns.control
deleted file mode 100644 (file)
index b217503..0000000
--- a/openwrt/package/maradns/maradns.control
+++ /dev/null
@@ -1,10 +0,0 @@
-Package: maradns
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Section: net
-Priority: optional
-Depends: libpthread
-Description: MaraDNS is a small, secure DNS Server
-  MaraDNS is intended for environments where a DNS 
-  server must be secure and where the server must use
-  the absolute minimum number of resources possible.