Omar Polo <[email protected]> wrote: > > > [...] > > > > ok solene@ > > > > I tested it on 7.3-stable though, so ok to backport too :) > > I tested on 7.3-stable too! (with postgresql fwiw) > > ok op@, both for the update and the backport while you're at it :-)
ftr, I'm not a commiter. > > > Partly related: I wanted to switch it to Lua 5.4, but that requires > > > adding lua54 FLAVOR to almost all the deps. Should I make that change > > > in two parts, first enabling the FLAVORs and then switching Prosody to > > > Lua 5.4, or should I fold all those changes into this patch? > > I'd first commit this as-is and backport to stable, then bump the deps > to add the missing FLAVOR and switch prosody to lua 5.4. this way we > avoid changing too many ports in -STABLE. -STABLE users will get > prosody with lua5.4 with next release. This sound like a good approach. > fwiw i'm perfectly fine with the other way around too however, and > happy to test diffs :-) Enjoy yourself! It's running fine in my server, but my setup doesn't stress much of the deps. In particular, I don't use luadbi. This patch is on top of the previous. I didn't bump any REVISION but Prosody's; my understanding is that it isn't needed as the new FLAVORS imply new FULLPKGNAMEs. Prosody's PLIST change is because the file is called literally "util/bit53.lua", which I didn't spot in the past. -Lucas ----------------------------------------------- commit 7556864a75432e36cd5044896a3a7a993cc4fe6f (prosody-lua54) from: Lucas <[email protected]> date: Wed Sep 6 23:32:36 2023 UTC Make Prosody run with Lua 5.4 diff 0fb4423c6b66a98737db0b15db1694358d452303 7556864a75432e36cd5044896a3a7a993cc4fe6f commit - 0fb4423c6b66a98737db0b15db1694358d452303 commit + 7556864a75432e36cd5044896a3a7a993cc4fe6f blob - 5d77d7600aeb10599c836414736f2f660da6355a blob + 9b5058789383e0b7f41a4008c8d0cc621f03ae1c --- converters/luastruct/Makefile +++ converters/luastruct/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ${HOMEPAGE} MODULES= lang/lua -FLAVORS= lua52 lua53 +FLAVORS= lua52 lua53 lua54 FLAVOR?= WRKDIST= ${WRKDIR} blob - b671ca60bf5e7ab009997e9fd7149fb2357eef00 blob + 6088581e2b7e7b781ce638896e02e7330b6967e2 --- databases/luadbi/Makefile +++ databases/luadbi/Makefile @@ -23,7 +23,7 @@ PERMIT_PACKAGE= Yes MULTI_PACKAGES= -main -mysql -pgsql MODULES= lang/lua -FLAVORS= lua52 lua53 +FLAVORS= lua52 lua53 lua54 FLAVOR?= WANTLIB-main= sqlite3 blob - b1aa5c5ec9ade24cb73d0e6769488d02728ec8ae blob + 1c591830093c0473a81366b11e31a6cbc00fd0bb --- devel/luafs/Makefile +++ devel/luafs/Makefile @@ -15,7 +15,7 @@ PERMIT_PACKAGE = Yes MODULES = lang/lua -FLAVORS = lua52 lua53 +FLAVORS = lua52 lua53 lua54 FLAVOR ?= CFLAGS += -I${MODLUA_INCL_DIR} -I${LOCALBASE}/include blob - 933179227abe4ce5a36bd0bf9b2339df8d57901a blob + 1608d5c2571e7df676efea774488e565f3560bc7 --- net/luasocket/Makefile +++ net/luasocket/Makefile @@ -14,7 +14,7 @@ PERMIT_PACKAGE= Yes MODULES= lang/lua -FLAVORS= lua52 lua53 +FLAVORS= lua52 lua53 lua54 FLAVOR?= NO_TEST= Yes blob - d73750bdfacc9deb271c495dc7ab02a67b0a5eac blob + 5b3f7bc638f6c7c93d17f3cd035ec24318cdf9fb --- net/luaunbound/Makefile +++ net/luaunbound/Makefile @@ -26,7 +26,7 @@ MAKE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}" \ USE_GMAKE = Yes -FLAVORS = lua52 lua53 +FLAVORS = lua52 lua53 lua54 FLAVOR ?= NO_TEST = Yes blob - 3a8637ec7fd39ed60810a95a1197615be4450867 blob + f85c642b745dc9bf30dd1f2f69231c19708e8000 --- net/prosody/Makefile +++ net/prosody/Makefile @@ -2,6 +2,7 @@ COMMENT = communications server for Jabber/XMPP writte DISTNAME = prosody-0.12.4 CATEGORIES = net HOMEPAGE = https://prosody.im/ +REVISION = 0 MAINTAINER = Lucas Gabriel Vuotto <[email protected]> @@ -11,7 +12,7 @@ MASTER_SITES = https://prosody.im/downloads/source/ PERMIT_PACKAGE = Yes MODULES = lang/lua -MODLUA_VERSION = 5.3 +MODLUA_VERSION = 5.4 MODLUA_RUN_DEPENDS += converters/luastruct \ databases/luadbi \ blob - 0323d711312052b557cb7cd3dd72caaa70f5fb68 blob + 7064c733d42d16906934cc69361c966c3e9b40b2 --- net/prosody/pkg/PLIST +++ net/prosody/pkg/PLIST @@ -171,7 +171,7 @@ lib/prosody/util/adminstream.lua lib/prosody/util/argparse.lua lib/prosody/util/array.lua lib/prosody/util/async.lua -lib/prosody/util/bit${MODLUA_DEP_VERSION}.lua +lib/prosody/util/bit53.lua lib/prosody/util/bitcompat.lua lib/prosody/util/cache.lua lib/prosody/util/caps.lua blob - f0213836eec38177b4091c74da84eb05084e06b0 blob + 98f317ac9f1568932b9ce2de581924d3e193c310 --- security/luasec/Makefile +++ security/luasec/Makefile @@ -18,7 +18,7 @@ WANTLIB+= crypto ssl MODULES= lang/lua MODLUA_RUN_DEPENDS+= net/luasocket -FLAVORS= lua52 lua53 +FLAVORS= lua52 lua53 lua54 FLAVOR?= MAKE_ENV+= INC_PATH="-I${MODLUA_INCL_DIR}" SAVECFLAGS="${CFLAGS}" LD="${CC}" blob - 1364ec3823f72752b25c79250adaab5275935a9c blob + e168cc58f0ee844bfba8823f78c30b2a8ef6fa07 --- textproc/luaexpat/Makefile +++ textproc/luaexpat/Makefile @@ -14,7 +14,7 @@ MASTER_SITES = ${HOMEPAGE} MODULES = lang/lua MODLUA_TEST_DEPENDS = textproc/luaexpat -FLAVORS = lua52 lua53 +FLAVORS = lua52 lua53 lua54 FLAVOR ?= REGRESS_FILES = test-lom test
