From patchwork Mon Apr 30 12:49:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 155858 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id D2358B6F62 for ; Mon, 30 Apr 2012 22:50:07 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0C6D010033B; Mon, 30 Apr 2012 12:50:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id V0F96avVfdAY; Mon, 30 Apr 2012 12:50:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B19211004ED; Mon, 30 Apr 2012 12:50:02 +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 C62E58F753 for ; Mon, 30 Apr 2012 12:50:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A02328CFA0 for ; Mon, 30 Apr 2012 12:50:01 +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 OwMydkfmqeHs for ; Mon, 30 Apr 2012 12:50:00 +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 D96178CF6D for ; Mon, 30 Apr 2012 12:49:59 +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 q3UCntWW019042 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 30 Apr 2012 09:49:56 -0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1335790198; bh=rMpCV9Cfk8zRPWux+DAVzyn2xAosapjf6VAcYusUbQQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=nB6ACs12FRfg3Nht3tiYkNxxHnJ8vXdf1VGSUJ/VdvGeL5+cpczfv9W+qnK8OpGhW f+XJBZNrbpgnvCNELbUE1hX4c7saak+EmgCXMc7N4MHhAyvciwfR8SfBelKCT6rnXI 1WJreHFLqfwLN1A1MtejTAzqnLuUTKLELzGSdsEg= Received: by asgard (sSMTP sendmail emulation); Mon, 30 Apr 2012 09:49:54 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Mon, 30 Apr 2012 09:49:38 -0300 Message-Id: <1335790178-25333-4-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1335790178-25333-1-git-send-email-gustavo@zacarias.com.ar> References: <1335790178-25333-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.97.3 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 4/4] dnsmasq: bump to version 2.61 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 dnsmasq to version 2.61 and add new conntrack functionality. This allows for more sturdy firewall setups and/or accounting. Signed-off-by: Gustavo Zacarias --- package/dnsmasq/Config.in | 6 ++++++ package/dnsmasq/dnsmasq.mk | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in index f434b8b..fa2499e 100644 --- a/package/dnsmasq/Config.in +++ b/package/dnsmasq/Config.in @@ -35,4 +35,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..3f189d7 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)" @@ -28,6 +28,17 @@ ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y) DNSMASQ_MAKE_OPT += LDFLAGS+="-lintl -lidn" 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) DNSMASQ_DEPENDENCIES += lua DNSMASQ_MAKE_OPT += LDFLAGS+="-ldl" @@ -70,6 +81,7 @@ define DNSMASQ_BUILD_CMDS $(DNSMASQ_FIX_PKGCONFIG) $(DNSMASQ_ENABLE_DBUS) $(DNSMASQ_ENABLE_LUA) + $(DNSMASQ_ENABLE_CONNTRACK) $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) endef