From patchwork Fri Jan 1 17:59:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1421701 X-Patchwork-Delegate: hauke@hauke-m.de 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=none (p=none dis=none) header.from=hauke-m.de 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=uNNSjy6w; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=hauke-m.de header.i=@hauke-m.de header.a=rsa-sha256 header.s=MBO0001 header.b=J3wzYtSj; 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 4D6tD95T0Tz9sRR for ; Sat, 2 Jan 2021 05:03:01 +1100 (AEDT) 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=rQsXYYP94T1BzZ9YBOr/8U3+ppYSOf3kGA78W1laeS4=; b=uNNSjy6wJD0dMEoBiP0yCPjetR noxaifYJRasfoCx58uB6EZ7i0dYwHk77yQfU5vyj/oJtp03v4nAnzBrQsOqZFwHozzQg7yvaLwNj1 1z/JxizD0r7m1qscPNsWItt/nwAha540US3X680tyoGxx2YYH4EYtalURC5MIjYKACW7ztp14VNef bZ0XSBfVEvMH8QzKUw5SD47nW2C9xkDA4VnJLcIUMxS1trfYheBGFWNNtwnAh9sac+daYG+j8je6r plOX4PCVafuzmWZqek92YYXX5g+2yK2AuaFtn7aaBByxZ78ycgyGBtNet/YE1BGlX2ZEM513CTgO5 V6VcGmgA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kvOi8-0004D9-MB; Fri, 01 Jan 2021 17:59:36 +0000 Received: from mout-p-202.mailbox.org ([80.241.56.172]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kvOi2-0004Cn-EW for openwrt-devel@lists.openwrt.org; Fri, 01 Jan 2021 17:59:33 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4D6t7x3LFXzQkm9; Fri, 1 Jan 2021 18:59:25 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hauke-m.de; s=MBO0001; t=1609523963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9iKO4AtoFuEBnTVarSb7RuLtWnk7Hv1/7jS20kLFMe0=; b=J3wzYtSjr8kuVBXUb8DfnlndiMa04l21vnm4fvi/9+dFXRNrvUTcVWlJOnGK6VdVAMGX2i RL3sruFiFT7r/sFFCGBMKifu8vDg74H20RXlg0QxNm9R8PcSt0KW80IDnihxJuEXc55qvJ QkLGX388YM08iHOoyvvCnXoMzX+J2NKKDNnXZ0TvLdVUgw/fga7Ur0Csk6keBQC1a4js0c qqcSjadFdhf87Dff6HT1T4UJ6kEBedhKX82F/rCpVbsQn1rUwQiqoOn/MSsKpOG6bL+JZr /AcvjXynmhM4a9ftfhGx/aFrvGmlPr9sVVqLfPTDhbSzwFGiHzg3vgbZ3dZ8Tg== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id cmogZ4M9btuS; Fri, 1 Jan 2021 18:59:22 +0100 (CET) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Subject: [PATCH] ppp: Remove already applied patch Date: Fri, 1 Jan 2021 18:59:06 +0100 Message-Id: <20210101175906.27550-1-hauke@hauke-m.de> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -7.13 / 15.00 / 15.00 X-Rspamd-Queue-Id: 5362517E4 X-Rspamd-UID: b6bcb9 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210101_125931_866813_C56BF123 X-CRM114-Status: GOOD ( 14.99 ) X-Spam-Score: -0.9 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.56.172 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [80.241.56.172 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from 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.0 RCVD_IN_MSPIKE_WL Mailspike good senders 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: Hauke Mehrtens Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This patch was already applied upstream and not needed here. Fixes: 06403981e1f2 ("ppp: update to version 2.4.7.git-2019-05-06") Signed-off-by: Hauke Mehrtens --- package/network/services/ppp/Makefile | 2 +- .../ppp/patches/540-save-pppol2tp_fd_str.patch | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 package/network/services/ppp/patches/540-save-pppol2tp_fd_str.patch diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile index cabe1ecbf30e..48d7120a7296 100644 --- a/package/network/services/ppp/Makefile +++ b/package/network/services/ppp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ppp -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/paulusmack/ppp diff --git a/package/network/services/ppp/patches/540-save-pppol2tp_fd_str.patch b/package/network/services/ppp/patches/540-save-pppol2tp_fd_str.patch deleted file mode 100644 index d6d44afbd090..000000000000 --- a/package/network/services/ppp/patches/540-save-pppol2tp_fd_str.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/pppd/plugins/pppol2tp/pppol2tp.c -+++ b/pppd/plugins/pppol2tp/pppol2tp.c -@@ -152,6 +152,10 @@ static int setdevname_pppol2tp(char **ar - if (pppol2tp_fd_str == NULL) - novm("PPPoL2TP FD"); - -+ pppol2tp_fd_str = strdup(*argv); -+ if (pppol2tp_fd_str == NULL) -+ novm("PPPoL2TP FD"); -+ - /* Setup option defaults. Compression options are disabled! */ - - modem = 0;