On Tue May 11, 2021 at 06:19:20PM +0000, Lucas 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.
Lightly tested and committed. Thanks
>
> 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.
Yes this is the right place to do this.
>
> Cheers,
> -Lucas
>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/net/prosody/Makefile,v
> retrieving revision 1.60
> diff -u -p -r1.60 Makefile
> --- Makefile 6 Mar 2021 18:43:56 -0000 1.60
> +++ Makefile 11 May 2021 16:03:27 -0000
> @@ -2,6 +2,7 @@
>
> COMMENT= communications server for Jabber/XMPP written in Lua
> DISTNAME= prosody-0.11.8
> +REVISION= 0
> CATEGORIES= net
> MASTER_SITES= https://prosody.im/downloads/source/
>
> @@ -14,6 +15,8 @@ PERMIT_PACKAGE= Yes
>
> FIX_EXTRACT_PERMISSIONS= Yes
>
> +MODLUA_VERSION= 5.2
> +
> MAKE_FILE= makefile
> MODULES= lang/lua
> LIB_DEPENDS= devel/libidn
> @@ -34,6 +37,8 @@ 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" \
> 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 11 May 2021 16:05:38 -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
>
