Index: Makefile
===================================================================
RCS file: /cvs/ports/net/prosody/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile 14 May 2017 16:36:55 -0000 1.44
+++ Makefile 30 Oct 2017 12:26:36 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.44 2017/05/14 16:36:55 danj Exp $
COMMENT= communications server for Jabber/XMPP written in Lua
-DISTNAME= prosody-0.9.12
+DISTNAME= prosody-0.10.0
CATEGORIES= net
MASTER_SITES= http://prosody.im/downloads/source/
@@ -17,6 +17,7 @@ MODULES= lang/lua
LIB_DEPENDS= devel/libidn
MODLUA_RUN_DEPENDS+= archivers/luazlib \
databases/luadbi \
+ devel/luabitop \
devel/luafs \
security/luasec \
textproc/luaexpat>=1.3.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/prosody/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 14 May 2017 16:36:55 -0000 1.13
+++ distinfo 30 Oct 2017 12:26:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (prosody-0.9.12.tar.gz) = GlmjIrcZKKIZhVIqoA0OqzVSII17+eyzGFQqGy/uPo0=
-SIZE (prosody-0.9.12.tar.gz) = 267869
+SHA256 (prosody-0.10.0.tar.gz) = dBTkRyVsYLJkVXjEpZExE810tBnKWgMrVNuQ2YqXhJg=
+SIZE (prosody-0.10.0.tar.gz) = 330461
Index: patches/patch-certs_Makefile
===================================================================
RCS file: /cvs/ports/net/prosody/patches/patch-certs_Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 patch-certs_Makefile
--- patches/patch-certs_Makefile 14 May 2017 16:36:55 -0000 1.6
+++ patches/patch-certs_Makefile 30 Oct 2017 12:26:36 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-certs_Makefile,v 1.6 2017/05/14 16:36:55 danj Exp $
---- certs/Makefile.orig Mon Dec 5 13:54:23 2016
-+++ certs/Makefile Mon Mar 27 19:18:16 2017
+Index: certs/Makefile
+--- certs/Makefile.orig
++++ certs/Makefile
@@ -2,13 +2,13 @@
keysize=2048
@@ -19,9 +20,12 @@ $OpenBSD: patch-certs_Makefile,v 1.6 201
# to generate a self signed certificate.
.PRECIOUS: %.cnf %.key
-@@ -28,3 +28,5 @@ keysize=2048
+@@ -60,6 +60,8 @@ keysize=2048
%.key:
umask 0077 && openssl genrsa -out $@ $(keysize)
@chmod 400 $@
+ @chown _prosody $@ || \
+ echo "***WARNING***: You will need to 'chown _prosody $@'"
+
+ # Generate Diffie-Hellman parameters
+ dh-%.pem:
Index: patches/patch-prosody_cfg_lua_dist
===================================================================
RCS file: /cvs/ports/net/prosody/patches/patch-prosody_cfg_lua_dist,v
retrieving revision 1.6
diff -u -p -r1.6 patch-prosody_cfg_lua_dist
--- patches/patch-prosody_cfg_lua_dist 27 Nov 2014 08:12:51 -0000 1.6
+++ patches/patch-prosody_cfg_lua_dist 30 Oct 2017 12:26:36 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-prosody_cfg_lua_dist,v 1.6 2014/11/27 08:12:51 landry Exp $
---- prosody.cfg.lua.dist.orig Wed Oct 15 11:33:36 2014
-+++ prosody.cfg.lua.dist Thu Nov 27 09:10:35 2014
-@@ -22,6 +22,14 @@
+Index: prosody.cfg.lua.dist
+--- prosody.cfg.lua.dist.orig
++++ prosody.cfg.lua.dist
+@@ -23,6 +23,14 @@
-- Example: admins = { "user1@example.com", "user2@example.net" }
admins = { }
@@ -14,29 +15,11 @@ $OpenBSD: patch-prosody_cfg_lua_dist,v 1
+pidfile = "/var/prosody/prosody.pid"
+
-- Enable use of libevent for better performance under high load
- -- For more information see: http://prosody.im/doc/libevent
- --use_libevent = true;
-@@ -44,7 +52,7 @@ modules_enabled = {
-
- -- These are commented by default as they have a performance impact
- --"privacy"; -- Support privacy lists
-- --"compression"; -- Stream compression
-+ "compression"; -- Stream compression
-
- -- Nice to have
- "version"; -- Replies to server version requests
-@@ -63,7 +71,7 @@ modules_enabled = {
- --"http_files"; -- Serve static files from a directory over HTTP
-
- -- Other specific functionality
-- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
-+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
- --"groups"; -- Shared roster support
- --"announce"; -- Send announcement to all online users
- --"welcome"; -- Welcome users who register accounts
-@@ -139,8 +147,8 @@ authentication = "internal_plain"
+ -- For more information see: https://prosody.im/doc/libevent
+ --use_libevent = true
+@@ -161,8 +169,8 @@ archive_expires_after = "1w" -- Remove archived messag
-- Logging configuration
- -- For advanced logging see http://prosody.im/doc/logging
+ -- For advanced logging see https://prosody.im/doc/logging
log = {
- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
- error = "prosody.err";
Index: patches/patch-tests_run_tests_sh
===================================================================
RCS file: /cvs/ports/net/prosody/patches/patch-tests_run_tests_sh,v
retrieving revision 1.3
diff -u -p -r1.3 patch-tests_run_tests_sh
--- patches/patch-tests_run_tests_sh 14 May 2017 16:39:02 -0000 1.3
+++ patches/patch-tests_run_tests_sh 30 Oct 2017 12:26:36 -0000
@@ -6,6 +6,6 @@ Index: tests/run_tests.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-rm reports/*.report
--lua test.lua $*
+-exec lua test.lua "$@"
+rm -f reports/*.report
+/usr/local/bin/lua51 test.lua $*
Index: patches/patch-tests_test_core_s2smanager_lua
===================================================================
RCS file: patches/patch-tests_test_core_s2smanager_lua
diff -N patches/patch-tests_test_core_s2smanager_lua
--- patches/patch-tests_test_core_s2smanager_lua 4 Apr 2015 11:42:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-tests_test_core_s2smanager_lua,v 1.1 2015/04/04 11:42:17 edd Exp $
---- tests/test_core_s2smanager.lua.orig Fri Apr 3 18:13:58 2015
-+++ tests/test_core_s2smanager.lua Fri Apr 3 18:15:56 2015
-@@ -6,6 +6,10 @@
- -- COPYING file in the source package for more information.
- --
-
-+env = {
-+ prosody = { events = require "util.events".new() };
-+};
-+
-
- function compare_srv_priorities(csp)
- local r1 = { priority = 10, weight = 0 }
Index: patches/patch-tests_test_lua
===================================================================
RCS file: patches/patch-tests_test_lua
diff -N patches/patch-tests_test_lua
--- patches/patch-tests_test_lua 14 May 2017 16:36:55 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-tests_test_lua,v 1.2 2017/05/14 16:36:55 danj Exp $
-
-Spoke with upstream, apparently this should not be here.
-
-Index: tests/test.lua
---- tests/test.lua.orig
-+++ tests/test.lua
-@@ -12,12 +12,9 @@ function run_all_tests()
- package.loaded["net.connlisteners"] = { get = function () return {} end };
- dotest "util.jid"
- dotest "util.multitable"
-- dotest "util.rfc3484"
- dotest "net.http"
-- dotest "core.modulemanager"
- dotest "core.stanza_router"
- dotest "core.s2smanager"
-- dotest "core.configmanager"
- dotest "util.stanza"
- dotest "util.sasl.scram"
-
Index: patches/patch-util_prosodyctl_lua
===================================================================
RCS file: /cvs/ports/net/prosody/patches/patch-util_prosodyctl_lua,v
retrieving revision 1.3
diff -u -p -r1.3 patch-util_prosodyctl_lua
--- patches/patch-util_prosodyctl_lua 27 Nov 2014 08:12:51 -0000 1.3
+++ patches/patch-util_prosodyctl_lua 30 Oct 2017 12:26:36 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-util_prosodyctl_lua,v 1.3 2014/11/27 08:12:51 landry Exp $
---- util/prosodyctl.lua.orig Wed Oct 15 11:33:36 2014
-+++ util/prosodyctl.lua Tue Nov 25 14:24:23 2014
-@@ -243,7 +243,7 @@ function start()
+Index: util/prosodyctl.lua
+--- util/prosodyctl.lua.orig
++++ util/prosodyctl.lua
+@@ -239,7 +239,7 @@ local function start()
if not CFG_SOURCEDIR then
os.execute("./prosody");
else
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/prosody/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 3 Apr 2015 15:23:57 -0000 1.10
+++ pkg/PLIST 30 Oct 2017 12:26:36 -0000
@@ -14,6 +14,7 @@ lib/prosody/core/rostermanager.lua
lib/prosody/core/s2smanager.lua
lib/prosody/core/sessionmanager.lua
lib/prosody/core/stanza_router.lua
+lib/prosody/core/statsmanager.lua
lib/prosody/core/storagemanager.lua
lib/prosody/core/usermanager.lua
lib/prosody/modules/
@@ -27,10 +28,13 @@ lib/prosody/modules/mod_auth_anonymous.l
lib/prosody/modules/mod_auth_cyrus.lua
lib/prosody/modules/mod_auth_internal_hashed.lua
lib/prosody/modules/mod_auth_internal_plain.lua
+lib/prosody/modules/mod_blocklist.lua
lib/prosody/modules/mod_bosh.lua
lib/prosody/modules/mod_c2s.lua
+lib/prosody/modules/mod_carbons.lua
lib/prosody/modules/mod_component.lua
lib/prosody/modules/mod_compression.lua
+lib/prosody/modules/mod_debug_sql.lua
lib/prosody/modules/mod_dialback.lua
lib/prosody/modules/mod_disco.lua
lib/prosody/modules/mod_groups.lua
@@ -40,6 +44,12 @@ lib/prosody/modules/mod_http_files.lua
lib/prosody/modules/mod_iq.lua
lib/prosody/modules/mod_lastactivity.lua
lib/prosody/modules/mod_legacyauth.lua
+lib/prosody/modules/mod_limits.lua
+lib/prosody/modules/mod_mam/
+lib/prosody/modules/mod_mam/fallback_archive.lib.lua
+lib/prosody/modules/mod_mam/mamprefs.lib.lua
+lib/prosody/modules/mod_mam/mamprefsxml.lib.lua
+lib/prosody/modules/mod_mam/mod_mam.lua
lib/prosody/modules/mod_message.lua
lib/prosody/modules/mod_motd.lua
lib/prosody/modules/mod_net_multiplex.lua
@@ -51,31 +61,35 @@ lib/prosody/modules/mod_presence.lua
lib/prosody/modules/mod_privacy.lua
lib/prosody/modules/mod_private.lua
lib/prosody/modules/mod_proxy65.lua
-lib/prosody/modules/mod_pubsub.lua
+lib/prosody/modules/mod_pubsub/
+lib/prosody/modules/mod_pubsub/mod_pubsub.lua
+lib/prosody/modules/mod_pubsub/pubsub.lib.lua
lib/prosody/modules/mod_register.lua
lib/prosody/modules/mod_roster.lua
lib/prosody/modules/mod_s2s/
lib/prosody/modules/mod_s2s/mod_s2s.lua
lib/prosody/modules/mod_s2s/s2sout.lib.lua
+lib/prosody/modules/mod_s2s_auth_certs.lua
lib/prosody/modules/mod_saslauth.lua
+lib/prosody/modules/mod_server_contact_info.lua
lib/prosody/modules/mod_storage_internal.lua
lib/prosody/modules/mod_storage_none.lua
lib/prosody/modules/mod_storage_sql.lua
+lib/prosody/modules/mod_storage_sql1.lua
+lib/prosody/modules/mod_storage_xep0227.lua
lib/prosody/modules/mod_time.lua
lib/prosody/modules/mod_tls.lua
+lib/prosody/modules/mod_unknown.lua
lib/prosody/modules/mod_uptime.lua
lib/prosody/modules/mod_vcard.lua
lib/prosody/modules/mod_version.lua
lib/prosody/modules/mod_watchregistrations.lua
+lib/prosody/modules/mod_websocket.lua
lib/prosody/modules/mod_welcome.lua
+lib/prosody/modules/mod_windows.lua
lib/prosody/modules/muc/
lib/prosody/modules/muc/mod_muc.lua
lib/prosody/modules/muc/muc.lib.lua
-lib/prosody/modules/sql.lib.lua
-lib/prosody/modules/storage/
-lib/prosody/modules/storage/mod_xep0227.lua
-lib/prosody/modules/storage/sqlbasic.lib.lua
-lib/prosody/modules/storage/xep227store.lib.lua
lib/prosody/net/
lib/prosody/net/adns.lua
lib/prosody/net/connlisteners.lua
@@ -89,10 +103,14 @@ lib/prosody/net/httpserver.lua
lib/prosody/net/server.lua
lib/prosody/net/server_event.lua
lib/prosody/net/server_select.lua
+lib/prosody/net/websocket/
+lib/prosody/net/websocket.lua
+lib/prosody/net/websocket/frames.lua
lib/prosody/prosody.version
lib/prosody/util/
lib/prosody/util/adhoc.lua
lib/prosody/util/array.lua
+lib/prosody/util/cache.lua
lib/prosody/util/caps.lua
lib/prosody/util/dataforms.lua
lib/prosody/util/datamanager.lua
@@ -103,39 +121,57 @@ lib/prosody/util/encodings.so
lib/prosody/util/envload.lua
lib/prosody/util/events.lua
lib/prosody/util/filters.lua
+lib/prosody/util/format.lua
lib/prosody/util/hashes.so
lib/prosody/util/helpers.lua
+lib/prosody/util/hex.lua
lib/prosody/util/hmac.lua
lib/prosody/util/http.lua
+lib/prosody/util/id.lua
lib/prosody/util/import.lua
+lib/prosody/util/interpolation.lua
lib/prosody/util/ip.lua
lib/prosody/util/iterators.lua
lib/prosody/util/jid.lua
lib/prosody/util/json.lua
lib/prosody/util/logger.lua
+lib/prosody/util/mercurial.lua
lib/prosody/util/multitable.lua
lib/prosody/util/net.so
lib/prosody/util/openssl.lua
+lib/prosody/util/paths.lua
lib/prosody/util/pluginloader.lua
lib/prosody/util/pposix.so
+lib/prosody/util/presence.lua
lib/prosody/util/prosodyctl.lua
lib/prosody/util/pubsub.lua
+lib/prosody/util/queue.lua
+lib/prosody/util/random.lua
lib/prosody/util/rfc6724.lua
+lib/prosody/util/ringbuffer.so
+lib/prosody/util/rsm.lua
lib/prosody/util/sasl/
lib/prosody/util/sasl.lua
lib/prosody/util/sasl/anonymous.lua
lib/prosody/util/sasl/digest-md5.lua
+lib/prosody/util/sasl/external.lua
lib/prosody/util/sasl/plain.lua
lib/prosody/util/sasl/scram.lua
lib/prosody/util/sasl_cyrus.lua
lib/prosody/util/serialization.lua
+lib/prosody/util/session.lua
lib/prosody/util/set.lua
lib/prosody/util/signal.so
lib/prosody/util/sql.lua
+lib/prosody/util/sslconfig.lua
lib/prosody/util/stanza.lua
+lib/prosody/util/statistics.lua
+lib/prosody/util/statsd.lua
+lib/prosody/util/table.so
lib/prosody/util/template.lua
lib/prosody/util/termcolours.lua
lib/prosody/util/throttle.lua
+lib/prosody/util/time.lua
lib/prosody/util/timer.lua
lib/prosody/util/uuid.lua
lib/prosody/util/watchdog.lua
@@ -154,7 +190,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.cnf
share/examples/prosody/certs/example.com.crt
share/examples/prosody/certs/example.com.key
share/examples/prosody/certs/localhost.cnf
Hey!
On Sat, Oct 28, 2017 at 10:49:54PM +0200, viq wrote:
> This updates prosody to 0.10.0 as announced [0]
Thanks for this and sorry for the delay, that release slipped under my
radar.
Attached is my take at it. It's based on yours with some minor
differences:
- luaevent and prosody still don't seem to work well on OpenBSD, which
is why I left out the dependency. More at [1]
- A while ago sthen@ migrated from SUBST_CMD and patches to the sed
expression that is in the tree[2]. I left it at that.
- The TLS certificate generation Makefile worked fine without your
changes. Are they necessary
- This diff was created with cvs diff instead of git
[1]: https://prosody.im/issues/687
[2]: http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/prosody/Makefile?rev=1.37&content-type=text/x-cvsweb-markup
Let me know what you think
Best regards
Henrik
No comments:
Post a Comment