From patchwork Tue Sep 1 21:50:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1355412 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=ppb+hL4s; 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=aEwWWkux; 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 4Bh14C45cZz9sR4 for ; Wed, 2 Sep 2020 07:51:39 +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:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=oD5Ai+VSRhSFpBv73VyMls2H0OO9Aw6P+aftinRYzj4=; b=ppb+hL4sq9xh50VZ84PjTRJnW0 fiA3UulAq/jUd2qmrKW4qKto0vDmrANlTi2fGiIf7NvwOBeS47L984dwthT5oFBEEazV8dy+cjE4+ kicFXeAIyjkEbPhgI4DVsREDNSYFkFvrEHTbNnjAujeMR0xYqbfoIHLTQMp8WqWSDv2Zrh6Q2qlRW Tp1WIomzQJXq07alm2+fVtVCqANFE7xJfqUAjxGTDb24rI84VS32+cjBH08YSc5iZVqZ6N2A3XhBW FsGX4CP2gpsF+VzB/rbbF9irkzfEfUgXKwyHWm0083EPfjijfqEan8aHqe0g3dvyoHPVW9gjCBcCp OF58p3LA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDEAY-0006l0-RG; Tue, 01 Sep 2020 21:50:22 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDEAV-0006kI-A7 for openwrt-devel@lists.openwrt.org; Tue, 01 Sep 2020 21:50:20 +0000 Received: by mail-pl1-x642.google.com with SMTP id t11so1234105plr.5 for ; Tue, 01 Sep 2020 14:50:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=dUWZ10KzMUOwf8YnaU/43K1FmD+I2MwRUtpjJ3hqbnk=; b=aEwWWkux/G8HIdU7Dq+RHMssDIFD0CpoLcuAJaop/KtrLKItXft1AKYuCKPea1UVKv cxjDVNHRkuzubMOMhYJtx/DdTCmZHV82b3AMzVglJ/a8ZrEjZNJQbwQUsXg+ZVuJXFSD 3xMJxCyfxTYFt3Pjjk6maSbAWW080S6wYjiQlh9j2Lhb+INysHnjWnQIzQL9Gqi262JG HxTHiejALWvQu5LJpRl6qSGyob2aDP7weLA/ZzIjtTi9K+K/rgIG8Ty9Dvj+rf+bNso4 SsvW4ACF/dMII02qZ0YAif3SXUv/XNcQB9oQ7K2jPmwg44gWYF8JzKe6HzMPZwiKrPxe USGg== 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:date:message-id:mime-version :content-transfer-encoding; bh=dUWZ10KzMUOwf8YnaU/43K1FmD+I2MwRUtpjJ3hqbnk=; b=BQjmZpe7wPw3rHu8fDsIXyU8OMaR9l4yKTUIt5qzmUIMCWK7+RPPrk6xoJyClEYU+m nXs3h147Rhqftjm8Nzgr0lLwbXzxfH0vMS1Q+ijGaTQiOxqaf435CZolucnimP+gR/eI FaAqjYi0RJTDyHE5zP537GFZIIfnVuMN5udG2lGIIKuFakqEgw91cHcl/YSetkgXSLuW LyPMIL41e8JOZzQEKW+b+UBjykJD8EXNGf+7L+Kys2AftRDCr/X+61GdmB8M2XWdDsp6 OAbQz9Ed3d3AqO/FNJIrdYt1m9+TC+eDUlr9rt10vk5ZdeoYA+i0W2MGXEpE/lpGTXah eQYQ== X-Gm-Message-State: AOAM530MNDurUJP814SEqNT+rRGP4WIZTIkAP7tVSjJ73gelCtY8IYCs TlWfMtL6+S00KfEgoax8y1tx7oIgp7ksPQ== X-Google-Smtp-Source: ABdhPJxBBKQY67LkTB0Kvk1ElGvWWCbwzODout5O5S4HNNsdEnFdrRZJkf6VzawnA9/YDdddRPzoTg== X-Received: by 2002:a17:90b:a54:: with SMTP id gw20mr3301093pjb.183.1598997016747; Tue, 01 Sep 2020 14:50:16 -0700 (PDT) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id q7sm3060763pgg.10.2020.09.01.14.50.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 14:50:16 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH] ppp: fix compilation with musl 1.2.0 Date: Tue, 1 Sep 2020 14:50:15 -0700 Message-Id: <20200901215015.91441-1-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200901_175019_567495_85B8824A X-CRM114-Status: GOOD ( 14.82 ) 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 [2607:f8b0:4864:20:0:0:0:642 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[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 Message has at least one valid DKIM or DK signature -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 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org As sys/cdefs.h is no longer available, a __P definition is needed. Fixes compilation with rp-pppoe-server. Signed-off-by: Rosen Penev --- package/network/services/ppp/Makefile | 2 +- package/network/services/ppp/patches/610-__P.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 package/network/services/ppp/patches/610-__P.patch diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile index de73fdbe00..f28510421b 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/610-__P.patch b/package/network/services/ppp/patches/610-__P.patch new file mode 100644 index 0000000000..61056b75a7 --- /dev/null +++ b/package/network/services/ppp/patches/610-__P.patch @@ -0,0 +1,14 @@ +--- a/pppd/pppd.h ++++ b/pppd/pppd.h +@@ -61,9 +61,11 @@ + + #if defined(__STDC__) + #include ++#define __P(x) x + #define __V(x) x + #else + #include ++#define __P(x) () + #define __V(x) (va_alist) va_dcl + #define const + #define volatile