6 files changed, 87 insertions, 45 deletions

diff --git a/net-im/prosody/Makefile b/net-im/prosody/Makefile
index 308ce5c9a862..b3751847eb07 100644
--- a/net-im/prosody/Makefile
+++ b/net-im/prosody/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	prosody
-PORTVERSION=	0.9.12
+PORTVERSION=	0.10.0
 CATEGORIES=	net-im
 MASTER_SITES=	http://prosody.im/downloads/source/ \
 		http://redundancy.redundancy.org/mirror/
@@ -17,7 +17,6 @@ RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/core.so:net/luasocket-51 \
 		${LUA_MODLIBDIR}/ssl.so:security/luasec-51 \
 		${LUA_MODLIBDIR}/lxp.so:textproc/luaexpat-51 \
 		${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem-51
-
 LIB_DEPENDS=	libidn.so:dns/libidn
 
 USES=		cpe gmake lua:51 shebangfix ssl
diff --git a/net-im/prosody/distinfo b/net-im/prosody/distinfo
index a4c56ef006cc..a8d508165a80 100644
--- a/net-im/prosody/distinfo
+++ b/net-im/prosody/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484211518
-SHA256 (prosody-0.9.12.tar.gz) = 1a59a322b71928a21985522aa00d0eab3552208d7bf9ecb318542a1b2fee3e8d
-SIZE (prosody-0.9.12.tar.gz) = 267869
+TIMESTAMP = 1510389229
+SHA256 (prosody-0.10.0.tar.gz) = 7414e447256c60b2645578c4a5913113cd74b419ca5a032b54db90d98a978498
+SIZE (prosody-0.10.0.tar.gz) = 330461
diff --git a/net-im/prosody/files/patch-Makefile b/net-im/prosody/files/patch-Makefile
index b3af09d02f57..ec0dc38bc714 100644
--- a/net-im/prosody/files/patch-Makefile
+++ b/net-im/prosody/files/patch-Makefile
@@ -1,20 +1,20 @@
---- Makefile.orig	2014-01-12 05:41:40.000000000 -0600
-+++ Makefile	2014-03-15 11:58:25.725744098 -0500
-@@ -6,7 +6,7 @@
- MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
- SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
+--- Makefile.orig	2017-09-28 13:07:47 UTC
++++ Makefile
+@@ -6,7 +6,7 @@ CONFIG = $(DESTDIR)$(SYSCONFDIR)
+ MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules
+ SOURCE = $(DESTDIR)$(LIBDIR)/prosody
  DATA = $(DESTDIR)$(DATADIR)
 -MAN = $(DESTDIR)$(PREFIX)/share/man
 +MAN = $(DESTDIR)$(PREFIX)/man
  
- INSTALLEDSOURCE = $(PREFIX)/lib/prosody
+ INSTALLEDSOURCE = $(LIBDIR)/prosody
  INSTALLEDCONFIG = $(SYSCONFDIR)
-@@ -40,7 +40,7 @@
- 	umask 0022 && cp -r plugins/* $(MODULES)
- 	install -m644 certs/* $(CONFIG)/certs
- 	install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
--	test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
-+	install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample
- 	test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true
+@@ -53,7 +53,7 @@ install: prosody.install prosodyctl.install prosody.cf
+ 	$(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
+ 	$(INSTALL_DATA) certs/* $(CONFIG)/certs
+ 	$(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
+-	test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
++	$(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample
+ 	-test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
  	$(MAKE) install -C util-src
  
diff --git a/net-im/prosody/files/patch-configure b/net-im/prosody/files/patch-configure
index aa4a59528be2..89f8c087f982 100644
--- a/net-im/prosody/files/patch-configure
+++ b/net-im/prosody/files/patch-configure
@@ -1,17 +1,16 @@
---- configure.orig	2013-12-08 19:05:39.000000000 +0100
-+++ configure	2014-02-06 22:21:15.000000000 +0100
-@@ -13,11 +13,11 @@
- IDN_LIB=idn
+--- configure.orig	2017-09-28 13:07:47 UTC
++++ configure
+@@ -16,10 +16,10 @@ LUA_LIBDIR="/usr/lib"
+ IDN_LIB="idn"
  ICU_FLAGS="-licui18n -licudata -licuuc"
- OPENSSL_LIB=crypto
--CC=gcc
-+CC=cc
- CXX=g++
--LD=gcc
-+LD=cc
- RUNWITH=lua
--EXCERTS=yes
-+EXCERTS=no
+ OPENSSL_LIB="crypto"
+-CC="gcc"
+-LD="gcc"
++CC="cc"
++LD="cc"
+ RUNWITH="lua"
+-EXCERTS="yes"
++EXCERTS="no"
+ PRNG=
+ PRNGLIBS=
  
- CFLAGS="-fPIC -Wall"
- LDFLAGS="-shared"
diff --git a/net-im/prosody/files/patch-util-src_pposix.c b/net-im/prosody/files/patch-util-src_pposix.c
new file mode 100644
index 000000000000..b12739468a62
--- /dev/null
+++ b/net-im/prosody/files/patch-util-src_pposix.c
@@ -0,0 +1,10 @@
+--- util-src/pposix.c.orig	2017-11-11 08:52:04 UTC
++++ util-src/pposix.c
+@@ -21,7 +21,6 @@
+ #else
+ #define _DEFAULT_SOURCE
+ #endif
+-#define _POSIX_C_SOURCE 200809L
+ 
+ #include <stdlib.h>
+ #include <math.h>
diff --git a/net-im/prosody/pkg-plist b/net-im/prosody/pkg-plist
index ea1351d709d0..f323bae9fccc 100644
--- a/net-im/prosody/pkg-plist
+++ b/net-im/prosody/pkg-plist
@@ -15,6 +15,7 @@ lib/prosody/core/portmanager.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/mod_admin_adhoc.lua
@@ -30,20 +31,25 @@ lib/prosody/modules/mod_http_files.lua
 lib/prosody/modules/mod_motd.lua
 lib/prosody/modules/mod_net_multiplex.lua
 lib/prosody/modules/mod_offline.lua
-lib/prosody/modules/mod_pubsub.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_announce.lua
+lib/prosody/modules/mod_blocklist.lua
 lib/prosody/modules/mod_bosh.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
 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_message.lua
 lib/prosody/modules/mod_pep.lua
 lib/prosody/modules/mod_ping.lua
@@ -54,24 +60,31 @@ lib/prosody/modules/mod_private.lua
 lib/prosody/modules/mod_proxy65.lua
 lib/prosody/modules/mod_register.lua
 lib/prosody/modules/mod_roster.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_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/sql.lib.lua
+lib/prosody/modules/mod_windows.lua
+lib/prosody/modules/mod_pubsub/mod_pubsub.lua
+lib/prosody/modules/mod_pubsub/pubsub.lib.lua
+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/adhoc/adhoc.lib.lua
 lib/prosody/modules/adhoc/mod_adhoc.lua
 lib/prosody/modules/mod_s2s/mod_s2s.lua
 lib/prosody/modules/mod_s2s/s2sout.lib.lua
 lib/prosody/modules/muc/mod_muc.lua
 lib/prosody/modules/muc/muc.lib.lua
-lib/prosody/modules/storage/mod_xep0227.lua
-lib/prosody/modules/storage/sqlbasic.lib.lua
-lib/prosody/modules/storage/xep227store.lib.lua
 lib/prosody/net/adns.lua
 lib/prosody/net/connlisteners.lua
 lib/prosody/net/dns.lua
@@ -83,9 +96,12 @@ lib/prosody/net/server_select.lua
 lib/prosody/net/http/codes.lua
 lib/prosody/net/http/parser.lua
 lib/prosody/net/http/server.lua
+lib/prosody/net/websocket.lua
+lib/prosody/net/websocket/frames.lua
 lib/prosody/prosody.version
 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
@@ -96,41 +112,59 @@ 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.lua
-lib/prosody/util/sql.lua
-lib/prosody/util/template.lua
-lib/prosody/util/throttle.lua
-lib/prosody/util/watchdog.lua
-lib/prosody/util/x509.lua
-lib/prosody/util/xml.lua
-lib/prosody/util/xmppstream.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
+lib/prosody/util/x509.lua
+lib/prosody/util/xml.lua
+lib/prosody/util/xmppstream.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