On 2020/05/16 20:08, Lucas wrote:
> Bump, now that the ports embargo is over.
>
> Stuart, do you prefer if I use the more common idiom in pexp and drop
> the eval? The comment from /src/etc/rc.d/rc.subr makes sense IMO, but
> this will be the only port using that idiom out of the 138 that define
> pexp.
>
> rc.subr,v 1.134 fragment for convenience, lines 319-321:
>
> # the shell will strip the quotes from daemon_flags when starting a daemon;
> # make sure pexp matches the process (i.e. doesn't include the quotes)
> pexp="$(eval echo ${daemon}${daemon_flags:+ ${daemon_flags}})"
I would just use the common idiom used by other ports. If there is a
problem with that then I guess they'll all need fixing in a sweep.
> -Lucas
>
>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/net/prosody/Makefile,v
> retrieving revision 1.56
> diff -u -p -r1.56 Makefile
> --- Makefile 15 Mar 2020 19:04:25 -0000 1.56
> +++ Makefile 24 Mar 2020 23:34:18 -0000
> @@ -1,7 +1,7 @@
> # $OpenBSD: Makefile,v 1.56 2020/03/15 19:04:25 solene Exp $
>
> COMMENT= communications server for Jabber/XMPP written in Lua
> -DISTNAME= prosody-0.11.4
> +DISTNAME= prosody-0.11.5
> CATEGORIES= net
> MASTER_SITES= https://prosody.im/downloads/source/
>
> Index: distinfo
> ===================================================================
> RCS file: /home/cvs/ports/net/prosody/distinfo,v
> retrieving revision 1.17
> diff -u -p -r1.17 distinfo
> --- distinfo 15 Mar 2020 19:04:25 -0000 1.17
> +++ distinfo 24 Mar 2020 23:34:35 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (prosody-0.11.4.tar.gz) = tfJvo0PH8y9iQnIdaZHLNfXSoo0r9Z0rwympQFI3BP0=
> -SIZE (prosody-0.11.4.tar.gz) = 423518
> +SHA256 (prosody-0.11.5.tar.gz) = Vfi9ZdXSr2HMc5vWFk5CBwEeDS0mDN5YMHHJDY2FQIs=
> +SIZE (prosody-0.11.5.tar.gz) = 425122
> Index: patches/patch-prosody_cfg_lua_dist
> ===================================================================
> RCS file: /home/cvs/ports/net/prosody/patches/patch-prosody_cfg_lua_dist,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-prosody_cfg_lua_dist
> --- patches/patch-prosody_cfg_lua_dist 7 Feb 2019 19:23:39 -0000
> 1.8
> +++ patches/patch-prosody_cfg_lua_dist 25 Mar 2020 12:06:54 -0000
> @@ -2,7 +2,7 @@ $OpenBSD: patch-prosody_cfg_lua_dist,v 1
> Index: prosody.cfg.lua.dist
> --- prosody.cfg.lua.dist.orig
> +++ prosody.cfg.lua.dist
> -@@ -23,6 +23,14 @@
> +@@ -23,6 +23,13 @@
> -- Example: admins = { "us...@example.com", "us...@example.net" }
> admins = { }
>
> @@ -11,13 +11,12 @@ Index: prosody.cfg.lua.dist
> +prosody_group = "_prosody"
> +
> +-- Enable POSIX-only options
> -+daemonize = true
> +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
> -@@ -153,8 +161,8 @@ archive_expires_after = "1w" -- Remove archived messag
> +@@ -153,8 +160,8 @@ archive_expires_after = "1w" -- Remove archived messag
> -- Logging configuration
> -- For advanced logging see https://prosody.im/doc/logging
> log = {
> Index: pkg/prosody.rc
> ===================================================================
> RCS file: /home/cvs/ports/net/prosody/pkg/prosody.rc,v
> retrieving revision 1.4
> diff -u -p -r1.4 prosody.rc
> --- pkg/prosody.rc 11 Jan 2018 19:27:07 -0000 1.4
> +++ pkg/prosody.rc 25 Apr 2020 15:55:34 -0000
> @@ -2,22 +2,18 @@
> #
> # $OpenBSD: prosody.rc,v 1.4 2018/01/11 19:27:07 rpe Exp $
>
> -daemon="${TRUEPREFIX}/sbin/prosodyctl"
> -daemon_flags="start"
> +daemon="${TRUEPREFIX}/sbin/prosody -D"
> daemon_user="_prosody"
>
> . /etc/rc.d/rc.subr
>
> -rc_reload=NO
> +pexp="$(eval echo ${MODLUA_BIN} ${daemon}${daemon_flags:+ ${daemon_flags}})"
> +
> rc_usercheck=NO
>
> rc_check() {
> # return 1 is needed: prosodyctl returns a higher error code on failure
> ${TRUEPREFIX}/sbin/prosodyctl status || return 1
> -}
> -
> -rc_stop() {
> - ${TRUEPREFIX}/sbin/prosodyctl stop
> }
>
> rc_cmd $1
>
