From patchwork Fri May 4 13:16:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 156925 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 458FEB6FA8 for ; Fri, 4 May 2012 23:17:15 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 71F7FA0309; Fri, 4 May 2012 13:17:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KawTPDK7N-+a; Fri, 4 May 2012 13:17:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id D724FA0352; Fri, 4 May 2012 13:17:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 444488F753 for ; Fri, 4 May 2012 13:17:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 357AA8A8DE for ; Fri, 4 May 2012 13:17:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id izJ8tKpO1wgo for ; Fri, 4 May 2012 13:17:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [74.118.36.95]) by whitealder.osuosl.org (Postfix) with ESMTPS id 206F58A63C for ; Fri, 4 May 2012 13:17:08 +0000 (UTC) Received: from asgard (host105.190-136-216.telecom.net.ar [190.136.216.105]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.4/8.14.4) with ESMTP id q44DH2S2000661 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 4 May 2012 10:17:04 -0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1336137426; bh=DVPOYSAZBsVMzaAX3lAUkzboNGfVlpCLhiaqnURR3jQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=ohfmMTf6/YkVpnCCY1VWlh3NzB0FC2y04TQ60iZehuht4cwuR/axzyMoBlRyy/f+A bRldVjV7sxR/lVLCl3PFo+lPlII0NKZ0QsPTXCFajoEEptxp8rKw+2oLmjjFTzHj2j CkS5Kf21TdahKwrcbnS1tgLP9lyJKBoRdmKOlw4w= Received: by asgard (sSMTP sendmail emulation); Fri, 04 May 2012 10:17:02 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Fri, 4 May 2012 10:16:47 -0300 Message-Id: <1336137407-25136-4-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1336137407-25136-1-git-send-email-gustavo@zacarias.com.ar> References: <1336137407-25136-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.97.3 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCHv3 4/4] dnsmasq: bump to version 2.61 and enhance X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Bump to dnsmasq version 2.61. Add new conntrack functionality: makes for more sturdy firewall setups. Make IDN build without libintl, it's no longer needed and problematic for other packages when there's no NLS support enabled. Locale support does require IDN so just build it when IDN=y. Signed-off-by: Gustavo Zacarias --- package/dnsmasq/Config.in | 13 ++++++++++--- package/dnsmasq/dnsmasq.mk | 28 +++++++++++++++++++++------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in index f434b8b..e67aa46 100644 --- a/package/dnsmasq/Config.in +++ b/package/dnsmasq/Config.in @@ -21,13 +21,14 @@ config BR2_PACKAGE_DNSMASQ_DHCP Enable DHCP server support in dnsmasq. config BR2_PACKAGE_DNSMASQ_IDN - bool "IDN support (BIG!)" + bool "IDN support" depends on BR2_USE_WCHAR - select BR2_PACKAGE_LIBINTL select BR2_PACKAGE_LIBIDN + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE help Enable IDN support in dnsmasq. - This option is a big space taker since is pulls in many libraries. + This option is a big space taker since it pulls in many libraries. config BR2_PACKAGE_DNSMASQ_LUA bool "Lua scripting support" @@ -35,4 +36,10 @@ config BR2_PACKAGE_DNSMASQ_LUA help Enable lua scripting for dnsmasq +config BR2_PACKAGE_DNSMASQ_CONNTRACK + bool "conntrack marking support" + select BR2_PACKAGE_LIBNETFILTER_CONNTRACK + help + Enable DNS query connection marking in netfilter. + endif diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index c1995a0..2484b35 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ############################################################# -DNSMASQ_VERSION = 2.60 +DNSMASQ_VERSION = 2.61 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)" DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" @@ -22,10 +22,23 @@ ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y) DNSMASQ_COPTS += -DNO_TFTP endif +# NLS requires IDN so only enable it (i18n) when IDN is true ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y) - DNSMASQ_MAKE_OPT += all-i18n - DNSMASQ_DEPENDENCIES += libidn libintl - DNSMASQ_MAKE_OPT += LDFLAGS+="-lintl -lidn" + DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) + DNSMASQ_MAKE_OPT += LDFLAGS+="-lidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" + DNSMASQ_COPTS += -DHAVE_IDN + DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n) +endif + +ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y) + DNSMASQ_DEPENDENCIES += host-pkg-config libnetfilter_conntrack +endif + +ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y) +define DNSMASQ_ENABLE_CONNTRACK + $(SED) 's^.*#define HAVE_CONNTRACK.*^#define HAVE_CONNTRACK^' \ + $(DNSMASQ_DIR)/src/config.h +endef endif ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y) @@ -65,16 +78,17 @@ define DNSMASQ_ENABLE_DBUS $(DNSMASQ_DIR)/src/config.h endef endif - + define DNSMASQ_BUILD_CMDS $(DNSMASQ_FIX_PKGCONFIG) $(DNSMASQ_ENABLE_DBUS) $(DNSMASQ_ENABLE_LUA) - $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) + $(DNSMASQ_ENABLE_CONNTRACK) + $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) all$(DNSMASQ_I18N) endef define DNSMASQ_INSTALL_TARGET_CMDS - $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) install + $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) install$(DNSMASQ_I18N) mkdir -p $(TARGET_DIR)/var/lib/misc/ endef