Re: [UPDATE] net/prosody 0.7.0 - 0.8.2
On Wed, Jan 25, 2012 at 10:47:44AM +0100, viq wrote: Ping? It's a nice little server and I would like to get it in before the upcoming lock... -- viq pgpcuKD07Nq0q.pgp Description: PGP signature
Re: [UPDATE] net/prosody 0.7.0 - 0.8.2
Ping? -- viq pgpmOMmaxIUIi.pgp Description: PGP signature
Re: [UPDATE] net/prosody 0.7.0 - 0.8.2
On 2012/01/22 08:35, Antoine Jacoutot wrote:
- 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
+ # ${SYSCONFDIR}/rc.d/prosody start
rc.d is always under /etc; whatever value SYSCONFDIR has.
...*not* whatever value SYSCONFDIR has. :)
Files owned by the OS are always /etc
Files owned by ports are always SYSCONFDIR
Re: [UPDATE] net/prosody 0.7.0 - 0.8.2
On Sun, Jan 22, 2012 at 11:45:41AM +, Stuart Henderson wrote:
On 2012/01/22 08:35, Antoine Jacoutot wrote:
- 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
+ # ${SYSCONFDIR}/rc.d/prosody start
rc.d is always under /etc; whatever value SYSCONFDIR has.
...*not* whatever value SYSCONFDIR has. :)
Well rc.d is owned by the OS so it will always be under /etc
Files owned by the OS are always /etc
Files owned by ports are always SYSCONFDIR
--
Antoine
Re: [UPDATE] net/prosody 0.7.0 - 0.8.2
Like so?
--
viq
Index: Makefile
===
RCS file: /cvs/ports/net/prosody/Makefile,v
retrieving revision 1.14
diff -u -d -r1.14 Makefile
--- Makefile1 Aug 2011 02:13:45 - 1.14
+++ Makefile22 Jan 2012 13:19:30 -
@@ -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
--- distinfo25 Jul 2010 23:42:25 - 1.4
+++ distinfo22 Jan 2012 13:19:30 -
@@ -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 -
+++ patches/patch-prosody 22 Jan 2012 13:19:30 -
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- prosody.orig Sun Nov 6 13:34:13 2011
prosodySun 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 - 1.2
+++ patches/patch-prosody_cfg_lua_dist 22 Jan 2012 13:19:30 -
@@ -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
Re: [UPDATE] net/prosody 0.7.0 - 0.8.2
On Sun, Jan 22, 2012 at 02:20:45PM +0100, viq wrote:
Like so?
Yes this looks better.
--
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 - 1.14
+++ Makefile 22 Jan 2012 13:19:30 -
@@ -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 - 1.4
+++ distinfo 22 Jan 2012 13:19:30 -
@@ -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 -
+++ patches/patch-prosody 22 Jan 2012 13:19:30 -
@@ -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_dist26 Jul 2010 18:11:42 -
1.2
+++ patches/patch-prosody_cfg_lua_dist22 Jan 2012 13:19:30 -
@@ -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.origSat 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.origTue 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;
++
Re: [UPDATE] net/prosody 0.7.0 - 0.8.2
Changed to TRUEPREFIX, stuff @sample'd, attempt at updating README.
Comments? (apply with -E)
--
viq
Index: Makefile
===
RCS file: /cvs/ports/net/prosody/Makefile,v
retrieving revision 1.14
diff -u -d -r1.14 Makefile
--- Makefile1 Aug 2011 02:13:45 - 1.14
+++ Makefile22 Jan 2012 01:33:14 -
@@ -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
--- distinfo25 Jul 2010 23:42:25 - 1.4
+++ distinfo22 Jan 2012 01:33:14 -
@@ -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 -
+++ patches/patch-prosody 22 Jan 2012 01:33:14 -
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- prosody.orig Sun Nov 6 13:34:13 2011
prosodySun 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 - 1.2
+++ patches/patch-prosody_cfg_lua_dist 22 Jan 2012 01:33:14 -
@@ -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
Re: [UPDATE] net/prosody 0.7.0 - 0.8.2
On Sun, Jan 22, 2012 at 02:35:26AM +0100, viq wrote:
Changed to TRUEPREFIX, stuff @sample'd, attempt at updating README.
Comments? (apply with -E)
Comments inline.
--
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 - 1.14
+++ Makefile 22 Jan 2012 01:33:14 -
@@ -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 - 1.4
+++ distinfo 22 Jan 2012 01:33:14 -
@@ -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 -
+++ patches/patch-prosody 22 Jan 2012 01:33:14 -
@@ -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_dist26 Jul 2010 18:11:42 -
1.2
+++ patches/patch-prosody_cfg_lua_dist22 Jan 2012 01:33:14 -
@@ -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.origSat 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.origTue 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;
Re: [UPDATE] net/prosody 0.7.0 - 0.8.2
On Mon, Dec 19, 2011 at 12:06:16AM +0100, viq wrote:
This updates prosody to the current version 0.8.2 and adds rc script.
README needs to be updated to reflect using it with rc script, but I was
at a loss on how to phrase it for now. Could use more testing and eyes, but
it works for me for quite a while now on i386.
Looks fine, though I have some comments inlined.
Apply with -E as patches were removed.
--
viq
? TODO
? UPDATE
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 - 1.14
+++ Makefile 18 Dec 2011 23:02:29 -
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2011/08/01 02:13:45 jolan Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/19 22:31:37 espie Exp $
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 - 1.4
+++ distinfo 18 Dec 2011 23:02:29 -
@@ -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 -
+++ patches/patch-prosody 18 Dec 2011 23:02:29 -
@@ -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
++#!${PREFIX}/bin/lua
Shouldn't this be TRUEPREFIX?
Index: patches/patch-prosodyctl
===
RCS file: patches/patch-prosodyctl
diff -N patches/patch-prosodyctl
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-prosodyctl 18 Dec 2011 23:02:29 -
@@ -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
++#!${PREFIX}/bin/lua
+ -- Prosody IM
+ -- Copyright (C) 2008-2010 Matthew Wild
+ -- Copyright (C) 2008-2010 Waqas Hussain
Idem.
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 - 1.5
+++ pkg/PLIST 18 Dec 2011 23:02:29 -
@@ -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
