From patchwork Sat Jun 26 15:05:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etan Kissling X-Patchwork-Id: 1497638 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=KK5ZSspQ; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=tJi7Lc71; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GBy0y31Btz9sWM for ; Sun, 27 Jun 2021 01:08:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AUdgp29Z6tzDM/9lD1Oa+q2l4hgBnxhZzobddvhIIJI=; b=KK5ZSspQe+9+ff Xl1zfT3Rd4vAGiFdxM4dzgE1MRwj6ZEEPv9eeuqb7hDC0rY1JbXg+ILj+Kgj8RCo8YYdSilhP42cY tZUYmQ+W33TQDdgdgMWPlCdW0F/bexQc7cZkeJAY8boXo9DbZDowkCsaCI6kL7Z0oCNSW4jox6+TG aVl0oCCqnxiJdGHq1uhyhxuFrIH9+MntHFekXoJ1YjAPCtu5+tIoIvt1hdTozm/AfKjIm7cL+0Eg8 d89jNsdMlsSBSoEo2UWzOt5bb7IN8LzXqMmuB5lOqHRPavgF/HZx9KUrCGKR93iv2d0l1PoGwjQPA Q0HPeL58NwWjcGgP0KFw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lx9sC-004JqT-9C; Sat, 26 Jun 2021 15:05:32 +0000 Received: from mail-io1-xd32.google.com ([2607:f8b0:4864:20::d32]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lx9s8-004Jpj-8G for openwrt-devel@lists.openwrt.org; Sat, 26 Jun 2021 15:05:29 +0000 Received: by mail-io1-xd32.google.com with SMTP id b7so16179816ioq.12 for ; Sat, 26 Jun 2021 08:05:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:thread-topic:thread-index:date:message-id :references:in-reply-to:accept-language:content-language :content-transfer-encoding:mime-version; bh=saAegI1zFuba8Dr69wHfXM8De6qKKiQ2jLbybTOAaL4=; b=tJi7Lc71bBwaLX5CsFx2YlEQ/VSfiWC2tdCnoUlAwsMDWyXFD3qU4A8Ef3SFrfSp3/ sRoyiofGRhh1u2qKLTG0OjvV9cALSb/6JvG7WTA4/tgLeBBt9jqEo04O2iThdN60pmiU mkmZ80X9pWDBBEEOaUkP5xV3sJebi/MtJu2mZrjI0OIdp/lrS2jXV5bIhGAHI/f29u1i qXvaLnLlJWwTVVvRoTW9qJ9fvCC6OCmWheMJdKEJ4yAXeEbIBIJuOWCxwKLYr5ZwsFXn 2K4vrP89mdL7KjuWCT8UQ4aE1WPaNs6ZaC6sQjnqJpnko3qu+lXEbGyjrcHLhgp3Q751 mYBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:thread-topic:thread-index:date :message-id:references:in-reply-to:accept-language:content-language :content-transfer-encoding:mime-version; bh=saAegI1zFuba8Dr69wHfXM8De6qKKiQ2jLbybTOAaL4=; b=MRJEwW7Yr+Z3i5DKwdrH0LNsFpGyggVuKMrw0K+0q8BDPoubPYmYKabzuVRJmj/H0g VDfXKbuv32llIZDfqPi0k/40PmzFLir0ZuOay9uJF5A7jiOaRNN6qXKPfQi4ijXKyDEq f4Mo6dL719hCUZWRDQSB01SwLLwjZXmoCsaaFzLirjZLVThBc0I5TpxAD4YYR5exwnvA JPYFOmitAL3Y6kwfzszIH3bL6NJQdCdaJg+1agk58dftjDTqXE3CLda1bT2va+wSWoYA khfdTRtPPbGey/1INRAGz5VODrKUxrNFHrXanZNSWwLbAqAAEJu0HeTt+wLs5OcdaAfi PvKQ== X-Gm-Message-State: AOAM533zIFlzvqEQbHFshU93vVY0VmP91Io6y8kZ75nI1N2AJeRxtBwa x5Pn0sz0Pedz2YU80KwGNUvo0a7Eq/c= X-Google-Smtp-Source: ABdhPJxMiOQlUjDh5EHIDDMWK1Np7gv95xkF4lPkahk6NljmZYqoLnqkIdzy1ZFjL6/KSgfmpjMALA== X-Received: by 2002:a5d:948a:: with SMTP id v10mr13044515ioj.37.1624719927303; Sat, 26 Jun 2021 08:05:27 -0700 (PDT) Received: from AS8PR09MB5466.eurprd09.prod.outlook.com ([2603:1026:c03:64ad::5]) by smtp.gmail.com with ESMTPSA id r8sm5303459iln.35.2021.06.26.08.05.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Jun 2021 08:05:26 -0700 (PDT) From: Etan Kissling To: "openwrt-devel@lists.openwrt.org" Subject: [PATCH 21.02 1/2] dnsmasq: Update to version 2.86test3 Thread-Topic: [PATCH 21.02 1/2] dnsmasq: Update to version 2.86test3 Thread-Index: AQHXapyxXXg4D4qs40O0/fPwA6yCmA== X-MS-Exchange-MessageSentRepresentingType: 1 Date: Sat, 26 Jun 2021 15:05:24 +0000 Message-ID: References: , , In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-Exchange-Organization-SCL: -1 X-MS-TNEF-Correlator: X-MS-Exchange-Organization-RecordReviewCfmType: 0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210626_080528_368137_43EA3702 X-CRM114-Status: GOOD ( 11.00 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Need this version to add config option for connmark DNS filtering. Summary of upstream CHANGELOG: * Handle DHCPREBIND requests in the DHCPv6 server code. * Fix bug which caused dnsmasq to lose track of processes forked. * Major rewrite of the DNS server and domain ha [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:d32 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [etan.kissling[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Need this version to add config option for connmark DNS filtering. Summary of upstream CHANGELOG: * Handle DHCPREBIND requests in the DHCPv6 server code. * Fix bug which caused dnsmasq to lose track of processes forked. * Major rewrite of the DNS server and domain handling code. * Revise resource handling for number of concurrent DNS queries. * Improve efficiency of DNSSEC. * Connection track mark based DNS query filtering. Signed-off-by: Etan Kissling (cherry picked from commit 3628870015ef46eacf2c936f36e3c1ed3b4c9855) Signed-off-by: Etan Kissling --- package/network/services/dnsmasq/Makefile | 6 +++--- .../patches/100-remove-old-runtime-kernel-support.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index 90a81b5f65..53080cb95b 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_UPSTREAM_VERSION:=2.85 +PKG_UPSTREAM_VERSION:=2.86test3 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION))) PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz -PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -PKG_HASH:=ad98d3803df687e5b938080f3d25c628fe41c878752d03fbc6199787fee312fa +PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/test-releases +PKG_HASH:=0d0b465db89390e9f518f1239dec88b458c84489e7fd38586af6a5781f85e7db PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch b/package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch index b601bce1a9..5670808afc 100644 --- a/package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch +++ b/package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch @@ -26,7 +26,7 @@ Signed-off-by: Kevin Darbyshire-Bryant --- a/src/dnsmasq.h +++ b/src/dnsmasq.h -@@ -1144,7 +1144,7 @@ extern struct daemon { +@@ -1185,7 +1185,7 @@ extern struct daemon { int inotifyfd; #endif #if defined(HAVE_LINUX_NETWORK) @@ -35,7 +35,7 @@ Signed-off-by: Kevin Darbyshire-Bryant #elif defined(HAVE_BSD_NETWORK) int dhcp_raw_fd, dhcp_icmp_fd, routefd; #endif -@@ -1326,9 +1326,6 @@ int read_write(int fd, unsigned char *pa +@@ -1368,9 +1368,6 @@ int read_write(int fd, unsigned char *pa void close_fds(long max_fd, int spare1, int spare2, int spare3); int wildcard_match(const char* wildcard, const char* match); int wildcard_matchn(const char* wildcard, const char* match, int num);