brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / package / dnsmasq / Makefile

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 4451f81..accce6e 100644 (file)
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -1,21 +1,19 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2011 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq

-PKG_VERSION:=2.35
-PKG_RELEASE:=1
+PKG_VERSION:=2.57
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq

-PKG_MD5SUM:=57b8643dc394cf2fbd1bced64536c6df
-PKG_CAT:=zcat
+PKG_MD5SUM:=d10faeb409717eae94718d7716ca63a4

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -23,27 +21,35 @@ define Package/dnsmasq
   SECTION:=net
   CATEGORY:=Base system
   TITLE:=A lightweight DNS and DHCP server
   SECTION:=net
   CATEGORY:=Base system
   TITLE:=A lightweight DNS and DHCP server

-  DESCRIPTION:=\
-       It is intended to provide coupled DNS and DHCP service to a LAN.

   URL:=http://www.thekelleys.org.uk/dnsmasq/
 endef
 
   URL:=http://www.thekelleys.org.uk/dnsmasq/
 endef
 

+define Package/dnsmasq/description
+ It is intended to provide coupled DNS and DHCP service to a LAN.
+endef
+

 define Package/dnsmasq/conffiles
 define Package/dnsmasq/conffiles

+/etc/config/dhcp

 /etc/dnsmasq.conf
 endef
 
 /etc/dnsmasq.conf
 endef
 

+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+

 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \

-               CFLAGS="$(TARGET_CFLAGS) -DHAVE_ISC_READER=1" \
+               CFLAGS="$(TARGET_CFLAGS)" \

                BINDIR="/usr/sbin" MANDIR="/usr/man" \
                BINDIR="/usr/sbin" MANDIR="/usr/man" \

+               AWK="awk" \
+               LDFLAGS="-Wl,--gc-sections" \

                all
 endef
 
 define Package/dnsmasq/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dnsmasq $(1)/usr/sbin/
                all
 endef
 
 define Package/dnsmasq/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dnsmasq $(1)/usr/sbin/

-       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_DATA) ./files/dhcp.conf $(1)/etc/config/dhcp

        $(INSTALL_DATA) ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq
        $(INSTALL_DATA) ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq