Lucas <[email protected]> wrote:
> Hello again,
>
> Finally, move net/prosody to use Lua 5.2. 0.11.x is the last version to
> support Lua 5.1, and it's recommended by upstream to use Lua 5.2 since
> 0.11.0 anyways. Before merging this, the patch I sent a couple of
> minutes ago for databases/luadbi. I'm testing this on my 6.9-stable
> server and it works well so far.
>
> Portwise,
>
> - Defined `MODLUA_VERSION=5.2`
> - Added `--lua-version=${MODLUA_VERSION}` to `CONFIGURE_ARGS`, otherwise
> the build was picking up Lua 5.1 if it was already installed
> - Added `--no-example-certs` to `CONFIGURE_ARGS`, which results in
> `make` not generating certs for localhost and example.com, which
> changes PLIST a tiny bit. I don't think that generating this certs
> adds any value, but I can keep it off the patch if it's preferred.
>
> It's my first doing this stuff, so any additional comment / thing I
> might have missed is more than welcome.
>
> Unrelated: is pkg/README a good place to add comments about common
> setups / configuration advise? Where to place certs and "integrate" it
> with acme-client (fix owner), recommend turnsrever if you want TURN
> support, and so on.
Updated patch below. I also dropped the constraint from luaexpat, as it
was giving me troubles. I think I should use the more convoluted syntax
to make it work, but the version in ports is already as we required so
I see no point in having it.
Also took the chance to shuffle names around to be more aligned to the
template, and did some whitespace fixes. Below is a `cvs diff -w` to
ease reviewing. Attached is the proper `cvs diff`. Been running on my
-stable server since Saturday without any issue so far.
In short,
- add MODLUA_VERSION=5.2
- add `--lua-version=${MODLUA_VERSION}` to CONFIGURE_ARGS
- add `--no-example-certs` to CONFIGURE_ARGS
- remove textproc/luaexpat version constraint
Comments?
-Lucas
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/prosody/Makefile,v
retrieving revision 1.61
diff -u -p -w -r1.61 Makefile
--- Makefile 14 May 2021 07:45:26 -0000 1.61
+++ Makefile 15 May 2021 19:01:27 -0000
@@ -3,25 +3,25 @@
COMMENT= communications server for Jabber/XMPP written in Lua
DISTNAME= prosody-0.11.9
CATEGORIES= net
-MASTER_SITES= https://prosody.im/downloads/source/
-
HOMEPAGE= https://prosody.im/
+REVISION = 0
MAINTAINER= Lucas <[email protected]>
+MASTER_SITES = https://prosody.im/downloads/source/
+
# MIT
PERMIT_PACKAGE= Yes
-FIX_EXTRACT_PERMISSIONS= Yes
-
-MAKE_FILE= makefile
MODULES= lang/lua
-LIB_DEPENDS= devel/libidn
+MODLUA_VERSION = 5.2
+
MODLUA_RUN_DEPENDS+= databases/luadbi \
devel/lua-bitop \
devel/luafs \
security/luasec \
- textproc/luaexpat>=1.3.0
+ textproc/luaexpat
+LIB_DEPENDS = devel/libidn
# fails, depends on busted not yet in
TEST_DEPENDS = ${MODLUA_RUN_DEPENDS}
@@ -34,11 +34,15 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
--datadir="${VARBASE}/prosody" \
--with-lua="${LOCALBASE}" \
--with-lua-include="${MODLUA_INCL_DIR}" \
+ --lua-version="${MODLUA_VERSION}" \
+ --no-example-certs \
--c-compiler="${CC}" \
--linker="${CC}" \
--ldflags="-L/usr/lib -L${LOCALBASE}/lib -shared" \
--cflags="${CFLAGS} -I${LOCALBASE}/include -fPIC -std=c99"
+MAKE_FILE = makefile
+
FAKE_FLAGS+= CONFIG=${DESTDIR}${PREFIX}/share/examples/prosody
pre-configure:
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/net/prosody/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -w -r1.17 PLIST
--- pkg/PLIST 6 Mar 2021 18:43:56 -0000 1.17
+++ pkg/PLIST 15 May 2021 19:03:57 -0000
@@ -237,16 +237,6 @@ share/examples/prosody/certs/
@sample ${SYSCONFDIR}/prosody/certs/
share/examples/prosody/certs/Makefile
@sample ${SYSCONFDIR}/prosody/certs/Makefile
-share/examples/prosody/certs/example.com.crt
-share/examples/prosody/certs/example.com.key
-share/examples/prosody/certs/localhost.crt
-@sample ${SYSCONFDIR}/prosody/certs/localhost.crt
-@mode 400
-@owner _prosody
-share/examples/prosody/certs/localhost.key
-@sample ${SYSCONFDIR}/prosody/certs/localhost.key
-@mode
-@owner
share/examples/prosody/certs/openssl.cnf
@sample ${SYSCONFDIR}/prosody/certs/openssl.cnf
share/examples/prosody/prosody.cfg.lua
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/prosody/Makefile,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile
--- Makefile 14 May 2021 07:45:26 -0000 1.61
+++ Makefile 15 May 2021 19:01:27 -0000
@@ -1,45 +1,49 @@
# $OpenBSD: Makefile,v 1.61 2021/05/14 07:45:26 solene Exp $
-COMMENT= communications server for Jabber/XMPP written in Lua
-DISTNAME= prosody-0.11.9
-CATEGORIES= net
-MASTER_SITES= https://prosody.im/downloads/source/
+COMMENT = communications server for Jabber/XMPP written in Lua
+DISTNAME = prosody-0.11.9
+CATEGORIES = net
+HOMEPAGE = https://prosody.im/
+REVISION = 0
-HOMEPAGE= https://prosody.im/
+MAINTAINER = Lucas <[email protected]>
-MAINTAINER= Lucas <[email protected]>
+MASTER_SITES = https://prosody.im/downloads/source/
# MIT
-PERMIT_PACKAGE= Yes
+PERMIT_PACKAGE = Yes
-FIX_EXTRACT_PERMISSIONS= Yes
+MODULES = lang/lua
+MODLUA_VERSION = 5.2
-MAKE_FILE= makefile
-MODULES= lang/lua
-LIB_DEPENDS= devel/libidn
-MODLUA_RUN_DEPENDS+= databases/luadbi \
- devel/lua-bitop \
- devel/luafs \
- security/luasec \
- textproc/luaexpat>=1.3.0
+MODLUA_RUN_DEPENDS += databases/luadbi \
+ devel/lua-bitop \
+ devel/luafs \
+ security/luasec \
+ textproc/luaexpat
+LIB_DEPENDS = devel/libidn
# fails, depends on busted not yet in
-TEST_DEPENDS = ${MODLUA_RUN_DEPENDS}
+TEST_DEPENDS = ${MODLUA_RUN_DEPENDS}
-WANTLIB+= crypto idn
+WANTLIB += crypto idn
-CONFIGURE_STYLE=simple
-CONFIGURE_ARGS+=--prefix="${PREFIX}" \
- --sysconfdir="${SYSCONFDIR}/prosody" \
- --datadir="${VARBASE}/prosody" \
- --with-lua="${LOCALBASE}" \
- --with-lua-include="${MODLUA_INCL_DIR}" \
- --c-compiler="${CC}" \
- --linker="${CC}" \
- --ldflags="-L/usr/lib -L${LOCALBASE}/lib -shared" \
- --cflags="${CFLAGS} -I${LOCALBASE}/include -fPIC -std=c99"
+CONFIGURE_STYLE = simple
+CONFIGURE_ARGS += --prefix="${PREFIX}" \
+ --sysconfdir="${SYSCONFDIR}/prosody" \
+ --datadir="${VARBASE}/prosody" \
+ --with-lua="${LOCALBASE}" \
+ --with-lua-include="${MODLUA_INCL_DIR}" \
+ --lua-version="${MODLUA_VERSION}" \
+ --no-example-certs \
+ --c-compiler="${CC}" \
+ --linker="${CC}" \
+ --ldflags="-L/usr/lib -L${LOCALBASE}/lib -shared" \
+ --cflags="${CFLAGS} -I${LOCALBASE}/include -fPIC
-std=c99"
-FAKE_FLAGS+= CONFIG=${DESTDIR}${PREFIX}/share/examples/prosody
+MAKE_FILE = makefile
+
+FAKE_FLAGS += CONFIG=${DESTDIR}${PREFIX}/share/examples/prosody
pre-configure:
cd ${WRKSRC}; sed -i -e 's,^#!/usr/bin/env lua,#!${MODLUA_BIN},' -e \
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/net/prosody/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST 6 Mar 2021 18:43:56 -0000 1.17
+++ pkg/PLIST 15 May 2021 19:03:57 -0000
@@ -237,16 +237,6 @@ share/examples/prosody/certs/
@sample ${SYSCONFDIR}/prosody/certs/
share/examples/prosody/certs/Makefile
@sample ${SYSCONFDIR}/prosody/certs/Makefile
-share/examples/prosody/certs/example.com.crt
-share/examples/prosody/certs/example.com.key
-share/examples/prosody/certs/localhost.crt
-@sample ${SYSCONFDIR}/prosody/certs/localhost.crt
-@mode 400
-@owner _prosody
-share/examples/prosody/certs/localhost.key
-@sample ${SYSCONFDIR}/prosody/certs/localhost.key
-@mode
-@owner
share/examples/prosody/certs/openssl.cnf
@sample ${SYSCONFDIR}/prosody/certs/openssl.cnf
share/examples/prosody/prosody.cfg.lua
