From patchwork Wed Apr 22 09:22:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 1274873 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; 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=ldcHV7UX; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 496Zjc5Zxkz9sSJ for ; Wed, 22 Apr 2020 19:23:16 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 97D1388303; Wed, 22 Apr 2020 09:23:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hUXknTcp9eTt; Wed, 22 Apr 2020 09:23:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C0DD587FE9; Wed, 22 Apr 2020 09:23:08 +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 3219B1BF866 for ; Wed, 22 Apr 2020 09:23:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 251CF87614 for ; Wed, 22 Apr 2020 09:23:07 +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 glvBzJ58ZggV for ; Wed, 22 Apr 2020 09:23:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3BACC875DC for ; Wed, 22 Apr 2020 09:23:04 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id k1so1515313wrx.4 for ; Wed, 22 Apr 2020 02:23:04 -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=JROVx0eDB3rHK5PqzWHr7JKRaLq2kVzKxgrVYdyTSok=; b=ldcHV7UX6ooQlxAoPhzKxWdlnpVWeEARBklHUEpirFNvDKuetQHvsBDFzKdN8IWBDe ZcXL9l9fCkcGoNHZq6ea6Ska9j5uOcrhaSX1vqJ8uffZuFquG++d/aV4tB4xAp6dSP49 34eXqtGv+hN6ZJvXjgOGsE/FCVS6lm/hSR0sTOOYZCjZ5zClXBMYh7IOBxwwwk4Rz7BS xrmEPIQwqLZsC/nBhqJaf4VXVRIGB7Lldb5ckArhIFBH32aX0BZXisE0BOMTTtZxb1hb Yf5XHRhZKBAasi+DUdkVcc4whe7CX43y9mVpLPpKBgVvwx7jq7Dvzh3d/5SpVJZceaOW 5vmw== 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=JROVx0eDB3rHK5PqzWHr7JKRaLq2kVzKxgrVYdyTSok=; b=adBOVn7km6V5aQRW+4HMNNcYEKbyDRhTxUtBrW6ncec+sdU2XjbWqIJc9QZOc6Bgwk 7ct/OjluW/YRY2GArb0zZbZJ2VsHTTvvhSmWmdr28SwdAEFa4YLnbUbVuiCm7dGBw8j7 I/N0GH61+mCYRqCMFXlu8LbhnrnFNOYvXDD+UTyZBwaVXWmUoIUUjXbxbLKTZTfoO48o zv4wH+wNiPCYWV7ppjjQSL9yGSrYxWFVz7WKAd30Ea2xwW2rK/yP/ZmMimeye/yhV6Qi 0AmeQ7PMOZnr1WDJq+C5UHE4iLrmvfmg95YnDDkrYncX2CmNNX7+TiTPoj28Lnott4wv KvkA== X-Gm-Message-State: AGi0PuZBg7zoH3HgCpSvg71QS8rUfudHM0jbWH7QQrcHQ7cJcUrFRetS KdEGEOVPkoMa4KmQLuvUgIECTN4D X-Google-Smtp-Source: APiQypKJxONshmJxmfP8wEgdXFEPwU/bFK8HNklfiGzsW6mhgL6tDs2aUevTYm+nB/IwD+LlLjqozQ== X-Received: by 2002:a5d:5085:: with SMTP id a5mr30862731wrt.394.1587547382148; Wed, 22 Apr 2020 02:23:02 -0700 (PDT) Received: from vb-19.10 (254.7.19.109.rev.sfr.net. [109.19.7.254]) by smtp.gmail.com with ESMTPSA id 17sm6768709wmo.2.2020.04.22.02.23.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 02:23:01 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Wed, 22 Apr 2020 11:22:53 +0200 Message-Id: <20200422092253.25466-1-francois.perrad@gadz.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/luasyslog: bump to version 2.2.0 (fork) X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" this fork has a good support for Lua 5.3the initial 1.0.0 is available as rock (which contains a tarball) https://luarocks.org/modules/luarocks/luasyslog but there is no public repository. the fork has a public repository https://github.com/ntd/luasyslog/ it is available as rock https://luarocks.org/modules/ntd/luasyslog unfortunately the rockspec uses a build method unavaible in our BR luarocks infrastructure so, the autotools infrastructure must replace the luarocks one. this fork has a good support for Lua 5.3 so, the patch "compat Lua 5.3" becomes useless. Signed-off-by: Francois Perrad --- package/luasyslog/0001-compat-Lua-5.3.patch | 52 ------------------- .../luasyslog/0001-remove-AX_LUA_LIBS.patch | 27 ++++++++++ package/luasyslog/Config.in | 4 +- package/luasyslog/luasyslog.hash | 6 +-- package/luasyslog/luasyslog.mk | 9 ++-- 5 files changed, 38 insertions(+), 60 deletions(-) delete mode 100644 package/luasyslog/0001-compat-Lua-5.3.patch create mode 100644 package/luasyslog/0001-remove-AX_LUA_LIBS.patch diff --git a/package/luasyslog/0001-compat-Lua-5.3.patch b/package/luasyslog/0001-compat-Lua-5.3.patch deleted file mode 100644 index 6c2c1e591..000000000 --- a/package/luasyslog/0001-compat-Lua-5.3.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b3347655bd31c4f1fd9e101787a84da0c98f2f8f Mon Sep 17 00:00:00 2001 -From: Francois Perrad -Date: Wed, 12 Jun 2019 20:47:18 +0200 -Subject: [PATCH] compat Lua 5.3 - -Signed-off-by: Francois Perrad ---- - lsyslog.c | 8 ++++++-- - syslog.lua | 4 ++-- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/luasyslog-1.0.0/lsyslog.c b/luasyslog-1.0.0/lsyslog.c -index cd512dc..57121da 100644 ---- a/luasyslog-1.0.0/lsyslog.c -+++ b/luasyslog-1.0.0/lsyslog.c -@@ -136,7 +136,7 @@ - lua_settable(L, -3); - } - --static const struct luaL_reg lsysloglib[] = -+static const struct luaL_Reg lsysloglib[] = - { - {"open", lsyslog_open}, - {"close", lsyslog_close}, -@@ -146,7 +146,11 @@ - - int luaopen_lsyslog(lua_State *L) - { -- luaL_openlib(L, "lsyslog", lsysloglib, 0); -+#if LUA_VERSION_NUM >= 502 -+ luaL_newlib(L, lsysloglib); -+#else -+ luaL_register(L, "lsyslog", lsysloglib); -+#endif - - set_info(L); - return 1; -diff --git a/luasyslog-1.0.0/syslog.lua b/luasyslog-1.0.0/syslog.lua -index febda00..f4d98ec 100644 ---- a/luasyslog-1.0.0/syslog.lua -+++ b/luasyslog-1.0.0/syslog.lua -@@ -1,5 +1,5 @@ --require"logging" --require"lsyslog" -+local logging = require"logging" -+local lsyslog = require"lsyslog" - - local convert = - { --- -2.20.1 - diff --git a/package/luasyslog/0001-remove-AX_LUA_LIBS.patch b/package/luasyslog/0001-remove-AX_LUA_LIBS.patch new file mode 100644 index 000000000..23569ff5b --- /dev/null +++ b/package/luasyslog/0001-remove-AX_LUA_LIBS.patch @@ -0,0 +1,27 @@ +From 84296c5eae651b45ebfa233199b7ddc009a5dad3 Mon Sep 17 00:00:00 2001 +From: Francois Perrad +Date: Fri, 21 Jun 2019 14:58:54 +0200 +Subject: [PATCH] remove AX_LUA_LIBS + +AX_LUA_LIBS fails with LuaJIT + +Signed-off-by: Francois Perrad +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 9ac6c95..d7fc518 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,7 +32,6 @@ AC_PATH_PROG([LUAROCKS], [luarocks], [:]) + AX_PROG_LUA([5.1],[6.0]) + + dnl Check for libraries +-AX_LUA_LIBS + + dnl Check for functions + AC_HEADER_STDC +-- +2.20.1 + diff --git a/package/luasyslog/Config.in b/package/luasyslog/Config.in index 326fa6bf9..ca098cb4f 100644 --- a/package/luasyslog/Config.in +++ b/package/luasyslog/Config.in @@ -2,6 +2,6 @@ config BR2_PACKAGE_LUASYSLOG bool "luasyslog" select BR2_PACKAGE_LUALOGGING # runtime help - Syslog logging for Lua. + syslog appender for LuaLogging. - https://luarocks.org/modules/luarocks/luasyslog + https://github.com/ntd/luasyslog diff --git a/package/luasyslog/luasyslog.hash b/package/luasyslog/luasyslog.hash index 02a0d838a..bcb6a7e02 100644 --- a/package/luasyslog/luasyslog.hash +++ b/package/luasyslog/luasyslog.hash @@ -1,3 +1,3 @@ -# computed by luarocks/buildroot -sha256 e807a614b77108ca25aeed061faf73b7ef00708f5bfebb9e4f03d27f3d453e7b luasyslog-1.0.0-2.src.rock -sha256 c1ed5cbf3fc02836d3fc5d2354818a5c151c1cd75fcc0bf240dbf8d2b36a3c1d luasyslog-1.0.0/COPYING +# Locally computed +sha256 7f7dad64117407f2484ff5b53e90804f923a99fcbde5872e54f6aba53f482da0 luasyslog-2.2.0.tar.gz +sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING diff --git a/package/luasyslog/luasyslog.mk b/package/luasyslog/luasyslog.mk index 1d88b6056..aa57f9425 100644 --- a/package/luasyslog/luasyslog.mk +++ b/package/luasyslog/luasyslog.mk @@ -4,8 +4,11 @@ # ################################################################################ -LUASYSLOG_VERSION = 1.0.0-2 +LUASYSLOG_VERSION = 2.2.0 +LUASYSLOG_SITE = $(call github,ntd,luasyslog,$(LUASYSLOG_VERSION)) +LUASUSLOG_DEPENDENCIES = luainterpreter LUASYSLOG_LICENSE = MIT -LUASYSLOG_LICENSE_FILES = $(LUASYSLOG_SUBDIR)/COPYING +LUASYSLOG_LICENSE_FILES = COPYING +LUASYSLOG_AUTORECONF = YES -$(eval $(luarocks-package)) +$(eval $(autotools-package))