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

3 files changed, 41 insertions, 23 deletions

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