From 568e56598c7d5d6b19cd06ce0a4b92dba6518a0b Mon Sep 17 00:00:00 2001
From: fhajny <fhajny>
Date: Tue, 21 Sep 2010 11:01:22 +0000
Subject: 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.)
---
 chat/prosody/DESCR            |   4 ++
 chat/prosody/Makefile         |  77 +++++++++++++++++++++++++++++++
 chat/prosody/PLIST            | 102 ++++++++++++++++++++++++++++++++++++++++++
 chat/prosody/distinfo         |   9 ++++
 chat/prosody/patches/patch-aa |  71 +++++++++++++++++++++++++++++
 chat/prosody/patches/patch-ab |  28 ++++++++++++
 chat/prosody/patches/patch-ac |  14 ++++++
 chat/prosody/patches/patch-ad |  34 ++++++++++++++
 8 files changed, 339 insertions(+)
 create mode 100644 chat/prosody/DESCR
 create mode 100644 chat/prosody/Makefile
 create mode 100644 chat/prosody/PLIST
 create mode 100644 chat/prosody/distinfo
 create mode 100644 chat/prosody/patches/patch-aa
 create mode 100644 chat/prosody/patches/patch-ab
 create mode 100644 chat/prosody/patches/patch-ac
 create mode 100644 chat/prosody/patches/patch-ad

(limited to 'chat')

diff --git a/chat/prosody/DESCR b/chat/prosody/DESCR
new file mode 100644
index 00000000000..66ae434a177
--- /dev/null
+++ b/chat/prosody/DESCR
@@ -0,0 +1,4 @@
+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.
diff --git a/chat/prosody/Makefile b/chat/prosody/Makefile
new file mode 100644
index 00000000000..92edbcc41b1
--- /dev/null
+++ b/chat/prosody/Makefile
@@ -0,0 +1,77 @@
+# $NetBSD: Makefile,v 1.1.1.1 2010/09/21 11:01:22 fhajny Exp $
+#
+
+DISTNAME=		prosody-0.7.0
+CATEGORIES=		chat
+MASTER_SITES=		http://prosody.im/downloads/source/
+
+MAINTAINER=		filip@joyent.com
+HOMEPAGE=		http://prosody.im/
+COMMENT=		Flexible communications server for Jabber/XMPP written in Lua
+LICENSE=		mit
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+DEPENDS+=		lua-filesystem>=1.0:../../devel/lua-filesystem
+DEPENDS+=		lua-expat>=1.1:../../textproc/lua-expat
+DEPENDS+=		lua-sec>=0.3.3:../../security/lua-sec
+DEPENDS+=		lua-socket>=2.0:../../net/lua-socket
+
+HAS_CONFIGURE=		yes
+USE_TOOLS+=		gmake
+BUILD_DEFS+=		VARBASE
+
+.include "../../mk/bsd.prefs.mk"
+
+PROSODY_USER?=		prosody
+PROSODY_GROUP?=		${PROSODY_USER}
+PROSODY_DATA?=		${VARBASE}/db/prosody
+PROSODY_LOG?=		${VARBASE}/log/prosody
+PROSODY_RUN?=		${VARBASE}/run/prosody
+
+OWN_DIRS+=		${PROSODY_DATA} ${PROSODY_LOG} ${PROSODY_RUN}
+OWN_DIRS_PERMS+=	${PROSODY_DATA} ${PROSODY_USER} ${PROSODY_GROUP} 0770
+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_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}=	${SH}
+
+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.key ${PKG_SYSCONFDIR}/certs/localhost.key
+
+REPLACE_INTERPRETER+=	lua
+REPLACE.lua.old=	/usr/bin/env lua
+REPLACE.lua.new=	${PREFIX}/bin/lua
+REPLACE_FILES.lua=	prosody prosodyctl
+
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--datadir=${PROSODY_DATA}
+
+SUBST_CLASSES+=		eg
+SUBST_MESSAGE.eg=	Fixing examples/configuration directories
+SUBST_STAGE.eg=		post-patch
+SUBST_FILES.eg=		Makefile man/prosodyctl.man
+SUBST_SED.eg=		-e 's,@EGDIR@,${EGDIR},g'
+SUBST_SED.eg+=		-e 's,/etc/prosody,${PKG_SYSCONFDIR},g'
+
+SUBST_CLASSES+=		config
+SUBST_MESSAGE.config=	Configure POSIX functionality
+SUBST_STAGE.config=	pre-configure
+SUBST_FILES.config=	prosody.cfg.lua.dist
+SUBST_SED.config=	-e 's,@PROSODY_DATA@,${PROSODY_DATA},'
+SUBST_SED.config+=	-e 's,@PROSODY_LOG@,${PROSODY_LOG},'
+SUBST_SED.config+=	-e 's,@PROSODY_RUN@,${PROSODY_RUN},'
+
+.include "../../devel/libidn/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/chat/prosody/PLIST b/chat/prosody/PLIST
new file mode 100644
index 00000000000..9b57f7303c1
--- /dev/null
+++ b/chat/prosody/PLIST
@@ -0,0 +1,102 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2010/09/21 11:01:22 fhajny Exp $
+bin/prosody
+bin/prosodyctl
+lib/prosody/core/certmanager.lua
+lib/prosody/core/componentmanager.lua
+lib/prosody/core/configmanager.lua
+lib/prosody/core/eventmanager.lua
+lib/prosody/core/hostmanager.lua
+lib/prosody/core/loggingmanager.lua
+lib/prosody/core/modulemanager.lua
+lib/prosody/core/offlinemanager.lua
+lib/prosody/core/rostermanager.lua
+lib/prosody/core/s2smanager.lua
+lib/prosody/core/sessionmanager.lua
+lib/prosody/core/stanza_router.lua
+lib/prosody/core/usermanager.lua
+lib/prosody/core/xmlhandlers.lua
+lib/prosody/modules/mod_announce.lua
+lib/prosody/modules/mod_bosh.lua
+lib/prosody/modules/mod_component.lua
+lib/prosody/modules/mod_compression.lua
+lib/prosody/modules/mod_console.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_iq.lua
+lib/prosody/modules/mod_lastactivity.lua
+lib/prosody/modules/mod_legacyauth.lua
+lib/prosody/modules/mod_message.lua
+lib/prosody/modules/mod_pep.lua
+lib/prosody/modules/mod_ping.lua
+lib/prosody/modules/mod_posix.lua
+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_register.lua
+lib/prosody/modules/mod_roster.lua
+lib/prosody/modules/mod_saslauth.lua
+lib/prosody/modules/mod_time.lua
+lib/prosody/modules/mod_tls.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_welcome.lua
+lib/prosody/modules/muc/mod_muc.lua
+lib/prosody/modules/muc/muc.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/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/array.lua
+lib/prosody/util/broadcast.lua
+lib/prosody/util/dataforms.lua
+lib/prosody/util/datamanager.lua
+lib/prosody/util/datetime.lua
+lib/prosody/util/dependencies.lua
+lib/prosody/util/encodings.so
+lib/prosody/util/events.lua
+lib/prosody/util/hashes.so
+lib/prosody/util/helpers.lua
+lib/prosody/util/hmac.lua
+lib/prosody/util/import.lua
+lib/prosody/util/iterators.lua
+lib/prosody/util/jid.lua
+lib/prosody/util/logger.lua
+lib/prosody/util/multitable.lua
+lib/prosody/util/pluginloader.lua
+lib/prosody/util/pposix.so
+lib/prosody/util/prosodyctl.lua
+lib/prosody/util/sasl.lua
+lib/prosody/util/sasl/anonymous.lua
+lib/prosody/util/sasl/digest-md5.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/set.lua
+lib/prosody/util/signal.so
+lib/prosody/util/stanza.lua
+lib/prosody/util/termcolours.lua
+lib/prosody/util/timer.lua
+lib/prosody/util/uuid.lua
+lib/prosody/util/xmlrpc.lua
+lib/prosody/util/ztact.lua
+man/man1/prosodyctl.1
+share/examples/prosody/certs/localhost.cert
+share/examples/prosody/certs/localhost.key
+share/examples/prosody/prosody.cfg.lua
diff --git a/chat/prosody/distinfo b/chat/prosody/distinfo
new file mode 100644
index 00000000000..9f5333240b0
--- /dev/null
+++ b/chat/prosody/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2010/09/21 11:01:22 fhajny Exp $
+
+SHA1 (prosody-0.7.0.tar.gz) = 3f3a6c4f262a062a9c027cc843cd6827104fb8ba
+RMD160 (prosody-0.7.0.tar.gz) = 2e40b4f807b6120971c611f52d4df3264a82cbb9
+Size (prosody-0.7.0.tar.gz) = 177412 bytes
+SHA1 (patch-aa) = 5bb7fb62cc367e075b4213b7cc85661fece0cf23
+SHA1 (patch-ab) = 687ee0ad43074c36c0f1a7fa7bb3cd4575fcae54
+SHA1 (patch-ac) = 3463fffe6884326a8f39f22216f9c94f35ad5cd7
+SHA1 (patch-ad) = d0fc4133bc2027c5f5b3a690bfca4c76a70f48fc
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}
-- 
cgit v1.2.3