Re: UPDATE prosody 0.12.0 from MAINTAINER

Lucas <lucas@sexy.is> wrote:
> Additional bump, now that net/luaunbound is imported and working in most
> archs (thanks sthen@) and the ports is blocked for new ports.
>
> op2@ said in the databases/luadbi update thread that it's working fine
> for them, too.

Yes, I've been running it for the last week without issues.

Committed, thanks!

> -Lucas
>
>
> diff 541cc6a9ec0e6eefd79c24f305db8e38e0e859e4 bab5e988ddd31020ccb388d57402886713091264
> blob - 111da98c2182b99f76398aaf581238cb9dcda46e
> blob + f723ce6d950ef739d7d5a4a37d4b0909a3e485b2
> --- net/prosody/Makefile
> +++ net/prosody/Makefile
> @@ -1,5 +1,5 @@
> COMMENT = communications server for Jabber/XMPP written in Lua
> -DISTNAME = prosody-0.11.13
> +DISTNAME = prosody-0.12.0
> CATEGORIES = net
> HOMEPAGE = https://prosody.im/
>
> @@ -11,20 +11,22 @@ MASTER_SITES = https://prosody.im/downloads/source/
> PERMIT_PACKAGE = Yes
>
> MODULES = lang/lua
> -MODLUA_VERSION = 5.2
> +MODLUA_VERSION = 5.3
>
> -MODLUA_RUN_DEPENDS += databases/luadbi \
> - devel/lua-bitop \
> +MODLUA_RUN_DEPENDS += converters/luastruct \
> + databases/luadbi \
> devel/luafs \
> + devel/luarocks \
> + net/luaunbound \
> security/luasec \
> textproc/luaexpat
> -LIB_DEPENDS = devel/libidn
> +LIB_DEPENDS = textproc/icu4c
>
> # fails, depends on busted not yet in
> NO_TEST = Yes
> TEST_DEPENDS = ${MODLUA_RUN_DEPENDS}
>
> -WANTLIB += crypto idn
> +WANTLIB += crypto icudata icui18n icuuc
>
> CONFIGURE_STYLE = simple
> CONFIGURE_ARGS += --prefix="${PREFIX}" \
> @@ -34,6 +36,7 @@ CONFIGURE_ARGS += --prefix="${PREFIX}" \
> --with-lua-include="${MODLUA_INCL_DIR}" \
> --lua-version="${MODLUA_VERSION}" \
> --no-example-certs \
> + --idn-library=icu \
> --c-compiler="${CC}" \
> --linker="${CC}" \
> --ldflags="-L/usr/lib -L${LOCALBASE}/lib -shared" \
> @@ -47,6 +50,9 @@ pre-configure:
> cd ${WRKSRC}; sed -i -e 's,^#!/usr/bin/env lua,#!${MODLUA_BIN},' -e \
> 's,^lua ,${MODLUA_BIN} ,' prosody prosodyctl
>
> +post-patch:
> + ${SUBST_CMD} ${WRKSRC}/util/prosodyctl.lua
> +
> post-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/prosody
> ${INSTALL_DATA} ${WRKSRC}/README \
> blob - 1259a78118331eeda8b325c7586b7b975b0eab4a
> blob + 4c568d96106682731568f8292407e98b43194031
> --- net/prosody/distinfo
> +++ net/prosody/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (prosody-0.11.13.tar.gz) = OcYbNGoJtRJbYEy5aeFCBsu8uGyBFW/8a6LWJSfPBDI=
> -SIZE (prosody-0.11.13.tar.gz) = 439816
> +SHA256 (prosody-0.12.0.tar.gz) = dS/zIBXaxWX8NBfCGWryaJccNY7gZuUfXZEkE1gNiJo=
> +SIZE (prosody-0.12.0.tar.gz) = 610330
> blob - 77b129d26593e3f817c3ed091d1971315a39b745
> blob + 9a2584e6469c8ace4698242ce55c89ff7f641b94
> --- net/prosody/patches/patch-core_certmanager_lua
> +++ net/prosody/patches/patch-core_certmanager_lua
> @@ -1,7 +1,7 @@
> Index: core/certmanager.lua
> --- core/certmanager.lua.orig
> +++ core/certmanager.lua
> -@@ -110,7 +110,7 @@ end
> +@@ -202,7 +202,7 @@ end
>
> -- Built-in defaults
> local core_defaults = {
> @@ -9,4 +9,4 @@ Index: core/certmanager.lua
> + cafile = "/etc/ssl/cert.pem";
> depth = 9;
> protocol = "tlsv1+";
> - verify = (ssl_x509 and { "peer", "client_once", }) or "none";
> + verify = "none";
> blob - c71921bfdeffd77276b9058509080de47c86db43
> blob + 2b8227c237db7c1ebd5d295793948c03623af83a
> --- net/prosody/patches/patch-prosody_cfg_lua_dist
> +++ net/prosody/patches/patch-prosody_cfg_lua_dist
> @@ -12,10 +12,10 @@ Index: prosody.cfg.lua.dist
> +-- Enable POSIX-only options
> +pidfile = "/var/prosody/prosody.pid"
> +
> - -- Enable use of libevent for better performance under high load
> - -- For more information see: https://prosody.im/doc/libevent
> - --use_libevent = true
> -@@ -164,8 +171,8 @@ archive_expires_after = "1w" -- Remove archived messag
> + -- This option allows you to specify additional locations where Prosody
> + -- will search first for modules. For additional modules you can install, see
> + -- the community module repository at https://modules.prosody.im/
> +@@ -183,8 +190,8 @@ archive_expires_after = "1w" -- Remove archived messag
> -- Logging configuration
> -- For advanced logging see https://prosody.im/doc/logging
> log = {
> @@ -24,5 +24,5 @@ Index: prosody.cfg.lua.dist
> + info = "/var/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
> + error = "/var/prosody/prosody.err";
> -- "*syslog"; -- Uncomment this for logging to syslog
> - -- "*console"; -- Log to the console, useful for debugging with daemonize=false
> + -- "*console"; -- Log to the console, useful for debugging when running in the foreground
> }
> blob - /dev/null
> blob + 38933741801a6cdcd4f61cf1e64d4def7423dac4 (mode 644)
> --- /dev/null
> +++ net/prosody/patches/patch-plugins_mod_admin_socket_lua
> @@ -0,0 +1,16 @@
> +Upstream fix for older LuaSocket
> +ref: https://hg.prosody.im/timber/rev/55590a970de7
> +
> +Index: plugins/mod_admin_socket.lua
> +--- plugins/mod_admin_socket.lua.orig
> ++++ plugins/mod_admin_socket.lua
> +@@ -2,6 +2,9 @@ module:set_global();
> +
> + local have_unix, unix = pcall(require, "socket.unix");
> +
> ++if have_unix and type(unix) == "function" then
> ++ unix = { stream = unix };
> ++end
> + if not have_unix or type(unix) ~= "table" then
> + module:log_status("error", "LuaSocket unix socket support not available or incompatible, ensure it is up to date");
> + return;
> blob - 9ac79eba76ccb0b1c5e59384e2b0684129d8dfd7
> blob + c322044f7c0b3255fb316138eff7dd03c6751471
> --- net/prosody/patches/patch-util-src_pposix_c
> +++ net/prosody/patches/patch-util-src_pposix_c
> @@ -3,15 +3,15 @@ Define _BSD_SOURCE to make initgroups(3) visible
> Index: util-src/pposix.c
> --- util-src/pposix.c.orig
> +++ util-src/pposix.c
> -@@ -33,6 +33,11 @@
> - #ifndef _POSIX_C_SOURCE
> - #define _POSIX_C_SOURCE 200809L
> +@@ -31,6 +31,11 @@
> + #define _DARWIN_C_SOURCE
>