From patchwork Sun Sep 24 07:59:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 817877 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pEg7zKwY"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y0KQB2mW2z9t16 for ; Sun, 24 Sep 2017 18:00:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8E93E88AC3; Sun, 24 Sep 2017 08:00:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9gBTk2OqHfzq; Sun, 24 Sep 2017 08:00:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B64EB88B51; Sun, 24 Sep 2017 08:00:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9EBE01C0263 for ; Sun, 24 Sep 2017 07:59:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8508088AC0 for ; Sun, 24 Sep 2017 07:59:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id txKFu7Fs8p2M for ; Sun, 24 Sep 2017 07:59:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f176.google.com (mail-wr0-f176.google.com [209.85.128.176]) by whitealder.osuosl.org (Postfix) with ESMTPS id 09FEB88B56 for ; Sun, 24 Sep 2017 07:59:53 +0000 (UTC) Received: by mail-wr0-f176.google.com with SMTP id k20so3311519wre.4 for ; Sun, 24 Sep 2017 00:59:52 -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:in-reply-to:references; bh=XOkXLCFALRBATPvpp8sEMlGp9PAMq+nDl1s+N4H159s=; b=pEg7zKwYMAyAoysMAwfpl/skbKds7A4THN0T+SyPV7F3/QieSWTxFjOYmtej+rWjEO d3Ru5JNQ/+Loo78NrWdrJ2Rvx0uUtS/rYMxyxM+p162bBaRxvF5GiUBDyvj2at4j5Mtx SZM6PaJenOVCukkFYygW97T0wVqSCAN3D72HnXJ6s7EzXfhSOiKdJcWs17SxzLspLlil kRheGS2dVfRM77HaNhKQgIWohTdYw4r52YIUcO9cWxU6DDEiZdzkrZjSIo1K7xHqokVP k03on9fD61H+UDl/b3Ur1CVCsXw3O4PCOODEyitdKrjjZIVe3xGve7ap7e0UfeAUEa4X gJQA== 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:in-reply-to :references; bh=XOkXLCFALRBATPvpp8sEMlGp9PAMq+nDl1s+N4H159s=; b=Blu6JvCznvpoda2cntIIz3jyWpUY3EoXe1boR8Kzd99PHTKGpNTBCwyDmTlRZmqftd RAjWjChEw+1t/ccyQu0vMqU4f0ZRMMxHkfXbWGzNLwx3P/dWmYd3iPUebZa50O5bf9Ah 2rJjnWzM9aR/SLY5pl2vvxYkxy5R4lLumBkYs7xbS/VpH+xi+i7bU+u+JUbOvKSnasqA NW+5sFBxvqQ9J4ZjeJQfHy5WHPFpJu0NtzVRzcTkVQ77iy8xQuXXtnqa7TVyDEFpuyN/ W3wlnMR0CuDF2EqYpL7//row4jmHAfPSTwBPhrif5oIe7SxU5uOHc0zuGS91WIFOp81W clBA== X-Gm-Message-State: AHPjjUiSfPdyVa0ghNt9jq1jDHTRgKtKJjmMSU/qMCmZeEBs3HIdvwRw grXGLzdTJQpVaObAdsiX6Ph0Uw== X-Google-Smtp-Source: AOwi7QCtcZN7ruM/zd9EJ0Bt50TGSaaIE8Lf0TfBWndnfW+XVSWwRN35V+TB0AbcoENqh89F5aNk2g== X-Received: by 10.223.134.93 with SMTP id 29mr3536552wrw.60.1506239991339; Sun, 24 Sep 2017 00:59:51 -0700 (PDT) Received: from localhost.localdomain (5.224.204.77.rev.sfr.net. [77.204.224.5]) by smtp.gmail.com with ESMTPSA id z108sm6125477wrc.49.2017.09.24.00.59.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Sep 2017 00:59:50 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Sun, 24 Sep 2017 09:59:31 +0200 Message-Id: <20170924075932.5990-8-francois.perrad@gadz.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170924075932.5990-1-francois.perrad@gadz.org> References: <20170924075932.5990-1-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH 8/9] wsapi: fix Lua 5.3 compatibility X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Francois Perrad --- package/wsapi/0001-lua-5.3-compatibility.patch | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/wsapi/0001-lua-5.3-compatibility.patch diff --git a/package/wsapi/0001-lua-5.3-compatibility.patch b/package/wsapi/0001-lua-5.3-compatibility.patch new file mode 100644 index 000000000..31b532736 --- /dev/null +++ b/package/wsapi/0001-lua-5.3-compatibility.patch @@ -0,0 +1,31 @@ +Lua 5.3 compatibility + +Fetch from: https://github.com/keplerproject/wsapi/commit/2d824d2fce31b6a9cc60b2c3f215fbbf1d99c611 + +Signed-off-by: Francois Perrad + +Index: b/wsapi-1.6.1/src/wsapi/ringer.lua +=================================================================== +--- a/wsapi-1.6.1/src/wsapi/ringer.lua ++++ b/wsapi-1.6.1/src/wsapi/ringer.lua +@@ -5,6 +5,7 @@ + local _M = {} + + local init = [==[ ++ local loadstring = loadstring or load + local app_name, bootstrap_code, is_file = ... + if bootstrap_code then + local bootstrap, err +Index: b/wsapi-1.6.1/src/wsapi/util.lua +=================================================================== +--- a/wsapi-1.6.1/src/wsapi/util.lua ++++ b/wsapi-1.6.1/src/wsapi/util.lua +@@ -174,7 +174,7 @@ + end + + function _M.loadfile(filename, env) +- if _VERSION == "Lua 5.2" then ++ if _VERSION ~= "Lua 5.1" then + return loadfile(filename, "bt", env) + else + local f, err = loadfile(filename)