From patchwork Thu Jul 30 08:20:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Darbyshire-Bryant X-Patchwork-Id: 502014 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 87A4E140789 for ; Thu, 30 Jul 2015 18:21:18 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id AFDDD280BD4; Thu, 30 Jul 2015 10:20:18 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id F01CC28050F for ; Thu, 30 Jul 2015 10:20:13 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 HELO_IP_IN_CL_SUBNET=-1.2 (check from: .darbyshire-bryant. - helo: .emea01-db3-obe.outbound.protection.outlook. - helo-domain: .outlook.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -7.7 Received: from emea01-db3-obe.outbound.protection.outlook.com (mail-db3on0092.outbound.protection.outlook.com [157.55.234.92]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 30 Jul 2015 10:20:11 +0200 (CEST) Authentication-Results: lists.openwrt.org; dkim=none (message not signed) header.d=none; Received: from Animal.darbyshire-bryant.me.uk (151.226.12.52) by DB5PR07MB0935.eurprd07.prod.outlook.com (10.161.200.142) with Microsoft SMTP Server (TLS) id 15.1.225.19; Thu, 30 Jul 2015 08:20:42 +0000 From: Kevin Darbyshire-Bryant To: Date: Thu, 30 Jul 2015 09:20:11 +0100 Message-ID: <1438244411-10801-1-git-send-email-kevin@darbyshire-bryant.me.uk> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [151.226.12.52] X-ClientProxiedBy: AM3PR02CA0077.eurprd02.prod.outlook.com (25.163.180.45) To DB5PR07MB0935.eurprd07.prod.outlook.com (25.161.200.142) X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB0935; 2:wQ8hsp+FUPeNonGSRlpPyXLc9xZ6c6W6IAvudMgWfLrcCLQC4TfyE8HmjNRIq6Jt+MWr/a9TRQ3DdSMCOX+YAjcRxbku2a8sOSiPZimyF5tE6QbhLddlG8z6R7AkNS6eNQiTyBwXSvC7IL5yJbHUnG+V7ggy4tYqPV9TU2dcH2I=; 3:UZoSYdEZlWpysevqd99rgEd+SjWR55fFXINzmYgAOSnSKD9yUA3xXeipn8eXWzHbuP7b2fKGSmJ6Uga211Xx3j785ZZVBBS9D/FR3wgakhGmEowmaED2Vx4OUJ3DL8prz8gK75SAvLYQmkgmqPQCag==; 25:vO/BgOLmrMeYGRGt8uqp8XnyMBFlW0KC1uBZdNhklojXm05wJAxfwxhHIoDUylQfKGQFfl0KTy+ybVUbpe4LMfgSTkSQ49QogWbMSR6NPONU8MYb0B1ezrClwxMn5YQ631jsBSEKH2GA7uM5n0KsePv6BQgQRDoBUVEBKsiSjZw2MCIdVkbQm6wsJidv93rFn/YxVrZAiHpP0HnmylsiBIdt5N4CL45383Vw553Xvoi9aburY6HiL2oq0W2RMU/C/rubnNVNMmobH2pYVJhkzg==; 4:NsZZb1mfmAlXWokjojHR+uqYlpT4j4PX1SOHMxUAJYn0MyKQPXaYZOJR46oL56XFNOtMGyPGJeUtNoMFbMFUbqaEHPhkqA5y/XuVR6F83csCIRnu/RGgpz+hBAhuPdq3J/Wk/K13IsYOVlssSNpoJmfzjY0J7BMiZX9ZZWVYRUt3jM95pd6phRVhysNAM8ydu6ugVYfKyksGhpZv/edkOzlnzpr3rq46lpnhM3M5xUCmvClfoHpVDves5rgT1aasVXlebzmQbxNhL09YxY3QHTpZCQumskvrVl7FdDG8bxw= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB5PR07MB0935; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:DB5PR07MB0935; BCL:0; PCL:0; RULEID:; SRVR:DB5PR07MB0935; X-Forefront-PRVS: 06530126A4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(377424004)(288314003)(86362001)(50466002)(33646002)(42186005)(40100003)(122386002)(77156002)(575784001)(19580395003)(19580405001)(48376002)(15975445007)(1720100001)(50226001)(450100001)(229853001)(2351001)(46102003)(62966003)(74482002)(36756003)(50986999)(5001960100002)(66066001)(77096005)(92566002)(107886002)(189998001)(47776003)(53416004)(110136002)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR07MB0935; H:Animal.darbyshire-bryant.me.uk; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB0935; 23:ttLKuZbeBh1qZylNAc6gEotimaWd+ed2g2poYJPTBX/UvOeyAfOCla+0zMzUCQnw6ob2jjLgwaCsV+X+5lzBbkQ8mmnzVHHjY/F2QFpfgsJ3k1YagiqaCAMGCa16a+TNgjXZaByxFtq7N9YxK9ottC5fcQeBgPyxzd5m3PYu1/DLXbx+WN/31tz8aWxjKOfrYFrLBjLjUg3uCaCEIXTCvq/BLTgb1byvLi/kTPApRyCF22VOQHFqaMuogcVnL2m+8og2D5pa7XjMHXhKQ8h9bdXmzRbiAc6oYhqolKeY/4cuHL0tQHHXF+l5r7f92mbcQ+Tu0jwrdIzJcfieIE/mztSmjGlKeOXfbpSF+mFrcyVMU2g4kx+ENZsHrnA6j2zmsDy3Cfigcsub+Aje1X+LWNdPYZWep4aMs9HpDxSD0OfzWFGTUKEWTRMLtct+Wx15G9GmuMoq9nC0n8/zDH1Y7NtfPr+f0P6+UI/lSj2hLHfdNJ6jZGyL48G87kX8xLwJJPFC9DNYKA+2lZ27I6XUZm8xzayIjOWBdtSPKtwDhxpIBMOvgvVek0vQsPSEmgIhmwa8rU/tqycuh7eOhhIbC48oZMuVE0TZK8OnszxHOiqtMhDIMHoW2cl2DRKPHXM7kXWbdBfClfsjhJC9bFXHE2GZNcNk0x/+KtUT5CYUK6ttRs9GkDRIY6ZrhtCDr4AnyzM90NFquPDxAKW4O6JffTfNPRC72vD9hR/8NhCplqIqUBQ23GzozhFjaOEnkJrX+VyTCkDTvQVjpchJixqKqk5DXQVGP60LM+PcJ4LuENgykAh79rWyonLxZ2IBP2DS3TKVoIA0nQnbbaGcXvoqbvZYyo6DFHLm4qM6o1AIdBdrDkLrN1BpOmmOh2qvUeVOkba4PnF2+c2kZ+ruCQO8KcxKkX71CEwT+eL39xuFwgm+DHqm4YultLW2HP+BefI8 X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB0935; 5:E+PKADcH3VfYVk10t/+Di1DaL7Bz1Bo/RyIfLEtN5XE+DfK3S28doPp5kXUUNOXwBd+txMLKsxtFRvozjS01NEOK5NC/Iio21BEdG/aZsWls5IgbXN0bnRSVrAgI3fUijkBaa/gTFba7ik2btnrfzw==; 24:GMQYWUGNs5xN6Iw619oBHAGPpcV4ysSjpqcUj8IQTuwfiM8AWEUvnu8UXVvMIWzHSonZxqGG/YoA+T8Gk/ieIF/Td57qSN2D+0Oni60iatk=; 20:X/fYlL/w1WcbaFlmt1om98UWxmAexwXgv6sk8hVicm9CizM7gzLIvaRSU6ETgDF6UGbt+7KEjcwJEStUUn66WQ== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2015 08:20:42.1308 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR07MB0935 Subject: [OpenWrt-Devel] [PATCH v2] dnsmasq: Bump to dnsmasq2.74 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Bump to dnsmasq2.74 & refresh patches to fix fuzz Signed-off-by: Kevin Darbyshire-Bryant --- v2 - fixed patch fuzz in 100-fix-dhcp-no-address-warning package/network/services/dnsmasq/Makefile | 4 ++-- .../dnsmasq/patches/100-fix-dhcp-no-address-warning.patch | 6 +++--- .../patches/210-dnssec-improve-timestamp-heuristic.patch | 14 ++++++-------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index 19a8df9..9b0ecc5 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.73 +PKG_VERSION:=2.74 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -PKG_MD5SUM:=b8bfe96d22945c8cf4466826ba9b21bd +PKG_MD5SUM:=f48cd0fe26a55617a375ffc95b71e3c3 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch b/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch index a502a60..f5b5ca0 100644 --- a/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch +++ b/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch @@ -9,7 +9,7 @@ struct iface_param parm; #ifdef HAVE_LINUX_NETWORK struct arpreq arp_req; -@@ -272,11 +272,9 @@ void dhcp_packet(time_t now, int pxe_fd) +@@ -275,11 +275,9 @@ void dhcp_packet(time_t now, int pxe_fd) { ifr.ifr_addr.sa_family = AF_INET; if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 ) @@ -23,7 +23,7 @@ } for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next) -@@ -295,7 +293,7 @@ void dhcp_packet(time_t now, int pxe_fd) +@@ -298,7 +296,7 @@ void dhcp_packet(time_t now, int pxe_fd) parm.relay_local.s_addr = 0; parm.ind = iface_index; @@ -32,7 +32,7 @@ { /* If we failed to match the primary address of the interface, see if we've got a --listen-address for a secondary */ -@@ -315,6 +313,12 @@ void dhcp_packet(time_t now, int pxe_fd) +@@ -318,6 +316,12 @@ void dhcp_packet(time_t now, int pxe_fd) complete_context(match.addr, iface_index, NULL, match.netmask, match.broadcast, &parm); } diff --git a/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch b/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch index 97dfe3b..81fbf18 100644 --- a/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch +++ b/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch @@ -10,35 +10,33 @@ Signed-off-by: Steven Barth --- a/src/dnssec.c +++ b/src/dnssec.c -@@ -432,17 +432,24 @@ static int back_to_the_future; +@@ -429,17 +429,24 @@ static time_t timestamp_time; int setup_timestamp(void) { struct stat statbuf; -- + time_t now; + time_t base = 1420070400; /* 1-1-2015 */ -+ - back_to_the_future = 0; + + daemon->back_to_the_future = 0; if (!daemon->timestamp_file) return 0; -- + + now = time(NULL); + + if (!stat("/proc/self/exe", &statbuf) && difftime(statbuf.st_mtime, base) > 0) + base = statbuf.st_mtime; -+ + if (stat(daemon->timestamp_file, &statbuf) != -1) { timestamp_time = statbuf.st_mtime; check_and_exit: - if (difftime(timestamp_time, time(0)) <= 0) -+ if (difftime(now, base) >= 0 && difftime(timestamp_time, now) <= 0) ++ if (difftime(now, base) >= 0 && difftime(timestamp_time, now) <= 0) { /* time already OK, update timestamp, and do key checking from the start. */ if (utime(daemon->timestamp_file, NULL) == -1) -@@ -463,7 +470,7 @@ int setup_timestamp(void) +@@ -460,7 +467,7 @@ int setup_timestamp(void) close(fd);