Changeset 41246


Ignore:
Timestamp:
2014-06-18T12:04:34+02:00 (4 years ago)
Author:
cyrus
Message:

dnsmasq: various house-keeping updates

  • Add Authoritative DNS and IPSET to full variant
  • Remove some bloat from IPSET support
  • Reintroduce "DHCP no address warning"-patch

Signed-off-by: Steven Barth <steven@…>

Location:
trunk/package/network/services/dnsmasq
Files:
2 added
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/package/network/services/dnsmasq/Makefile

    r41244 r41246  
    1010PKG_NAME:=dnsmasq 
    1111PKG_VERSION:=2.71 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    2929  SECTION:=net 
    3030  CATEGORY:=Base system 
    31   TITLE:=A lightweight DNS and DHCP server 
     31  TITLE:=DNS and DHCP server 
    3232  URL:=http://www.thekelleys.org.uk/dnsmasq/ 
    3333endef 
     
    4747define Package/dnsmasq-full 
    4848$(call Package/dnsmasq/Default) 
    49   TITLE += (with DHCPv6 and DNSSEC) 
     49  TITLE += (with DNSSEC, DHCPv6, Auth DNS, IPSET) 
    5050  DEPENDS:=@IPV6 +kmod-ipv6 +libnettle 
    5151  VARIANT:=full 
     
    6565$(call Package/dnsmasq/description) 
    6666 
    67 This is a variant with DHCPv6 and DNSSEC support 
     67This is a variant with DHCPv6, DNSSEC, Authroitative DNS and IPSET support 
    6868endef 
    6969 
     
    7979TARGET_LDFLAGS += -Wl,--gc-sections 
    8080 
    81 COPTS = $(if $(CONFIG_IPV6),,-DNO_IPV6) -DNO_IPSET -DNO_AUTH 
     81COPTS = $(if $(CONFIG_IPV6),,-DNO_IPV6) 
    8282 
    8383ifeq ($(BUILD_VARIANT),nodhcpv6) 
     
    8888        COPTS += -DHAVE_DNSSEC 
    8989        COPTS += $(if $(CONFIG_LIBNETTLE_MINI),-DNO_GMP,) 
     90else 
     91        COPTS += -DNO_AUTH -DNO_IPSET 
    9092endif 
    9193 
  • trunk/package/network/services/dnsmasq/patches/001-Build-config-add-DNO_GMP-for-use-with-nettle-mini-gm.patch

    r41245 r41246  
    1111 4 files changed, 17 insertions(+), 4 deletions(-) 
    1212 
    13 diff --git a/Makefile b/Makefile 
    14 index c58b50b..17eeb27 100644 
    1513--- a/Makefile 
    1614+++ b/Makefile 
    17 @@ -61,7 +61,7 @@ lua_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CON 
     15@@ -61,7 +61,7 @@ lua_cflags =    `echo $(COPTS) | $(top)/ 
    1816 lua_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.1`  
    1917 nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags nettle hogweed` 
     
    2422 version =     -DVERSION='\"`$(top)/bld/get-version $(top)`\"' 
    2523  
    26 diff --git a/bld/pkg-wrapper b/bld/pkg-wrapper 
    27 index 9f9332d..0ddb678 100755 
    2824--- a/bld/pkg-wrapper 
    2925+++ b/bld/pkg-wrapper 
     
    4541              echo $in | grep ${search}_STATIC >/dev/null 2>&1; then 
    4642        pkg=`$pkg  --static $op $*` 
    47 diff --git a/src/config.h b/src/config.h 
    48 index 2155544..ee6d218 100644 
    4943--- a/src/config.h 
    5044+++ b/src/config.h 
     
    7064 CONFFILE 
    7165 RESOLVFILE 
    72 diff --git a/src/dnssec.c b/src/dnssec.c 
    73 index 44d626b..2ffb75d 100644 
    7466--- a/src/dnssec.c 
    7567+++ b/src/dnssec.c 
     
    8476 #define SERIAL_UNDEF  -100 
    8577 #define SERIAL_EQ        0 
    86 --  
    87 2.0.0 
    88  
Note: See TracChangeset for help on using the changeset viewer.