Import prosody-0.7.0 as chat/prosody.

Prosody is a flexible communications server for Jabber/XMPP written in Lua.
It aims to be easy to use, and light on resources. For developers it aims
to be easy to extend and give a flexible system on which to rapidly develop
added functionality, or prototype new protocols.

(Based on wip/prosody.)

4 files changed, 147 insertions, 0 deletions

diff --git a/chat/prosody/patches/patch-aa b/chat/prosody/patches/patch-aa
new file mode 100644
index 00000000000..652d5a178a3
--- /dev/null
+++ b/chat/prosody/patches/patch-aa
@@ -0,0 +1,71 @@
+$NetBSD: patch-aa,v 1.1.1.1 2010/09/21 11:01:22 fhajny Exp $
+
+Fix installation directories and scripts
+--- Makefile.orig	2010-06-13 00:23:01.000000000 +0000
++++ Makefile
+@@ -3,10 +3,11 @@ include config.unix
+ 
+ BIN = $(DESTDIR)$(PREFIX)/bin
+ CONFIG = $(DESTDIR)$(SYSCONFDIR)
++EGDIR = $(DESTDIR)@EGDIR@
+ MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
+ SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
+ DATA = $(DESTDIR)$(DATADIR)
+-MAN = $(DESTDIR)$(PREFIX)/share/man
++MAN = $(DESTDIR)$(PREFIX)/man
+ 
+ INSTALLEDSOURCE = $(PREFIX)/lib/prosody
+ INSTALLEDCONFIG = $(SYSCONFDIR)
+@@ -17,27 +18,31 @@ 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
+-	install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
+-	install -m750 -d $(DATA)
+-	install -d $(MAN)/man1
+-	install -d $(CONFIG)/certs
+-	install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
+-	install -m755 ./prosody.install $(BIN)/prosody
+-	install -m755 ./prosodyctl.install $(BIN)/prosodyctl
+-	install -m644 core/* $(SOURCE)/core
+-	install -m644 net/* $(SOURCE)/net
+-	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
+-	install -m644 certs/* $(CONFIG)/certs
+-	install -m644 plugins/*.lua $(MODULES)
+-	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)
++	$(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)/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) 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_DATA_DIR) $(MODULES)/muc
++	$(BSD_INSTALL_DATA) plugins/muc/* $(MODULES)/muc
++	$(BSD_INSTALL_DATA_DIR) $(EGDIR)/certs
++	$(BSD_INSTALL_DATA) certs/* $(EGDIR)/certs
++	$(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
+ 	$(MAKE) install -C util-src
+ 
+ clean:
diff --git a/chat/prosody/patches/patch-ab b/chat/prosody/patches/patch-ab
new file mode 100644
index 00000000000..dc72c8f1cb5
--- /dev/null
+++ b/chat/prosody/patches/patch-ab
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1.1.1 2010/09/21 11:01:22 fhajny Exp $
+
+Enable POSIX functionality by default
+--- prosody.cfg.lua.dist.orig	2010-06-13 00:23:02.000000000 +0000
++++ prosody.cfg.lua.dist
+@@ -54,7 +54,7 @@ modules_enabled = {
+ 		"register"; -- Allow users to register on this server using a client and change passwords
+ 
+ 	-- Other specific functionality
+-		--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
++		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+ 		--"console"; -- Opens admin telnet interface on localhost port 5582
+ 		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
+ 		--"httpserver"; -- Serve static files from a directory over HTTP
+@@ -90,9 +90,12 @@ ssl = {
+ 
+ -- Logging configuration
+ -- For advanced logging see http://prosody.im/doc/logging
+-log = "prosody.log";
++log = "@PROSODY_LOG@/prosody.log";
+ debug = false; -- Log debug messages?
+ 
++-- Enable PID file by default
++pidfile = "@PROSODY_RUN@/prosody.pid";
++
+ ----------- Virtual hosts -----------
+ -- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
+ -- Settings under each VirtualHost entry apply *only* to that host.
diff --git a/chat/prosody/patches/patch-ac b/chat/prosody/patches/patch-ac
new file mode 100644
index 00000000000..418e293bb97
--- /dev/null
+++ b/chat/prosody/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1.1.1 2010/09/21 11:01:22 fhajny Exp $
+
+Add runtime search path to linking phase
+--- util-src/Makefile.orig	2010-06-13 00:23:02.000000000 +0000
++++ util-src/Makefile
+@@ -16,7 +16,7 @@ LD?=gcc
+ 
+ .o.so:
+ 	MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
+-	$(LD) $(LDFLAGS) -o $@ $< -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lidn -lcrypto
++	$(LD) $(LDFLAGS) -o $@ $< -L$(LUA_LIBDIR) -R$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lidn -lcrypto
+ 
+ all: encodings.so hashes.so pposix.so signal.so
+ 
diff --git a/chat/prosody/patches/patch-ad b/chat/prosody/patches/patch-ad
new file mode 100644
index 00000000000..6edb799d362
--- /dev/null
+++ b/chat/prosody/patches/patch-ad
@@ -0,0 +1,34 @@
+$NetBSD: patch-ad,v 1.1.1.1 2010/09/21 11:01:22 fhajny Exp $
+
+Fix POSIX logic for BSD systems
+--- util-src/signal.c.orig	2010-06-13 00:23:02.000000000 +0000
++++ util-src/signal.c
+@@ -29,6 +29,10 @@
+ #include <signal.h>
+ #include <stdlib.h>
+ 
++#ifdef __unix__
++#include <sys/param.h>
++#endif
++
+ #include "lua.h"
+ #include "lauxlib.h"
+ 
+@@ -326,7 +330,7 @@ static int l_raise(lua_State *L)
+   return 1;
+ }
+ 
+-#if defined _POSIX_SOURCE || (defined(sun) || defined(__sun))
++#ifdef __unix__
+ 
+ /* define some posix only functions */
+ 
+@@ -373,7 +377,7 @@ static int l_kill(lua_State *L)
+ static const struct luaL_Reg lsignal_lib[] = {
+   {"signal", l_signal},
+   {"raise", l_raise},
+-#if defined _POSIX_SOURCE || (defined(sun) || defined(__sun))
++#ifdef __unix__
+   {"kill", l_kill},
+ #endif
+   {NULL, NULL}