From patchwork Sun Dec 16 11:52:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 206675 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 413AD2C00A7 for ; Sun, 16 Dec 2012 22:52:44 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 64B21101926; Sun, 16 Dec 2012 11:52:34 +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 uH0QLNvo1WDI; Sun, 16 Dec 2012 11:52:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B1E16100E48; Sun, 16 Dec 2012 11:52:31 +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 C57458F74B for ; Sun, 16 Dec 2012 11:52:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4F4898AD17 for ; Sun, 16 Dec 2012 11:52:39 +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 YJiEYEsEYw8L for ; Sun, 16 Dec 2012 11:52:38 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5436A8AC47 for ; Sun, 16 Dec 2012 11:52:38 +0000 (UTC) Received: from asgard (host155.190-226-72.telecom.net.ar [190.226.72.155]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id qBGBqV4M032484 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 16 Dec 2012 11:52:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1355658756; bh=k/Er0JemPJMPKk7Bshrv3yRLaRzY8qsU0nLw9yR4WX8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tH2Ik79v0JLbkPtX2ays7N9Yk+mvMupvjK/CFUArtdCCDuz1LN2ACnbgZghLHG716 gFRi8gNdrHfRe9joK7HxMtEgLbSV0zsvC0q5w871jTGR55wxwqZGXd7PQDXu638eW8 LubhBv43wM3VG7LEWJBx4PmHlmjJWPbaZvAIw4Zw= Received: by asgard (sSMTP sendmail emulation); Sun, 16 Dec 2012 08:52:30 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Sun, 16 Dec 2012 08:52:17 -0300 Message-Id: <1355658737-29879-3-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1355658737-29879-1-git-send-email-gustavo@zacarias.com.ar> References: <1355658737-29879-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.97.5 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 3/3] dnsmasq: bump to version 2.65 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 Signed-off-by: Gustavo Zacarias --- .../dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch | 37 -------------------- package/dnsmasq/dnsmasq.mk | 2 +- 2 files changed, 1 insertions(+), 38 deletions(-) delete mode 100644 package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch diff --git a/package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch b/package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch deleted file mode 100644 index 817d3b2..0000000 --- a/package/dnsmasq/dnsmasq-fix-parse-server-no-dhcp.patch +++ /dev/null @@ -1,37 +0,0 @@ -From acd702292afebb8550acbfbe80638995545ccd10 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Mon, 10 Dec 2012 07:47:10 -0300 -Subject: [PATCH] Move parse_server outside the HAVE_DHCP ifdef - -Fixes build breakage when building without DHCP support. - -Signed-off-by: Gustavo Zacarias ---- - src/option.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/option.c b/src/option.c -index c1643a1..d6e323b 100644 ---- a/src/option.c -+++ b/src/option.c -@@ -641,6 +641,8 @@ static char *set_prefix(char *arg) - return arg; - } - -+#endif -+ - char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_addr, char *interface, int *flags) - { - int source_port = 0, serv_port = NAMESERVER_PORT; -@@ -728,6 +730,8 @@ char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_a - return NULL; - } - -+#ifdef HAVE_DHCP -+ - /* This is too insanely large to keep in-line in the switch */ - static int parse_dhcp_opt(char *errstr, char *arg, int flags) - { --- -1.7.8.6 - diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index afa51e2..fe75e7b 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ############################################################# -DNSMASQ_VERSION = 2.64 +DNSMASQ_VERSION = 2.65 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)" DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"