From patchwork Fri Jul 24 12:15:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Kroken X-Patchwork-Id: 1335660 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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=merlin.20170209 header.b=Ls4e3sN9; 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=IFFERYLr; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4BCpBv72R0z9sSn for ; Fri, 24 Jul 2020 22:18:29 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=T7K6YoPaOdmg0ws6mJY8KETdcyt6eLPVkrD4hRjcmo8=; b=Ls4e3sN9oYDR8K+KNPv47Z+SWx hlT6ylZWBqEpXwIwWpboR73Ua++xY2hvCTpRWXY+uf17dRKTj8TDR0EXs+ZFT/+BD/F/RS9Nkun6i RQ9sohP55Yt2kDYD0GIeWEwV+wfI06dMo7n6FZxddCH7To2YTPXgSdOTp0ex0ZdVyUJrdYF/xd9C/ 3D8Efwqbad/OSgDqMpCsCjte4Ye6LuEfWAeqoryl/CSDEx2dDrZsQTBgbsyoTfDi0Xyqa80QJN9Y3 W+xVuDCfyI3Fa0w1bgrMouSmNYFSpX4c80A2/UCLF+y3O0/lAgCKU3ubcptPTryPBDRGnPjq3YP2T Eo62GcoQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jywbw-0008PF-2h; Fri, 24 Jul 2020 12:15:36 +0000 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jywbt-0008Oq-Fe for openwrt-devel@lists.openwrt.org; Fri, 24 Jul 2020 12:15:34 +0000 Received: by mail-lf1-x141.google.com with SMTP id v15so532698lfg.6 for ; Fri, 24 Jul 2020 05:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=njuJmxsZ2SIw+Ec5oayIOfJuJ//rBDBDCove89ta6qs=; b=IFFERYLryZ7/ViFTBiiP6NZbpuAADY5trTVVgL7KIrQwz4TfpxBEGX63BUU8Om2LM6 hbUxY0XZPVc5pqwLoX4nMCodSknwhnS/QfS5yBCgX3hkkTXx3w1HI6Q1+n06xfB1SYZF Gw+qVPDqu7O1qbgbHSVXVQPKuLPMJe21F21s67kADWNlA1tvRoG4BAULLWdrXPnHML+0 X+00yA2WbvwqzQMQ7/6ONRG6B4mWkqvkHqz3XC3E+0+OfIXgqAascae3XyldTWo7ty0W yaVoxpun0SS3faeg+FznSl/fJ6dak9SrVsgg/OhqZ2P99z2xjg7qhSceSDfCxqRyrkpg pjnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=njuJmxsZ2SIw+Ec5oayIOfJuJ//rBDBDCove89ta6qs=; b=FwYeLAYurEC9EH+yZLKn8WNYy9tVgPQrAhUm02ddNU2C+aZZZtzoqhaoowTQigyar/ 5D0w1GCCEFIFzVLUHtpDW4ZwrqyYvh3oXw5MX54I1jl/a6jaz5ILnV3BZkPHKXiwH06d fypX8UhHhIAmQq7mJOC579g5yTkFBRPYkurqMMXfhyVoQ8zIpAv6mnzz6hoD1oOO9lXP MQmg36n0XZ867wy9lU7uAKlgqJ0BgWSjdFN5+sIasBdAPCxEaIhGz6sPPZAwGyPMZYbJ WPIaKCMJNOHcYbkOPPsXuvwf7EJU0TYB24SigLBB1qlvpz1QXokS1HZ+ilO1SZfqw7+S N2Rg== X-Gm-Message-State: AOAM530mRAemoWiDAu9V01mKhIC0JW6eKZ01bJ4NwyJDZXf0oz9tH5IC x1z16tG60bcFNhm10VYqu5glpqRT X-Google-Smtp-Source: ABdhPJwd3AhAsKBsBEx5FFRMTx0CmdsDcBFH0jxUQIQRSeEngwrN7Dam0yH296xDr0LuPfb28+6yng== X-Received: by 2002:a19:9149:: with SMTP id y9mr4976885lfj.81.1595592930322; Fri, 24 Jul 2020 05:15:30 -0700 (PDT) Received: from localhost.localdomain (209.89-10-150.nextgentel.com. [89.10.150.209]) by smtp.gmail.com with ESMTPSA id 202sm230174lfg.24.2020.07.24.05.15.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:15:29 -0700 (PDT) From: Magnus Kroken To: openwrt-devel@lists.openwrt.org Subject: [PATCH] busybox: delete redundant patch Date: Fri, 24 Jul 2020 14:15:17 +0200 Message-Id: <20200724121517.1561-1-mkroken@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200724_081533_560345_9DA6701C X-CRM114-Status: UNSURE ( 6.72 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:141 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [mkroken[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Magnus Kroken Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This problem has been fixed in upstream commit 6b6a3d9339f1c08efaa18a7fb7357e20b48bdc95. This patch now (harmlessly) adds the same definition a second time. Signed-off-by: Magnus Kroken --- .../patches/130-mconf_missing_sigwinch.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 package/utils/busybox/patches/130-mconf_missing_sigwinch.patch diff --git a/package/utils/busybox/patches/130-mconf_missing_sigwinch.patch b/package/utils/busybox/patches/130-mconf_missing_sigwinch.patch deleted file mode 100644 index b8ca2122b8..0000000000 --- a/package/utils/busybox/patches/130-mconf_missing_sigwinch.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/scripts/kconfig/mconf.c -+++ b/scripts/kconfig/mconf.c -@@ -31,6 +31,10 @@ - #define SIGWINCH 28 - #endif - -+#ifndef SIGWINCH -+#define SIGWINCH 28 -+#endif -+ - #define LKC_DIRECT_LINK - #include "lkc.h" -