Skip to content

Commit 31c6cd4

Browse files
author
alnsn
committed
Apply PR221 (Support Lua 5.5), bump pkgversion. Tests pass.
PR221: wahern/luaossl#221 Test command: lua5.5 regress/regress.lua
1 parent e2bcf74 commit 31c6cd4

File tree

4 files changed

+70
-3
lines changed

4 files changed

+70
-3
lines changed

security/lua-ossl/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# $NetBSD: Makefile,v 1.5 2026/01/06 07:59:01 wiz Exp $
1+
# $NetBSD: Makefile,v 1.6 2026/01/08 22:50:47 alnsn Exp $
22

33
DISTNAME= luaossl-20220711
44
PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/^lua//1}
5-
PKGREVISION= 1
5+
PKGREVISION= 2
66
MASTER_SITES= ${MASTER_SITE_GITHUB:=wahern/}
77
CATEGORIES= security lua
88
GITHUB_PROJECT= luaossl

security/lua-ossl/distinfo

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
$NetBSD: distinfo,v 1.6 2023/09/01 14:03:15 nia Exp $
1+
$NetBSD: distinfo,v 1.7 2026/01/08 22:50:47 alnsn Exp $
22

33
BLAKE2s (luaossl-20220711.tar.gz) = 6ad60d88021a098f86c6cafb61cd6e3806d22b07746f608aae936514b7ef120a
44
SHA512 (luaossl-20220711.tar.gz) = 13c51881218a5a9995d195d4781f6871f0dfe58f061b85dd997b98ec970a38302ac6b057b7987bff5f7719bfdb826aae09f602ea8db5e4b2d462648ad0236909
55
Size (luaossl-20220711.tar.gz) = 505174 bytes
6+
SHA1 (patch-GNUmakefile) = 7d5fa61b2b5710b8f77a5b306f1549c7ac011bdc
67
SHA1 (patch-config.h.guess) = b25ce37a141bbb28921ffac8324af496b073817b
8+
SHA1 (patch-src_GNUmakefile) = 4dc5177f5717d55f948ee1a35e507b5cc1ab92ab
9+
SHA1 (patch-vendor_compat53_c-api_compat-5.3.h) = c099d8ee0d16629bccfbbf6370a9b59bd41d386b
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
$NetBSD: patch-GNUmakefile,v 1.1 2026/01/08 22:50:47 alnsn Exp $
2+
3+
PR#221: Support Lua 5.5
4+
https://github.com/wahern/luaossl/pull/221
5+
6+
--- GNUmakefile.orig 2022-07-11 05:40:14.000000000 +0000
7+
+++ GNUmakefile
8+
@@ -12,7 +12,7 @@ all: # default target
9+
#
10+
# G N U M A K E F U N C T I O N S
11+
#
12+
-KNOWN_APIS = 5.1 5.2 5.3 5.4
13+
+KNOWN_APIS = 5.1 5.2 5.3 5.4 5.5
14+
15+
# template for invoking luapath script
16+
LUAPATH := $(d)/mk/luapath
17+
@@ -42,6 +42,8 @@ lua53cpath ?= $(libdir)/lua/5.3
18+
lua53path ?= $(datadir)/lua/5.3
19+
lua54cpath ?= $(libdir)/lua/5.4
20+
lua54path ?= $(datadir)/lua/5.4
21+
+lua55cpath ?= $(libdir)/lua/5.5
22+
+lua55path ?= $(datadir)/lua/5.5
23+
24+
25+
AR ?= ar
26+
@@ -99,7 +101,7 @@ endif
27+
28+
# set LUA_APIS if empty or "?"
29+
ifeq ($(or $(strip $(LUA_APIS)),?),?)
30+
-override LUA_APIS := $(call HAVE_API_FN,5.1) $(call HAVE_API_FN,5.2) $(call HAVE_API_FN,5.3) $(call HAVE_API_FN,5.4)
31+
+override LUA_APIS := $(call HAVE_API_FN,5.1) $(call HAVE_API_FN,5.2) $(call HAVE_API_FN,5.3) $(call HAVE_API_FN,5.4 )$(call HAVE_API_FN,5.5)
32+
endif
33+
34+
define LUAXY_template
35+
@@ -135,6 +137,7 @@ $(eval $(call LUAXY_template,5.1))
36+
$(eval $(call LUAXY_template,5.2))
37+
$(eval $(call LUAXY_template,5.3))
38+
$(eval $(call LUAXY_template,5.4))
39+
+$(eval $(call LUAXY_template,5.5))
40+
41+
#
42+
# A U T O D E T E C T C O M P I L A T I O N F L A G S
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
$NetBSD: patch-vendor_compat53_c-api_compat-5.3.h,v 1.1 2026/01/08 22:50:47 alnsn Exp $
2+
3+
PR#221: Support Lua 5.5
4+
https://github.com/wahern/luaossl/pull/221
5+
6+
--- vendor/compat53/c-api/compat-5.3.h.orig 2022-07-11 05:40:14.000000000 +0000
7+
+++ vendor/compat53/c-api/compat-5.3.h
8+
@@ -399,11 +399,11 @@ COMPAT53_API void luaL_requiref (lua_Sta
9+
10+
11+
/* other Lua versions */
12+
-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 504
13+
+#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 || LUA_VERSION_NUM > 505
14+
15+
-# error "unsupported Lua version (i.e. not Lua 5.1, 5.2, 5.3, or 5.4)"
16+
+# error "unsupported Lua version (i.e. not Lua 5.1, 5.2, 5.3, 5.4, or 5.5)"
17+
18+
-#endif /* other Lua versions except 5.1, 5.2, 5.3, and 5.4 */
19+
+#endif /* other Lua versions except 5.1, 5.2, 5.3, 5.4, and 5.5 */
20+
21+
22+

0 commit comments

Comments
 (0)