From patchwork Wed Jul 29 21:11:51 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: 501846 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 011B914030C for ; Thu, 30 Jul 2015 07:12:39 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 6F9F4280672; Wed, 29 Jul 2015 23:11:55 +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=BAD_ENC_HEADER,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 BBB8E28050F for ; Wed, 29 Jul 2015 23:11:51 +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-db3on0053.outbound.protection.outlook.com [157.55.234.53]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 29 Jul 2015 23:11:50 +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 VI1PR07MB0941.eurprd07.prod.outlook.com (10.161.110.146) with Microsoft SMTP Server (TLS) id 15.1.225.19; Wed, 29 Jul 2015 21:12:20 +0000 From: Kevin Darbyshire-Bryant To: Date: Wed, 29 Jul 2015 22:11:51 +0100 Message-ID: <1438204311-32508-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: DM2PR07CA0047.namprd07.prod.outlook.com (10.141.52.175) To VI1PR07MB0941.eurprd07.prod.outlook.com (25.161.110.146) X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB0941; 2:mhXv5SxJzi2pxVgazZ4ddQvr8r1pNqDqery+m5FN4Pmdc5HfOY8TMmpqva4WATeAD8YK+z5cgufD89H+17VOAP9+mKC6Si9PmfZ4eaKBVpAK3ZWrq70Mm97QFrjGpEZLWyc28KhBR31ebCpWSrgOBrNFHbAfXoxzHY6BXntTT+U=; 3:8L40QXSTQXqbOVR4v/fDZT+he/c4ZXQRkddcTuBlUUwpt5vCzEQX6aNnjlANd1zyLI4tuYWnNra8oLTPlaOoZAQX2QSRcp/xwKHvYJafvND4F094uviIrxfQ+8jgIC9q/R8xRSG5Tf3ELSnOzQmjag==; 25:ABfPeidWoizqVRP7Mtmc1ROvEvy0sZNCkC1JsapnyrIgezKr7wlnipkbxwe20Q191kwpPkUNb+1rWbh6O8KNkztkRcKzSe0xJYHOTV9ZPL8rf3onqer5XQkyHg78U1m3nvOzYuq1pTt6b2I1t0CwdvNYUEQq/tuPMVg/lmZ0gv2mC5mKKbg1A8kSNa29bIaXvNU6ZWUH+XY6ek8EXu8crre8BObnv9905wB7/gR9AAxadiUDca3RnNJizk56qJfTnMAwL5PHguY6nUr3qz/tXA==; 4:eaQ5ewyOgZwW+TNDF9lQElubuieZCPsk3ofFlItK96+p/pS7FpaaXP39ZvAPPR4TY+Gn0PRso4hZQE4mY3f6KJb/GnUC1jBfCNGtzeQhjaozRfP69umOqrBoer+gI1LyiDi8eGF+cQgIIivXCGM4jK4hcPVS/i8I9moTfU0fdsgUefZ/G2PsBvno8ImJXY5gS9qWGfL02fF6+mdOh8igBBh4MJs0DAimNhM6/b240tI3JPu4csV3ttNjVXIkprVFPrdZCi6CUXmd8aNLkiHxf/eVV+yjthPdp5iEyGl03So= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR07MB0941; 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:VI1PR07MB0941; BCL:0; PCL:0; RULEID:; SRVR:VI1PR07MB0941; X-Forefront-PRVS: 0652EA5565 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(288314003)(377424004)(19580395003)(50986999)(5001960100002)(77096005)(66066001)(33646002)(575784001)(42186005)(86362001)(53416004)(47776003)(77156002)(450100001)(46102003)(50466002)(62966003)(19580405001)(40100003)(1720100001)(2351001)(74482002)(189998001)(50226001)(92566002)(5001920100001)(229853001)(110136002)(36756003)(15975445007)(48376002)(122386002)(107886002)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR07MB0941; H:Animal.darbyshire-bryant.me.uk; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR07MB0941; 23:A7wN7lH/Y5PlZM3Rtt2NVeDwiNJZdNhtKzBFfmJyi?= =?us-ascii?Q?MBYPpnLUDuF7PgBg83/F3XroXnwU2GIGoBQBl1g3a4jN87GLMMYMDOqx3xl2?= =?us-ascii?Q?w4fRsrnNRxyMIIklrWrcgfYQH9V3RSdzajPOOGQ0zx86Q5Yld13VgI4OtLaf?= =?us-ascii?Q?5IhhCdF299MVFn+0U/ZGpoawtY24csy4wszXyUH0tUPQH8aiHC5RNwRaKvps?= =?us-ascii?Q?k/FcyfBqsk+MpXGYXkGSLNP8kQfSajU6PNBrx0hQlSi5AMxEYw0sNVr1kufW?= =?us-ascii?Q?iyTnlKd/pplxCO567PD70ugPOE2Jjc6XOS4uhnatgSS0PFADtqN6rEJtKnGw?= =?us-ascii?Q?+ypBkKT39EQCVQbKMPeYV7JQh45WDhD/23zV0CBJprBOPKALf8INP5+Xjkz+?= =?us-ascii?Q?blUFRW1r2laHVUpd5aUnnnNX/gJ9W3Wy5swUacjwhHImD4K89sCHF61Obzxn?= =?us-ascii?Q?ssP4AC6ifujMD+r0z0+Dhi24ysDZfQflmyN23Ln+qHi3Cevj8h9xXQYNAql8?= =?us-ascii?Q?h3+9rwGa23OW+qz2wQjSzEYZXez1vJQ+TyrV9GrhYIXzPdvt2uxz46Vx7YLe?= =?us-ascii?Q?F+wTrTa3qBOKZFTOqIsRs9FGLcVkGPW7yiFBsuBvgX7iU7Tz1mVSJkk4FIkF?= =?us-ascii?Q?CXYkJAxbvJUzjqNcK3BMwMMLIXH9gJZiOnSpJBEEJRC+kysTY+vkCEyFkxxK?= =?us-ascii?Q?gOAORzNyHag70tLb0I1ltszO+Z5FYUSRe4B3xF++DRVeoT6nR40ZHszuZG8S?= =?us-ascii?Q?H2F07R3Qfh+NfGNjAwEJ+ukD3QY/M4GQnjUu87AznFkdfHKWz/EbHFD2lznp?= =?us-ascii?Q?Eh3sKsaeBYf3IdKPAdLS+OdGxBpafaWesz7L3nwmIZkWWxjFK7qsBaod7ZU9?= =?us-ascii?Q?Xks8tgvFbj/4dTgHUT5X0YUXuKhbAjhIxGtpRg5LTy+H2ngcPjkE0/Zf6zGn?= =?us-ascii?Q?3WCKmvP8k3Rg5vUE1wxRHmKu2aoG0s7lM1Z7eo3iVkMnGi6MLrEP1v3zInOg?= =?us-ascii?Q?vw=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB0941; 5:Kn5MI69Hk3tH5QDdgwuI4ZUCkSPw2XLaU5BXJqWwPvSNWvaeOuzm5hBKyhcdkq5iR2/ZgJqI7B9cGR09ink5OwSwLE/NpXmlZdP6Pfbva7h4OVo6fQmzxKnPL8Lq7PIVcXWWPxMdNPvyqnD3O6W4jA==; 24:m+BruQI5sask300xCIIgmjluDxbecUTnnDNFHq9FM4hWz6q+ZOyoTrOJvGLk9p+r5eceIrRhNLPkTKU9hyfZU4/34eIOJytROhRgD7rzv64=; 20:4yuWofe1o3hNzq5twR7ur6aK4SAOlHSIOomE7eremFT98+M/vXpVgM7kEb3/lhtRdytJcAAsK6gTsJSpsZkssQ== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2015 21:12:20.2359 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB0941 Subject: [OpenWrt-Devel] [PATCH] 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 dnsmasq v2.74 Minor patch refresh also required. Signed-off-by: Kevin Darbyshire-Bryant --- package/network/services/dnsmasq/Makefile | 4 ++-- .../patches/210-dnssec-improve-timestamp-heuristic.patch | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 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/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);