Update prosody to 0.9.1

Changes in 0.9.1:
* Config: Fix the workaround for LuaSec 0.4.x to apply the ssl 'ciphers'
  option correctly
* Config: Ability to specify the ssl 'dhparam' option simply as a path to
  a file, instead of a callback function
* Windows: Fix s2s issues
* Windows: Fix the ability to specify absolute paths to SSL certificates
  in the config
* Build: Fix compilation issue on non-Linux systems that have glibc (such as
  Debian GNU/kFreeBSD)
* API: Fix to our set library, that caused the :include() and :exclude()
  methods to behave incorrectly

Changes in 0.9.0:
* IPv6 support for c2s, s2s and all other services (e.g. HTTP)
* Server-to-server authentication using certificates (SASL EXTERNAL)
* A new HTTP subsystem, supporting virtual hosts, and fully reloadable modules
* Client and server connections are now handled by modules: mod_c2s, mod_s2s
* mod_pubsub: Basic pubsub service (some features not yet implemented)
* prosodyctl about - show information about a Prosody installation
* prosodyctl cert - command to generate XMPP certificates and CSRs
* Many very nice enhancements to our module API
* MUC: Configurable per-room history length
* MUC: Plugins can now extend the room configuration form

See notes on upgrading from 0.8.x:

  https://prosody.im/doc/release/0.9.0#upgrading

6 files changed, 92 insertions, 49 deletions

diff --git a/chat/prosody/Makefile b/chat/prosody/Makefile
index fe14d8ef866..c022d305314 100644
--- a/chat/prosody/Makefile
+++ b/chat/prosody/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2013/07/04 21:27:56 adam Exp $
+# $NetBSD: Makefile,v 1.9 2013/09/13 14:37:49 fhajny Exp $
 #
 
-DISTNAME=		prosody-0.8.2
-PKGREVISION=		3
+DISTNAME=		prosody-0.9.1
 CATEGORIES=		chat
 MASTER_SITES=		http://prosody.im/downloads/source/
 
@@ -36,10 +35,10 @@ OWN_DIRS_PERMS+=	${PROSODY_LOG} ${PROSODY_USER} ${PROSODY_GROUP} 0770
 OWN_DIRS_PERMS+=	${PROSODY_RUN} ${PROSODY_USER} ${PROSODY_GROUP} 0770
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/certs
 
-PKG_USERS_VARS+=	PROSODY_USER
-PKG_GROUPS_VARS+=	PROSODY_GROUP
-PKG_GROUPS?=		${PROSODY_GROUP}
-PKG_USERS?=		${PROSODY_USER}:${PROSODY_GROUP}
+PKG_USERS_VARS=		PROSODY_USER
+PKG_GROUPS_VARS=	PROSODY_GROUP
+PKG_GROUPS=		${PROSODY_GROUP}
+PKG_USERS=		${PROSODY_USER}:${PROSODY_GROUP}
 PKG_GECOS.${PROSODY_USER}=	Prosody daemon user
 PKG_HOME.${PROSODY_USER}=	${PROSODY_DATA}
 PKG_SHELL.${PROSODY_USER}=	${NOLOGIN}
@@ -47,9 +46,11 @@ PKG_SHELL.${PROSODY_USER}=	${NOLOGIN}
 PKG_SYSCONFSUBDIR=	${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES+=		${EGDIR}/prosody.cfg.lua ${PKG_SYSCONFDIR}/prosody.cfg.lua
-CONF_FILES+=		${EGDIR}/certs/localhost.cert ${PKG_SYSCONFDIR}/certs/localhost.cert
+CONF_FILES+=		${EGDIR}/certs/localhost.crt ${PKG_SYSCONFDIR}/certs/localhost.crt
 CONF_FILES+=		${EGDIR}/certs/localhost.key ${PKG_SYSCONFDIR}/certs/localhost.key
 
+CFLAGS+=		-fPIC -Wall -DLUA_COMPAT_MODULE
+
 REPLACE_INTERPRETER+=	lua
 REPLACE.lua.old=	/usr/bin/env lua
 REPLACE.lua.new=	${PREFIX}/bin/lua
@@ -59,6 +60,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--datadir=${PROSODY_DATA}
 CONFIGURE_ARGS+=	--ldflags="${COMPILER_RPATH_FLAG}${PREFIX}/lib -shared"
+CONFIGURE_ARGS+=	--cflags=${CFLAGS:Q}
 
 SUBST_CLASSES+=		eg
 SUBST_MESSAGE.eg=	Fixing examples/configuration directories
diff --git a/chat/prosody/PLIST b/chat/prosody/PLIST
index 4655bd58929..344059e4bab 100644
--- a/chat/prosody/PLIST
+++ b/chat/prosody/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2011/09/30 08:33:54 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/09/13 14:37:49 fhajny Exp $
 bin/prosody
 bin/prosodyctl
 lib/prosody/core/certmanager.lua
 lib/prosody/core/configmanager.lua
 lib/prosody/core/hostmanager.lua
 lib/prosody/core/loggingmanager.lua
+lib/prosody/core/moduleapi.lua
 lib/prosody/core/modulemanager.lua
+lib/prosody/core/portmanager.lua
 lib/prosody/core/rostermanager.lua
 lib/prosody/core/s2smanager.lua
 lib/prosody/core/sessionmanager.lua
@@ -22,17 +24,21 @@ 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_bosh.lua
+lib/prosody/modules/mod_c2s.lua
 lib/prosody/modules/mod_component.lua
 lib/prosody/modules/mod_compression.lua
 lib/prosody/modules/mod_dialback.lua
 lib/prosody/modules/mod_disco.lua
 lib/prosody/modules/mod_groups.lua
-lib/prosody/modules/mod_httpserver.lua
+lib/prosody/modules/mod_http.lua
+lib/prosody/modules/mod_http_errors.lua
+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_message.lua
 lib/prosody/modules/mod_motd.lua
+lib/prosody/modules/mod_net_multiplex.lua
 lib/prosody/modules/mod_offline.lua
 lib/prosody/modules/mod_pep.lua
 lib/prosody/modules/mod_ping.lua
@@ -41,10 +47,14 @@ 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_register.lua
 lib/prosody/modules/mod_roster.lua
+lib/prosody/modules/mod_s2s/mod_s2s.lua
+lib/prosody/modules/mod_s2s/s2sout.lib.lua
 lib/prosody/modules/mod_saslauth.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_time.lua
 lib/prosody/modules/mod_tls.lua
@@ -55,44 +65,52 @@ lib/prosody/modules/mod_watchregistrations.lua
 lib/prosody/modules/mod_welcome.lua
 lib/prosody/modules/muc/mod_muc.lua
 lib/prosody/modules/muc/muc.lib.lua
+lib/prosody/modules/sql.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
 lib/prosody/net/http.lua
-lib/prosody/net/httpclient_listener.lua
+lib/prosody/net/http/codes.lua
+lib/prosody/net/http/parser.lua
+lib/prosody/net/http/server.lua
 lib/prosody/net/httpserver.lua
-lib/prosody/net/httpserver_listener.lua
-lib/prosody/net/multiplex_listener.lua
 lib/prosody/net/server.lua
 lib/prosody/net/server_event.lua
 lib/prosody/net/server_select.lua
-lib/prosody/net/xmppclient_listener.lua
-lib/prosody/net/xmppcomponent_listener.lua
-lib/prosody/net/xmppserver_listener.lua
 lib/prosody/prosody.version
+lib/prosody/util/adhoc.lua
 lib/prosody/util/array.lua
-lib/prosody/util/broadcast.lua
 lib/prosody/util/caps.lua
 lib/prosody/util/dataforms.lua
 lib/prosody/util/datamanager.lua
 lib/prosody/util/datetime.lua
+lib/prosody/util/debug.lua
 lib/prosody/util/dependencies.lua
 lib/prosody/util/encodings.so
+lib/prosody/util/envload.lua
 lib/prosody/util/events.lua
 lib/prosody/util/filters.lua
 lib/prosody/util/hashes.so
 lib/prosody/util/helpers.lua
 lib/prosody/util/hmac.lua
-lib/prosody/util/httpstream.lua
+lib/prosody/util/http.lua
 lib/prosody/util/import.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/multitable.lua
+lib/prosody/util/net.so
+lib/prosody/util/openssl.lua
 lib/prosody/util/pluginloader.lua
 lib/prosody/util/pposix.so
 lib/prosody/util/prosodyctl.lua
+lib/prosody/util/pubsub.lua
+lib/prosody/util/rfc6724.lua
 lib/prosody/util/sasl.lua
 lib/prosody/util/sasl/anonymous.lua
 lib/prosody/util/sasl/digest-md5.lua
@@ -102,16 +120,20 @@ lib/prosody/util/sasl_cyrus.lua
 lib/prosody/util/serialization.lua
 lib/prosody/util/set.lua
 lib/prosody/util/signal.so
+lib/prosody/util/sql.lua
 lib/prosody/util/stanza.lua
 lib/prosody/util/template.lua
 lib/prosody/util/termcolours.lua
+lib/prosody/util/throttle.lua
 lib/prosody/util/timer.lua
 lib/prosody/util/uuid.lua
-lib/prosody/util/xmlrpc.lua
+lib/prosody/util/watchdog.lua
+lib/prosody/util/x509.lua
+lib/prosody/util/xml.lua
 lib/prosody/util/xmppstream.lua
 man/man1/prosodyctl.1
 share/examples/prosody/certs/Makefile
-share/examples/prosody/certs/localhost.cert
+share/examples/prosody/certs/localhost.crt
 share/examples/prosody/certs/localhost.key
 share/examples/prosody/certs/openssl.cnf
 share/examples/prosody/prosody.cfg.lua
diff --git a/chat/prosody/distinfo b/chat/prosody/distinfo
index 9c7812ec21e..81c037915cc 100644
--- a/chat/prosody/distinfo
+++ b/chat/prosody/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2011/09/30 08:33:54 fhajny Exp $
+$NetBSD: distinfo,v 1.5 2013/09/13 14:37:49 fhajny Exp $
 
-SHA1 (prosody-0.8.2.tar.gz) = a029c4e69f6daaf3320061e69c9f86390d7e845a
-RMD160 (prosody-0.8.2.tar.gz) = 908a04f5daa7733c66ab4f09fd54fb52175cb70c
-Size (prosody-0.8.2.tar.gz) = 212170 bytes
-SHA1 (patch-aa) = 241c01dbd8de2821c0988032db50b01cc61c548c
-SHA1 (patch-ab) = cb48a22114e99fc1832f86067cd1ba9d8de999ac
+SHA1 (prosody-0.9.1.tar.gz) = 2e500932857e865557977f6c1b52ac362b6eb020
+RMD160 (prosody-0.9.1.tar.gz) = 95d5e12c4ca2a2e292a2baa7271f949f1743c02b
+Size (prosody-0.9.1.tar.gz) = 265755 bytes
+SHA1 (patch-aa) = 70398b3ce10b7adc06ccf56e60cbf8f1da8fb2c4
+SHA1 (patch-ab) = 5a8497693644ecd4d0bd809470f900423ea675e2
 SHA1 (patch-ad) = 5cd22cb93895b6f60b4f910d6aab09e6f1f22712
+SHA1 (patch-prosodyctl) = f181c10cae64f09b87fda3015e4e940597cbe723
diff --git a/chat/prosody/patches/patch-aa b/chat/prosody/patches/patch-aa
index fd50e94ae6d..f644f34a3a4 100644
--- a/chat/prosody/patches/patch-aa
+++ b/chat/prosody/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2011/06/06 14:41:48 schnoebe Exp $
+$NetBSD: patch-aa,v 1.3 2013/09/13 14:37:49 fhajny Exp $
 
 Fix installation directories and scripts
---- Makefile.orig	2011-06-03 15:31:32.000000000 +0000
+--- Makefile.orig	2013-09-09 10:32:23.000000000 +0000
 +++ Makefile
 @@ -3,10 +3,11 @@ include config.unix
  
@@ -12,11 +12,11 @@ Fix installation directories and scripts
  SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
  DATA = $(DESTDIR)$(DATADIR)
 -MAN = $(DESTDIR)$(PREFIX)/share/man
-+MAN = $(DESTDIR)$(PREFIX)/man
++MAN = $(DESTDIR)$(PREFIX)/$(PKGMANDIR)
  
  INSTALLEDSOURCE = $(PREFIX)/lib/prosody
  INSTALLEDCONFIG = $(SYSCONFDIR)
-@@ -17,28 +18,33 @@ all: prosody.install prosodyctl.install 
+@@ -19,26 +20,39 @@ all: prosody.install prosodyctl.install
  	$(MAKE) -C util-src install
  
  install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
@@ -28,44 +28,48 @@ Fix installation directories and scripts
 -	install -m755 ./prosody.install $(BIN)/prosody
 -	install -m755 ./prosodyctl.install $(BIN)/prosodyctl
 -	install -m644 core/* $(SOURCE)/core
--	install -m644 net/* $(SOURCE)/net
+-	install -m644 net/*.lua $(SOURCE)/net
+-	install -d $(SOURCE)/net/http
+-	install -m644 net/http/*.lua $(SOURCE)/net/http
 -	install -m644 util/*.lua $(SOURCE)/util
 -	install -m644 util/*.so $(SOURCE)/util
 -	install -d $(SOURCE)/util/sasl
 -	install -m644 util/sasl/* $(SOURCE)/util/sasl
--	install -m644 plugins/*.lua $(MODULES)
--	install -d $(MODULES)/muc
--	install -m644 plugins/muc/* $(MODULES)/muc
+-	umask 0022 && cp -r plugins/* $(MODULES)
 -	install -m644 certs/* $(CONFIG)/certs
--	install -d $(MODULES)/adhoc
--	install -m644 plugins/adhoc/*.lua $(MODULES)/adhoc
 -	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
--	test -e prosody.version && install prosody.version $(SOURCE)/prosody.version || true
-+	$(BSD_INSTALL_SCRIPT_DIR) $(BIN) 
+-	test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true
++	$(BSD_INSTALL_SCRIPT_DIR) $(BIN)
 +	$(BSD_INSTALL_DATA_DIR) $(EGDIR)
 +	$(BSD_INSTALL_DATA_DIR) $(MODULES)
 +	$(BSD_INSTALL_DATA_DIR) $(SOURCE)
 +	$(BSD_INSTALL_DATA_DIR) -m 750 $(DATA)
 +	$(BSD_INSTALL_MAN_DIR) $(MAN)/man1
-+	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/core 
++	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/core
 +	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/net
 +	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/util
 +	$(BSD_INSTALL_SCRIPT) ./prosody.install $(BIN)/prosody
 +	$(BSD_INSTALL_SCRIPT) ./prosodyctl.install $(BIN)/prosodyctl
 +	$(BSD_INSTALL_DATA) core/* $(SOURCE)/core
-+	$(BSD_INSTALL_DATA) net/* $(SOURCE)/net
++	$(BSD_INSTALL_DATA) net/*.lua $(SOURCE)/net
++	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/net/http
++	$(BSD_INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http
 +	$(BSD_INSTALL_DATA) util/*.lua $(SOURCE)/util
 +	$(BSD_INSTALL_LIB) util/*.so $(SOURCE)/util
 +	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/util/sasl
 +	$(BSD_INSTALL_DATA) util/sasl/* $(SOURCE)/util/sasl
 +	$(BSD_INSTALL_DATA) plugins/*.lua $(MODULES)
-+	$(BSD_INSTALL_LIB_DIR) $(MODULES)/muc
-+	$(BSD_INSTALL_DATA) plugins/muc/* $(MODULES)/muc
 +	$(BSD_INSTALL_DATA_DIR) $(EGDIR)/certs
 +	$(BSD_INSTALL_DATA) certs/* $(EGDIR)/certs
 +	$(BSD_INSTALL_LIB_DIR) $(MODULES)/adhoc
 +	$(BSD_INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
++	$(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_s2s
++	$(BSD_INSTALL_DATA) plugins/mod_s2s/* $(MODULES)/mod_s2s
++	$(BSD_INSTALL_LIB_DIR) $(MODULES)/muc
++	$(BSD_INSTALL_DATA) plugins/muc/* $(MODULES)/muc
++	$(BSD_INSTALL_LIB_DIR) $(MODULES)/storage
++	$(BSD_INSTALL_DATA) plugins/storage/* $(MODULES)/storage
 +	$(BSD_INSTALL_MAN) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
 +	$(BSD_INSTALL_DATA) prosody.cfg.lua.install $(EGDIR)/prosody.cfg.lua
 +	$(BSD_INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
diff --git a/chat/prosody/patches/patch-ab b/chat/prosody/patches/patch-ab
index 1a29dde19d8..0e3a62de99c 100644
--- a/chat/prosody/patches/patch-ab
+++ b/chat/prosody/patches/patch-ab
@@ -1,21 +1,21 @@
-$NetBSD: patch-ab,v 1.3 2011/09/30 08:33:54 fhajny Exp $
+$NetBSD: patch-ab,v 1.4 2013/09/13 14:37:49 fhajny Exp $
 
 enable POSIX functionality by default
 set the logging paths
 set up the pid files
 
---- prosody.cfg.lua.dist.orig	2011-06-03 15:31:34.000000000 +0000
+--- prosody.cfg.lua.dist.orig	2013-09-09 10:32:23.000000000 +0000
 +++ prosody.cfg.lua.dist
-@@ -59,7 +59,7 @@ modules_enabled = {
- 		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
+@@ -63,7 +63,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.
- 		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
- 		--"httpserver"; -- Serve static files from a directory over HTTP
  		--"groups"; -- Shared roster support
-@@ -123,12 +123,15 @@ authentication = "internal_plain"
+ 		--"announce"; -- Send announcement to all online users
+ 		--"welcome"; -- Welcome users who register accounts
+@@ -139,12 +139,15 @@ authentication = "internal_plain"
  -- Logging configuration
  -- For advanced logging see http://prosody.im/doc/logging
  log = {
diff --git a/chat/prosody/patches/patch-prosodyctl b/chat/prosody/patches/patch-prosodyctl
new file mode 100644
index 00000000000..430f4e4f50a
--- /dev/null
+++ b/chat/prosody/patches/patch-prosodyctl
@@ -0,0 +1,14 @@
+$NetBSD: patch-prosodyctl,v 1.1 2013/09/13 14:37:49 fhajny Exp $
+
+Fix Lua code.
+--- prosodyctl.orig	2013-09-09 10:32:23.000000000 +0000
++++ prosodyctl
+@@ -243,7 +243,7 @@ end
+ local modulemanager = require "core.modulemanager"
+ 
+ local prosodyctl = require "util.prosodyctl"
+-require "socket"
++local socket = require "socket"
+ -----------------------
+ 
+  -- FIXME: Duplicate code waiting for util.startup