Re: UPDATE: net/prosody 0.11.5 from maintainer

2020-06-02 Thread Landry Breuil 
On Fri, May 29, 2020 at 02:22:27PM +, Lucas wrote:
> Lucas  wrote:
> > Okey, updated patch in here. It still runs OK in my server.
> 
> The bump never ends.

Sorry - commited!

Re: UPDATE: net/prosody 0.11.5 from maintainer

2020-05-29 Thread Lucas 
Lucas  wrote:
> Okey, updated patch in here. It still runs OK in my server.

The bump never ends.

-Lucas


Index: Makefile
===
RCS file: /home/cvs/ports/net/prosody/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile15 Mar 2020 19:04:25 -  1.56
+++ Makefile22 May 2020 21:35:28 -
@@ -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
--- distinfo15 Mar 2020 19:04:25 -  1.17
+++ distinfo22 May 2020 21:35:28 -
@@ -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 -   1.8
+++ patches/patch-prosody_cfg_lua_dist  22 May 2020 21:35:28 -
@@ -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 -  1.4
+++ pkg/prosody.rc  22 May 2020 21:36:00 -
@@ -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="${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

Re: UPDATE: net/prosody 0.11.5 from maintainer

2020-05-22 Thread Lucas 
Stuart Henderson  wrote:
> 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.

Okey, updated patch in here. It still runs OK in my server.

-Lucas


Index: Makefile
===
RCS file: /home/cvs/ports/net/prosody/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile15 Mar 2020 19:04:25 -  1.56
+++ Makefile22 May 2020 21:35:28 -
@@ -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
--- distinfo15 Mar 2020 19:04:25 -  1.17
+++ distinfo22 May 2020 21:35:28 -
@@ -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 -   1.8
+++ patches/patch-prosody_cfg_lua_dist  22 May 2020 21:35:28 -
@@ -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 -  1.4
+++ pkg/prosody.rc  22 May 2020 21:36:00 -
@@ -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="${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

Re: UPDATE: net/prosody 0.11.5 from maintainer

2020-05-21 Thread Stuart Henderson 
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 -  1.56
> +++ Makefile  24 Mar 2020 23:34:18 -
> @@ -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 -  1.17
> +++ distinfo  24 Mar 2020 23:34:35 -
> @@ -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_dist7 Feb 2019 19:23:39 -   
> 1.8
> +++ patches/patch-prosody_cfg_lua_dist25 Mar 2020 12:06:54 -
> @@ -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.rc11 Jan 2018 19:27:07 -  1.4
> +++ pkg/prosody.rc25 Apr 2020 15:55:34 -
> @@ -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
>

UPDATE: net/prosody 0.11.5 from maintainer

2020-05-16 Thread Lucas 
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}})"

-Lucas


Index: Makefile
===
RCS file: /home/cvs/ports/net/prosody/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile15 Mar 2020 19:04:25 -  1.56
+++ Makefile24 Mar 2020 23:34:18 -
@@ -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
--- distinfo15 Mar 2020 19:04:25 -  1.17
+++ distinfo24 Mar 2020 23:34:35 -
@@ -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 -   1.8
+++ patches/patch-prosody_cfg_lua_dist  25 Mar 2020 12:06:54 -
@@ -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 -  1.4
+++ pkg/prosody.rc  25 Apr 2020 15:55:34 -
@@ -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

Re: Maintainer UPDATE: net/prosody 0.11.5

2020-04-25 Thread Lucas 
Hi Stuart,

Thanks for taking the time to review this patch.

> > 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 -  1.4
> > +++ pkg/prosody.rc  26 Mar 2020 02:49:42 -
> > @@ -2,22 +2,19 @@
> >  #
> >  # $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"
> > +daemon_flags="-D"
> 
> Flags to tell it to daemonize should be included directly in daemon to
> make sure they are always used and can't be overridden.

Cool, I'll make the change.

> >  daemon_user="_prosody"
> >  
> >  . /etc/rc.d/rc.subr
> >  
> > -rc_reload=NO
> > +pexp="$(eval echo ${MODLUA_BIN} ${daemon}${daemon_flags:+ 
> > ${daemon_flags}})"
> 
> what is the point in using "$(eval echo XXX)" instead of just "XXX"?

I stole the pattern from /src/etc/rc.d/rc.subr r1.133:

319 # the shell will strip the quotes from daemon_flags when starting a 
daemon;
320 # make sure pexp matches the process (i.e. doesn't include the quotes)
321 pexp="$(eval echo ${daemon}${daemon_flags:+ ${daemon_flags}})"

That being said, I just checked the whole ports tree and not a single
one of the 137 ports defining pexp follow that pattern, so I don't know
that is the prefered direction to follow.

> Reading the release notes I don't see anything that looks critical
> to have for 6.7 though..

That's fine. Had intention to have it merged long before 6.7 ^^

Below is the updated patch. I'll bump it again after 6.7 is out.

-Lucas

Index: Makefile
===
RCS file: /home/cvs/ports/net/prosody/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile15 Mar 2020 19:04:25 -  1.56
+++ Makefile24 Mar 2020 23:34:18 -
@@ -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
--- distinfo15 Mar 2020 19:04:25 -  1.17
+++ distinfo24 Mar 2020 23:34:35 -
@@ -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 -   1.8
+++ patches/patch-prosody_cfg_lua_dist  25 Mar 2020 12:06:54 -
@@ -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 -  1.4
+++ pkg/prosody.rc  25 Apr 2020 15:55:34 -
@@ -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

Re: Maintainer UPDATE: net/prosody 0.11.5

2020-04-25 Thread Stuart Henderson 
On 2020/04/25 13:03, Lucas wrote:
> Nils Reuße  wrote:
> > On 2020-04-18 16:52, Lucas wrote:
> > > Lucas  wrote:
> > >> Lucas  wrote:
> > >>> Bump. Patch reattached as previous one included a leftover from cvs add
> > >>> for patches/patch-util-src_pposix_c, merged when update for 0.11.4 got
> > >>> commited. I'm still grasping CVS. ^^
> > >>>
> > >>> -Lucas
> > >>
> > >> Weekly bump.
> > >>
> > >> -Lucas
> > > 
> > > Bump again
> > > 
> > > -Lucas
> > 
> > Hi,
> > 
> > thanks for the update!  It works for me on amd64 and I would like to see 
> > it in 6.7.
> > 
> > Nils
> 
> Bump again, now with an additional success story!
> 
> -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 -  1.56
> +++ Makefile  24 Mar 2020 23:34:18 -
> @@ -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 -  1.17
> +++ distinfo  24 Mar 2020 23:34:35 -
> @@ -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_dist7 Feb 2019 19:23:39 -   
> 1.8
> +++ patches/patch-prosody_cfg_lua_dist25 Mar 2020 12:06:54 -
> @@ -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.rc11 Jan 2018 19:27:07 -  1.4
> +++ pkg/prosody.rc26 Mar 2020 02:49:42 -
> @@ -2,22 +2,19 @@
>  #
>  # $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"
> +daemon_flags="-D"

Flags to tell it to daemonize should be included directly in daemon to
make sure they are always used and can't be overridden.

>  daemon_user="_prosody"
>  
>  . /etc/rc.d/rc.subr
>  
> -rc_reload=NO
> +pexp="$(eval echo ${MODLUA_BIN} ${daemon}${daemon_flags:+ ${daemon_flags}})"

what is the point in using "$(eval echo XXX)" instead of just "XXX"?

> +
>  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
> 

Reading the release notes I don't see anything that looks critical
to have for 6.7 though..

Re: Maintainer UPDATE: net/prosody 0.11.5

2020-04-25 Thread Lucas 
Nils Reuße  wrote:
> On 2020-04-18 16:52, Lucas wrote:
> > Lucas  wrote:
> >> Lucas  wrote:
> >>> Bump. Patch reattached as previous one included a leftover from cvs add
> >>> for patches/patch-util-src_pposix_c, merged when update for 0.11.4 got
> >>> commited. I'm still grasping CVS. ^^
> >>>
> >>> -Lucas
> >>
> >> Weekly bump.
> >>
> >> -Lucas
> > 
> > Bump again
> > 
> > -Lucas
> 
> Hi,
> 
> thanks for the update!  It works for me on amd64 and I would like to see 
> it in 6.7.
> 
> Nils

Bump again, now with an additional success story!

-Lucas

Index: Makefile
===
RCS file: /home/cvs/ports/net/prosody/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile15 Mar 2020 19:04:25 -  1.56
+++ Makefile24 Mar 2020 23:34:18 -
@@ -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
--- distinfo15 Mar 2020 19:04:25 -  1.17
+++ distinfo24 Mar 2020 23:34:35 -
@@ -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 -   1.8
+++ patches/patch-prosody_cfg_lua_dist  25 Mar 2020 12:06:54 -
@@ -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 -  1.4
+++ pkg/prosody.rc  26 Mar 2020 02:49:42 -
@@ -2,22 +2,19 @@
 #
 # $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"
+daemon_flags="-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

Re: Maintainer UPDATE: net/prosody 0.11.5

2020-04-20 Thread Nils Reuße 

On 2020-04-18 16:52, Lucas wrote:

Lucas  wrote:

Lucas  wrote:

Bump. Patch reattached as previous one included a leftover from cvs add
for patches/patch-util-src_pposix_c, merged when update for 0.11.4 got
commited. I'm still grasping CVS. ^^

-Lucas


Weekly bump.

-Lucas


Bump again

-Lucas


Index: Makefile
===
RCS file: /home/cvs/ports/net/prosody/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile15 Mar 2020 19:04:25 -  1.56
+++ Makefile24 Mar 2020 23:34:18 -
@@ -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
--- distinfo15 Mar 2020 19:04:25 -  1.17
+++ distinfo24 Mar 2020 23:34:35 -
@@ -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 -   1.8
+++ patches/patch-prosody_cfg_lua_dist  25 Mar 2020 12:06:54 -
@@ -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 -  1.4
+++ pkg/prosody.rc  26 Mar 2020 02:49:42 -
@@ -2,22 +2,19 @@
  #
  # $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"
+daemon_flags="-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




Hi,

thanks for the update!  It works for me on amd64 and I would like to see 
it in 6.7.


Nils

Maintainer UPDATE: net/prosody 0.11.5

2020-04-18 Thread Lucas 
Lucas  wrote:
> Lucas  wrote:
> > Bump. Patch reattached as previous one included a leftover from cvs add
> > for patches/patch-util-src_pposix_c, merged when update for 0.11.4 got
> > commited. I'm still grasping CVS. ^^
> > 
> > -Lucas
> 
> Weekly bump.
> 
> -Lucas

Bump again

-Lucas


Index: Makefile
===
RCS file: /home/cvs/ports/net/prosody/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile15 Mar 2020 19:04:25 -  1.56
+++ Makefile24 Mar 2020 23:34:18 -
@@ -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
--- distinfo15 Mar 2020 19:04:25 -  1.17
+++ distinfo24 Mar 2020 23:34:35 -
@@ -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 -   1.8
+++ patches/patch-prosody_cfg_lua_dist  25 Mar 2020 12:06:54 -
@@ -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 -  1.4
+++ pkg/prosody.rc  26 Mar 2020 02:49:42 -
@@ -2,22 +2,19 @@
 #
 # $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"
+daemon_flags="-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

Re: UPDATE: net/prosody 0.11.5

2020-04-10 Thread Lucas 
Lucas  wrote:
> Bump. Patch reattached as previous one included a leftover from cvs add
> for patches/patch-util-src_pposix_c, merged when update for 0.11.4 got
> commited. I'm still grasping CVS. ^^
> 
> -Lucas

Weekly bump.

-Lucas


Index: Makefile
===
RCS file: /home/cvs/ports/net/prosody/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile15 Mar 2020 19:04:25 -  1.56
+++ Makefile24 Mar 2020 23:34:18 -
@@ -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
--- distinfo15 Mar 2020 19:04:25 -  1.17
+++ distinfo24 Mar 2020 23:34:35 -
@@ -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 -   1.8
+++ patches/patch-prosody_cfg_lua_dist  25 Mar 2020 12:06:54 -
@@ -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 -  1.4
+++ pkg/prosody.rc  26 Mar 2020 02:49:42 -
@@ -2,22 +2,19 @@
 #
 # $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"
+daemon_flags="-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

Re: UPDATE: net/prosody 0.11.5

2020-04-03 Thread Lucas 
Lucas  wrote:
> Hello ports@,
> 
> Find a update for prosody-0.11.5. Release notes are small:
> 
>  * prosody / mod_posix: Support for command-line flags to override
>daemonize config option
>  * mod_websocket: Clear mask bit when reflecting ping frames
> 
> The bullet is the responsible for the changes in prosody.rc.
> 
> daemonize is removed from the configuration file as it'll be deprecated
> in 0.12, according to [0].
> 
> Currently deployed and working in my server, new rc script works. Had
> to rm /var/run/rc.d/prosody first for changes to be picked up tho. Any
> clues?
> 
> -Lucas
> 
> [0]: https://prosody.im/doc/modules/mod_posix

Bump. Patch reattached as previous one included a leftover from cvs add
for patches/patch-util-src_pposix_c, merged when update for 0.11.4 got
commited. I'm still grasping CVS. ^^

-Lucas


Index: Makefile
===
RCS file: /home/cvs/ports/net/prosody/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile15 Mar 2020 19:04:25 -  1.56
+++ Makefile24 Mar 2020 23:34:18 -
@@ -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
--- distinfo15 Mar 2020 19:04:25 -  1.17
+++ distinfo24 Mar 2020 23:34:35 -
@@ -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 -   1.8
+++ patches/patch-prosody_cfg_lua_dist  25 Mar 2020 12:06:54 -
@@ -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 -  1.4
+++ pkg/prosody.rc  26 Mar 2020 02:49:42 -
@@ -2,22 +2,19 @@
 #
 # $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"
+daemon_flags="-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

UPDATE: net/prosody 0.11.5

2020-03-25 Thread Lucas 
Hello ports@,

Find a update for prosody-0.11.5. Release notes are small:

 * prosody / mod_posix: Support for command-line flags to override
   daemonize config option
 * mod_websocket: Clear mask bit when reflecting ping frames

The bullet is the responsible for the changes in prosody.rc.

daemonize is removed from the configuration file as it'll be deprecated
in 0.12, according to [0].

Currently deployed and working in my server, new rc script works. Had
to rm /var/run/rc.d/prosody first for changes to be picked up tho. Any
clues?

-Lucas

[0]: https://prosody.im/doc/modules/mod_posix


Index: Makefile
===
RCS file: /home/cvs/ports/net/prosody/Makefile,v
retrieving revision 1.56
diff -u -p -u -p -r1.56 Makefile
--- Makefile15 Mar 2020 19:04:25 -  1.56
+++ Makefile24 Mar 2020 23:34:18 -
@@ -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 -u -p -r1.17 distinfo
--- distinfo15 Mar 2020 19:04:25 -  1.17
+++ distinfo24 Mar 2020 23:34:35 -
@@ -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 -u -p -r1.8 patch-prosody_cfg_lua_dist
--- patches/patch-prosody_cfg_lua_dist  7 Feb 2019 19:23:39 -   1.8
+++ patches/patch-prosody_cfg_lua_dist  25 Mar 2020 12:06:54 -
@@ -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: patches/patch-util-src_pposix_c
===
RCS file: patches/patch-util-src_pposix_c
diff -N patches/patch-util-src_pposix_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-util-src_pposix_c 15 Feb 2020 17:12:50 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+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
+ #endif
++#if defined(__OpenBSD__)
++#ifndef _BSD_SOURCE
++#define _BSD_SOURCE
++#endif
++#endif
+ 
+ #include 
+ #include 
Index: pkg/prosody.rc
===
RCS file: /home/cvs/ports/net/prosody/pkg/prosody.rc,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 prosody.rc
--- pkg/prosody.rc  11 Jan 2018 19:27:07 -  1.4
+++ pkg/prosody.rc  26 Mar 2020 02:49:42 -
@@ -2,22 +2,19 @@
 #
 # $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"
+daemon_flags="-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