UPDATE: net/prosody 0.11.5

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: net/prosody 0.11.5

Lucas-2
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
--- 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 -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 -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 = { "[hidden email]", "[hidden email]" }
  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 -0000
+++ patches/patch-util-src_pposix_c 15 Feb 2020 17:12:50 -0000
@@ -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 <stdlib.h>
+ #include <math.h>
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 -0000 1.4
+++ pkg/prosody.rc 26 Mar 2020 02:49:42 -0000
@@ -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

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: net/prosody 0.11.5

Lucas-2
Lucas <[hidden email]> 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
--- 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 = { "[hidden email]", "[hidden email]" }
  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 26 Mar 2020 02:49:42 -0000
@@ -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