Like so? -- viq Index: Makefile =================================================================== RCS file: /cvs/ports/net/prosody/Makefile,v retrieving revision 1.14 diff -u -d -r1.14 Makefile --- Makefile 1 Aug 2011 02:13:45 -0000 1.14 +++ Makefile 22 Jan 2012 13:19:30 -0000 @@ -3,8 +3,7 @@ SHARED_ONLY= Yes COMMENT= communications server for Jabber/XMPP written in Lua -DISTNAME= prosody-0.7.0 -REVISION= 5 +DISTNAME= prosody-0.8.2 CATEGORIES= net MASTER_SITES= http://prosody.im/downloads/source/ @@ -35,9 +34,13 @@ --with-lua="${LOCALBASE}" \ --c-compiler="${CC}" \ --linker="${CC}" \ + --ldflags="-I/usr/include -I${LOCALBASE}/include -L/usr/lib -L${LOCALBASE}/lib -shared" \ --cflags="${CFLAGS} -fPIC" FAKE_FLAGS+= CONFIG=${DESTDIR}${PREFIX}/share/examples/prosody + +pre-configure: + ${SUBST_CMD} ${WRKSRC}/prosody ${WRKSRC}/prosodyctl post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/prosody Index: distinfo =================================================================== RCS file: /cvs/ports/net/prosody/distinfo,v retrieving revision 1.4 diff -u -d -r1.4 distinfo --- distinfo 25 Jul 2010 23:42:25 -0000 1.4 +++ distinfo 22 Jan 2012 13:19:30 -0000 @@ -1,5 +1,5 @@ -MD5 (prosody-0.7.0.tar.gz) = ac1PTonb72aKYkDN5Bne3w== -RMD160 (prosody-0.7.0.tar.gz) = LkC0+Ae2EglxxhH1LU3zJkqCy7k= -SHA1 (prosody-0.7.0.tar.gz) = PzpsTyYqBiqcAnzIQ81oJxBPuLo= -SHA256 (prosody-0.7.0.tar.gz) = qLgmgF3VUoJwbFaDwgKImbNyHrD4TT41wFCabBvDI5A= -SIZE (prosody-0.7.0.tar.gz) = 177412 +MD5 (prosody-0.8.2.tar.gz) = bpB78NCs8k8QEQgwILpv+w== +RMD160 (prosody-0.8.2.tar.gz) = kIoE9dqnczxmq08J/VT7Uhdctww= +SHA1 (prosody-0.8.2.tar.gz) = oCnE5p9tqvMyAGHmnJ+GOQ1+hFo= +SHA256 (prosody-0.8.2.tar.gz) = 0DFRUPhIf8lgrfVs4FeYVChnmXX5xvP89CSDLSTqrmA= +SIZE (prosody-0.8.2.tar.gz) = 212170 Index: patches/patch-prosody =================================================================== RCS file: patches/patch-prosody diff -N patches/patch-prosody --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-prosody 22 Jan 2012 13:19:30 -0000 @@ -0,0 +1,9 @@ +$OpenBSD$ +--- prosody.orig Sun Nov 6 13:34:13 2011 ++++ prosody Sun Nov 6 13:37:36 2011 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env lua ++#!${TRUEPREFIX}/bin/lua + -- Prosody IM + -- Copyright (C) 2008-2010 Matthew Wild + -- Copyright (C) 2008-2010 Waqas Hussain Index: patches/patch-prosody_cfg_lua_dist =================================================================== RCS file: /cvs/ports/net/prosody/patches/patch-prosody_cfg_lua_dist,v retrieving revision 1.2 diff -u -d -r1.2 patch-prosody_cfg_lua_dist --- patches/patch-prosody_cfg_lua_dist 26 Jul 2010 18:11:42 -0000 1.2 +++ patches/patch-prosody_cfg_lua_dist 22 Jan 2012 13:19:30 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-prosody_cfg_lua_dist,v 1.2 2010/07/26 18:11:42 jolan Exp $ ---- prosody.cfg.lua.dist.orig Sat Jun 12 19:23:02 2010 -+++ prosody.cfg.lua.dist Mon Jul 26 12:56:05 2010 -@@ -22,8 +22,18 @@ +--- prosody.cfg.lua.dist.orig Tue May 3 19:18:54 2011 ++++ prosody.cfg.lua.dist Tue May 3 19:23:01 2011 +@@ -22,6 +22,14 @@ -- Example: admins = { "us...@example.com", "us...@example.net" } admins = { } @@ -15,26 +15,24 @@ + -- Enable use of libevent for better performance under high load -- For more information see: http://prosody.im/doc/libevent -+ -+--XXX libevent + daemonize don't work together for some reason --use_libevent = true; - - -- This is the list of modules Prosody will load on startup. -@@ -54,7 +64,7 @@ modules_enabled = { - "register"; -- Allow users to register on this server using a client and change passwords +@@ -59,7 +67,7 @@ modules_enabled = { + --"admin_telnet"; -- Opens telnet console interface on localhost port 5582 -- 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,7 +100,7 @@ ssl = { - + --"groups"; -- Shared roster support +@@ -123,8 +131,8 @@ authentication = "internal_plain" -- Logging configuration -- For advanced logging see http://prosody.im/doc/logging --log = "prosody.log"; -+log = "/var/prosody/prosody.log" - debug = false; -- Log debug messages? - - ----------- Virtual hosts ----------- + log = { +- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging +- error = "prosody.err"; ++ info = "/var/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging ++ error = "/var/prosody/prosody.err"; + -- "*syslog"; -- Uncomment this for logging to syslog + -- "*console"; -- Log to the console, useful for debugging with daemonize=false + } Index: patches/patch-prosodyctl =================================================================== RCS file: patches/patch-prosodyctl diff -N patches/patch-prosodyctl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-prosodyctl 22 Jan 2012 13:19:30 -0000 @@ -0,0 +1,9 @@ +$OpenBSD$ +--- prosodyctl.orig Sun Nov 6 13:34:05 2011 ++++ prosodyctl Sun Nov 6 13:37:23 2011 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env lua ++#!${TRUEPREFIX}/bin/lua + -- Prosody IM + -- Copyright (C) 2008-2010 Matthew Wild + -- Copyright (C) 2008-2010 Waqas Hussain Index: patches/patch-util-src_signal_c =================================================================== RCS file: patches/patch-util-src_signal_c diff -N patches/patch-util-src_signal_c --- patches/patch-util-src_signal_c 26 Jul 2010 18:11:42 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-util-src_signal_c,v 1.1 2010/07/26 18:11:42 jolan Exp $ ---- util-src/signal.c.orig Sat Jun 12 19:23:02 2010 -+++ util-src/signal.c Mon Jul 26 12:23:25 2010 -@@ -326,7 +326,7 @@ static int l_raise(lua_State *L) - return 1; - } - --#if defined _POSIX_SOURCE || (defined(sun) || defined(__sun)) -+#if defined _POSIX_SOURCE || (defined(sun) || defined(__sun)) || defined(__OpenBSD__) - - /* define some posix only functions */ - -@@ -373,7 +373,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)) -+#if defined _POSIX_SOURCE || (defined(sun) || defined(__sun)) || defined(__OpenBSD__) - {"kill", l_kill}, - #endif - {NULL, NULL} Index: patches/patch-util_prosodyctl_lua =================================================================== RCS file: /cvs/ports/net/prosody/patches/patch-util_prosodyctl_lua,v retrieving revision 1.1 diff -u -d -r1.1 patch-util_prosodyctl_lua --- patches/patch-util_prosodyctl_lua 26 Jul 2010 18:11:42 -0000 1.1 +++ patches/patch-util_prosodyctl_lua 22 Jan 2012 13:19:30 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-util_prosodyctl_lua,v 1.1 2010/07/26 18:11:42 jolan Exp $ ---- util/prosodyctl.lua.orig Sat Jun 12 19:23:02 2010 -+++ util/prosodyctl.lua Mon Jul 26 10:48:24 2010 -@@ -110,7 +110,7 @@ function start() +--- util/prosodyctl.lua.orig Tue May 3 19:43:53 2011 ++++ util/prosodyctl.lua Tue May 3 19:44:19 2011 +@@ -218,7 +218,7 @@ function start() if not CFG_SOURCEDIR then os.execute("./prosody"); else Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/prosody/pkg/PLIST,v retrieving revision 1.5 diff -u -d -r1.5 PLIST --- pkg/PLIST 10 Nov 2010 19:25:25 -0000 1.5 +++ pkg/PLIST 22 Jan 2012 13:19:30 -0000 @@ -5,25 +5,30 @@ lib/prosody/ lib/prosody/core/ 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/storagemanager.lua lib/prosody/core/usermanager.lua -lib/prosody/core/xmlhandlers.lua lib/prosody/modules/ +lib/prosody/modules/adhoc/ +lib/prosody/modules/adhoc/adhoc.lib.lua +lib/prosody/modules/adhoc/mod_adhoc.lua +lib/prosody/modules/mod_admin_adhoc.lua +lib/prosody/modules/mod_admin_telnet.lua lib/prosody/modules/mod_announce.lua +lib/prosody/modules/mod_auth_anonymous.lua +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_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 @@ -32,6 +37,8 @@ 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_offline.lua lib/prosody/modules/mod_pep.lua lib/prosody/modules/mod_ping.lua lib/prosody/modules/mod_posix.lua @@ -42,6 +49,8 @@ lib/prosody/modules/mod_register.lua lib/prosody/modules/mod_roster.lua lib/prosody/modules/mod_saslauth.lua +lib/prosody/modules/mod_storage_internal.lua +lib/prosody/modules/mod_storage_sql.lua lib/prosody/modules/mod_time.lua lib/prosody/modules/mod_tls.lua lib/prosody/modules/mod_uptime.lua @@ -71,16 +80,20 @@ lib/prosody/util/ 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/dependencies.lua lib/prosody/util/events.lua +lib/prosody/util/filters.lua lib/prosody/util/helpers.lua lib/prosody/util/hmac.lua +lib/prosody/util/httpstream.lua lib/prosody/util/import.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/pluginloader.lua @@ -95,11 +108,12 @@ lib/prosody/util/serialization.lua lib/prosody/util/set.lua lib/prosody/util/stanza.lua +lib/prosody/util/template.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 +lib/prosody/util/xmppstream.lua @man man/man1/prosodyctl.1 sbin/prosody sbin/prosodyctl @@ -110,10 +124,14 @@ @sample ${SYSCONFDIR}/prosody/ share/examples/prosody/certs/ @sample ${SYSCONFDIR}/prosody/certs/ +share/examples/prosody/certs/Makefile +@sample ${SYSCONFDIR}/prosody/certs/Makefile share/examples/prosody/certs/localhost.cert @sample ${SYSCONFDIR}/prosody/certs/localhost.cert share/examples/prosody/certs/localhost.key @sample ${SYSCONFDIR}/prosody/certs/localhost.key +share/examples/prosody/certs/openssl.cnf +@sample ${SYSCONFDIR}/prosody/certs/openssl.cnf share/examples/prosody/prosody.cfg.lua @sample ${SYSCONFDIR}/prosody/prosody.cfg.lua @mode 770 @@ -123,3 +141,7 @@ share/examples/prosody/prosody.log @mode 660 @sample /var/prosody/prosody.log +@owner +@group +@mode +@rcscript ${RCDIR}/prosody Index: pkg/README =================================================================== RCS file: /cvs/ports/net/prosody/pkg/README,v retrieving revision 1.3 diff -u -d -r1.3 README --- pkg/README 2 Jun 2011 13:41:40 -0000 1.3 +++ pkg/README 22 Jan 2012 13:19:30 -0000 @@ -16,11 +16,19 @@ to your liking. -2) Prosody uses privilege dropping. As such, you will need to initially - start prosody as root via prosodyctl: +2) Prosody includes an rc script for starting and stopping. You can + start it by running: - # ${PREFIX}/sbin/prosodyctl start + # /etc/rc.d/prosody start - You should now be able to start adding users: + You can have it start automatically on boot by adding prosody to your + pkg_scripts line in /etc/rc.conf.local - # ${PREFIX}/sbin/prosodyctl adduser usern...@domain.tld +3) Prosody comes with prosodyctl script for controlling the daemon. Run + it without parameters to get list of commands: + + # ${TRUEPREFIX}/sbin/prosodyctl + + For example, to add users you would use something like: + + # ${TRUEPREFIX}/sbin/prosodyctl adduser usern...@domain.tld Index: pkg/prosody.rc =================================================================== RCS file: pkg/prosody.rc diff -N pkg/prosody.rc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/prosody.rc 22 Jan 2012 13:19:30 -0000 @@ -0,0 +1,22 @@ +#!/bin/sh +# +# $OpenBSD$ + +daemon="${TRUEPREFIX}/sbin/prosodyctl" +daemon_user="_prosody" +daemon_flags="start" + +. /etc/rc.d/rc.subr + +rc_reload=NO + +rc_check() { + # return 1 is needed: prosodyctl returns a higher error code on failure + ${TRUEPREFIX}/sbin/prosodyctl status || return 1 +} + +rc_stop() { + ${TRUEPREFIX}/sbin/prosodyctl stop +} + +rc_cmd $1
pgpup556TrIho.pgp
Description: PGP signature
