From patchwork Fri Mar 26 09:42:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1458715 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) 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=desiato.20200630 header.b=mO9to0Vp; 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=GSRSYuTw; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (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 4F6H9r3Yxgz9sRR for ; Fri, 26 Mar 2021 20:44:16 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=mg0JXMnmxtcrlNyWPyIlFxnZWxJHl5zJWCGMk/Xz07o=; b=mO9to0VpgeaYAp QLE/60UQDS7YljERyPha6imPakbxKoua1QS8RcG058YYPxWOvFoI5l4TEH/QPVwrrUqI8K6IRWflr nFDQklq0or245caMs3FK6k44TMvX6DnRHZ3peGgc5+kUiukH5ZZqPhTNzVER0qw+wItefLOx/j2ZK Zw4DSQL6UtDPiOSPD8ycEyUMZashfyDJuF3xD0WkXzjv7T6HdHv9utNo3ArYLlWVeHhP8OhTAH10M nKpUTj0XXop/2Jzwu7is9r3U0qmN24qOqF4iGkFG9Jskr9GyNY2O+LyLsskGbWdVkUVIu3tDvoJQS 9wm1mSXQJhro50pBAxgg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lPiys-003BzI-J9; Fri, 26 Mar 2021 09:42:16 +0000 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lPiym-003BwF-4q for openwrt-devel@lists.openwrt.org; Fri, 26 Mar 2021 09:42:10 +0000 Received: by mail-pg1-x52d.google.com with SMTP id 32so4254769pgm.1 for ; Fri, 26 Mar 2021 02:42:07 -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=SOji20+nsXsGgd9p/nWOEXBZdlbCtHoUZzpVoDI//vM=; b=GSRSYuTwIzh6KlaDns63MPBvryM8LIwLLn5LfJBFeK2z+Tkl35CXI034X3czhaf3Kx 0G3ktnK922roHLtyR2z/yzv9ICFNprVuO1FtAdDs3rOy/BM8NBNKl2qqTrzHhuKbf2N/ 60FsAYgdIkc2dOgFzHTXbrDGeLYikSA+jkT5EAno7wgI1LKbsDGKlSKHniZ282Ec9vry pLkmkd5XJ53NBaJhWg6mqy4tMmhtIUQPqKmwIEdcigFKPPpOW1ec6EqaiLNJcI/nl7Rm 14MRB52vMyBVsSsKcJr3YQzTgmrTTt6b8v3HWw4UmVoDV9JF6LYVAp/EwALSVbX9rwlx sgAA== 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=SOji20+nsXsGgd9p/nWOEXBZdlbCtHoUZzpVoDI//vM=; b=U59B1cL1hSSh6xkA12D4IqOFt0IeKT+DDFV3ywMnrJrDXv9m5kRRYKm1QTLl/8q1zB 95a73G4E9HoKSZ5Ytdy3vptS/FYrz2UBxnDJhc3jkPndmy/EivhhJlyBlEiGnNLxwvO5 aR9e3hiZsNMcdyKoWgjkDWS3fqAunfntL+J6Yi4XPdermpcftwXHAvMuuuI8nZ7gXkKY gnytbt0zKdVYeISfNvSBAIRePulMPeczN9uq+/UGAMbqEByMgLbAJm5zCfS8uDhzZ9ft IRtGjd/fH9b7Vu10Gx6pXRNTaevru0BjyvKkRpSeynyDCXg0x0lINwb2jA2FIh8z3NBh lPsQ== X-Gm-Message-State: AOAM533oMwobfVdxpogUYdv7eESrbpTe32vvy9DP2j1DmV877XjGjGxA +qb4tV0GvAtIGfL6Ll4dRl5/fkbF3XM= X-Google-Smtp-Source: ABdhPJw7UOk98AWP+3IYj/iglKdk2kSxFvuFzAcEHdSuQtLkLUe3sJNot5+SwILTncQtzXFhN19sOQ== X-Received: by 2002:a63:1021:: with SMTP id f33mr11364033pgl.409.1616751726254; Fri, 26 Mar 2021 02:42:06 -0700 (PDT) Received: from DESKTOP-0U8QT52.lan ([2001:470:1f05:79e:705c:845e:3fd:e34e]) by smtp.gmail.com with ESMTPSA id mp21sm9221473pjb.16.2021.03.26.02.42.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Mar 2021 02:42:05 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/2] lua: refresh patches Date: Fri, 26 Mar 2021 02:42:13 -0700 Message-Id: <20210326094214.20049-1-rosenp@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210326_094208_540967_54CD175E X-CRM114-Status: GOOD ( 10.28 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "desiato.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Renamed doc files in Build/Prepare instead of patches as quilt cannot handle renames in patches. Signed-off-by: Rosen Penev --- package/utils/lua/Makefile | 8 ++++++++ .../lua/patches/001-include-version-number.patch | 10 +--------- .../lua/patches/013-lnum-strtoul-parsing-fixes.patch | 11 ++-- [...] Content analysis details: (-0.2 points, 5.0 required) 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:52d listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] -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 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 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 Renamed doc files in Build/Prepare instead of patches as quilt cannot handle renames in patches. Signed-off-by: Rosen Penev --- package/utils/lua/Makefile | 8 ++++++++ .../lua/patches/001-include-version-number.patch | 10 +--------- .../lua/patches/013-lnum-strtoul-parsing-fixes.patch | 11 ++--------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile index a54ef7d25a..ca8d4b43f7 100644 --- a/package/utils/lua/Makefile +++ b/package/utils/lua/Makefile @@ -92,6 +92,14 @@ endef TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC) -std=gnu99 +define Build/Prepare + $(call Build/Prepare/Default) +ifeq ($(QUILT),) + mv $(PKG_BUILD_DIR)/doc/lua.1 $(PKG_BUILD_DIR)/lua5.1.1 + mv $(PKG_BUILD_DIR)/doc/luac.1 $(PKG_BUILD_DIR)/luac5.1.1 +endif +endef + define Build/Compile $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CROSS)gcc" \ diff --git a/package/utils/lua/patches/001-include-version-number.patch b/package/utils/lua/patches/001-include-version-number.patch index f769e60736..17a2778da9 100644 --- a/package/utils/lua/patches/001-include-version-number.patch +++ b/package/utils/lua/patches/001-include-version-number.patch @@ -8,7 +8,6 @@ Including it allows multiple lua versions to coexist. Signed-off-by: Rafał Miłecki --- -diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -41,10 +41,10 @@ RANLIB= ranlib @@ -33,16 +32,9 @@ diff --git a/Makefile b/Makefile test: dummy src/lua test/hello.lua -diff --git a/doc/lua.1 b/doc/lua5.1.1 -rename from doc/lua.1 -rename to doc/lua5.1.1 -diff --git a/doc/luac.1 b/doc/luac5.1.1 -rename from doc/luac.1 -rename to doc/luac5.1.1 -diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile -@@ -29,10 +29,10 @@ CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ +@@ -29,10 +29,10 @@ CORE_O= lapi.o lcode.o ldebug.o ldo.o ld LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ lstrlib.o loadlib.o linit.o diff --git a/package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch b/package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch index 7f00c8c3a2..8887229589 100644 --- a/package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch +++ b/package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch @@ -1,8 +1,6 @@ -diff --git a/src/lnum.c b/src/lnum.c -index 1456b6a2ed23..b0632b04c2b7 100644 --- a/src/lnum.c +++ b/src/lnum.c -@@ -127,6 +127,8 @@ static int luaO_str2i (const char *s, lua_Integer *res, char **endptr_ref) { +@@ -127,6 +127,8 @@ static int luaO_str2i (const char *s, lu #else return 0; /* Reject the number */ #endif @@ -11,7 +9,7 @@ index 1456b6a2ed23..b0632b04c2b7 100644 } } else if ((v > LUA_INTEGER_MAX) || (*endptr && (!isspace(*endptr)))) { return TK_NUMBER; /* not in signed range, or has '.', 'e' etc. trailing */ -@@ -310,3 +312,13 @@ int try_unmint( lua_Integer *r, lua_Integer ib ) { +@@ -310,3 +312,13 @@ int try_unmint( lua_Integer *r, lua_Inte return 0; } @@ -25,8 +23,6 @@ index 1456b6a2ed23..b0632b04c2b7 100644 + return (unsigned LUA_INTEGER)v; +} +#endif -diff --git a/src/lnum_config.h b/src/lnum_config.h -index 19d7a4231a49..1092eead6629 100644 --- a/src/lnum_config.h +++ b/src/lnum_config.h @@ -141,7 +141,12 @@ @@ -43,6 +39,3 @@ index 19d7a4231a49..1092eead6629 100644 #endif #ifndef LUA_INTEGER_MIN # define LUA_INTEGER_MIN (-LUA_INTEGER_MAX -1) /* -2^16|32 */ --- -1.9.1 -