Changes 0.8:

* Optimization: A bunch of patches by M. Doliner (see svn log for more details)
* Feature: Allow the service admin to see the occupants of every rooms
* Feature: Allow the service admin to enter a room with nicknames locked even
  if his nickname isn't the one needed
* Feature: option to disable room logging on the whole component
* Feature: option to save room log files in subdirectories according to date
* Feature: Patch by Smoku to hide empty rooms from disco/browse lists
* Bugfix: Two vulnerabilities in mysql module
* Bugfix: send code=110 when needed according to XEP-0045
* Bugfix: Fix crash when changing roles
* Bugfix: Fixed a bug when entering/leaving a room, it was considered as a nick
  change
* Bugfix: Corrected the errors sent by mu-conference
* Bugfix: Better error code when choosing a nick not conform with the room
  policy
* Bugfix: Fixed a segfault in the decline messages handler
* Bugfix: Avoid a segfault when asking unique room name with a too big user jid
* Bugfix: going in an infinite loop if the user invite the jid ""
* Bugfix: Changed error handling
  - Don't kick a user if the message error is not delivery-related,
    otherwise user could be kicked when refusing a file transfer for example
  - If the user is not kicked, don't discard the error, send it to the
    other user/chatroom
* Bugfix: Hide XEP-0203 delay nodes when sending back presences stanzas

5 files changed, 36 insertions, 81 deletions

diff --git a/chat/mu-conference/patches/patch-aa b/chat/mu-conference/patches/patch-aa
deleted file mode 100644
index 782e5763496..00000000000
--- a/chat/mu-conference/patches/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/07/22 18:02:10 kristerw Exp $
-
---- src/main.c.orig	Thu Jul 22 19:54:54 2004
-+++ src/main.c	Thu Jul 22 19:55:36 2004
-@@ -34,12 +34,12 @@
-   struct stat st;
-   char *config_file = NULL;
-   pool p;
--  jcr = (jcr_instance)malloc(sizeof(_jcr_instance));
- 
-   GThread       *dthread; /* the packet delivery thread */
-   GMainLoop     *gmain;   /* the receive packet event loop */
- 
- 
-+  jcr = (jcr_instance)malloc(sizeof(_jcr_instance));
-   fprintf(stderr, "%s -- %s\n%s\n\n", _JCOMP_NAME, _JCOMP_VERS, _JCOMP_COPY);
- 
-   while ((c = getopt(argc, argv, "Bsd:c:")) != EOF)
-@@ -119,6 +119,7 @@
- 
- 
-   if (inBackground == 1) {
-+    int fdlimit, fd;
-     if ((pid = fork()) == -1) {
-       fprintf(stderr, "%s: Could not start in background\n", JDBG);
-       exit(1);
-@@ -128,8 +129,8 @@
- 
-     /* in child process .... process and terminal housekeeping */
-     setsid();
--    int fdlimit = sysconf(_SC_OPEN_MAX);
--    int fd = 0;
-+    fdlimit = sysconf(_SC_OPEN_MAX);
-+    fd = 0;
-     while (fd < fdlimit)
-       close(fd++);
-     open("/dev/null",O_RDWR);
diff --git a/chat/mu-conference/patches/patch-ab b/chat/mu-conference/patches/patch-ab
deleted file mode 100644
index 17e1de2c385..00000000000
--- a/chat/mu-conference/patches/patch-ab
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/07/22 18:02:10 kristerw Exp $
-
---- jcomp/jcr_elements.c.orig	Thu Jul 22 19:49:51 2004
-+++ jcomp/jcr_elements.c	Thu Jul 22 19:51:32 2004
-@@ -32,6 +32,8 @@
-     if (strncasecmp(name, "stream:stream", 13) == 0) {
-       char *pass = xmlnode_get_data(xmlnode_get_tag(jcr->config,"secret"));
-       int i = 0;
-+      char hashbuf[41];
-+      xmlnode cur;
-       if (attrib == NULL) return;
-       while (attrib[i] != '\0') {
-         if (strncasecmp(attrib[i], "id", 2) == 0)
-@@ -39,12 +41,11 @@
-         i += 2;
-       }
-       p = pool_new();
--      char hashbuf[41];
-       //    log_debug(JDBG, "%s = '%s'", attrib[i], attrib[i+1]);
-       shahash_r(spools(p, attrib[i + 1], pass, p), hashbuf);
- 
-       /* Build a handshake packet */
--      xmlnode cur = xmlnode_new_tag("handshake");
-+      cur = xmlnode_new_tag("handshake");
-       xmlnode_insert_cdata(cur, hashbuf, -1);
- 
-       /* Transmit handshake */
-@@ -91,6 +92,7 @@
-     if (jcr->current == NULL) {
-       g_io_channel_close(jcr->gio);
-     } else {
-+      xmlnode parent;
-       if (strncasecmp(name, "stream:error", 12) == 0) {
-         log_warn(JDBG, "%s", xmlnode2str(jcr->current));
-         g_io_channel_write_chars(jcr->gio, "</stream:stream>", 15, &bytes, NULL);
-@@ -100,7 +102,7 @@
-         break;
-       }
- 
--      xmlnode parent = xmlnode_get_parent(jcr->current);
-+      parent = xmlnode_get_parent(jcr->current);
-       if (parent == NULL) {
-         x = xmlnode_dup(jcr->current);
-         to = jid_new(x->p, xmlnode_get_attrib(x, "to"));
diff --git a/chat/mu-conference/patches/patch-src_Makefile b/chat/mu-conference/patches/patch-src_Makefile
new file mode 100644
index 00000000000..dd0e246c4a6
--- /dev/null
+++ b/chat/mu-conference/patches/patch-src_Makefile
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_Makefile,v 1.1 2011/02/04 12:05:45 adam Exp $
+
+--- src/Makefile.orig	2011-02-04 09:37:28.000000000 +0000
++++ src/Makefile
+@@ -1,9 +1,8 @@
+-CC:=gcc
+-CFLAGS:=$(CFLAGS) -O2 -Wall -I../../lib -I../include `pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT -DLIBIDN
++CFLAGS:=$(CFLAGS) -Wall -I../../lib -I../include `pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT -DLIBIDN
+ #CFLAGS:=$(CFLAGS) -O2 -Wall -I../../lib -I../include `pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT -DLIBIDN -DHAVE_MYSQL
+ LIBS:=$(LIBS) -ljcomp -lm `pkg-config --libs glib-2.0` `pkg-config --libs gthread-2.0` -lexpat -lidn
+ #LIBS:=$(LIBS) -ljcomp -lm `pkg-config --libs glib-2.0` `pkg-config --libs gthread-2.0` -lexpat -lidn `mysql_config --libs`
+-LDFLAGS:=-L.
++LDFLAGS:=-L. $(LDFLAGS)
+ 
+ # Debug/Experimental
+ #CFLAGS:=$(CFLAGS) -pipe -Os -I../../jabberd -I../include 
diff --git a/chat/mu-conference/patches/patch-src_jabberd_Makefile b/chat/mu-conference/patches/patch-src_jabberd_Makefile
new file mode 100644
index 00000000000..b56fbceab73
--- /dev/null
+++ b/chat/mu-conference/patches/patch-src_jabberd_Makefile
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_jabberd_Makefile,v 1.1 2011/02/04 12:05:45 adam Exp $
+
+--- src/jabberd/Makefile.orig	2011-02-04 09:39:00.000000000 +0000
++++ src/jabberd/Makefile
+@@ -1,6 +1,5 @@
+ 
+-CC=gcc
+-CFLAGS:=$(CFLAGS) -O2 -Wall -I. -I../../include `pkg-config --cflags glib-2.0` -D_REENTRANT -DLIBIDN
++CFLAGS:=$(CFLAGS) -Wall -I. -I../../include `pkg-config --cflags glib-2.0` -D_REENTRANT -DLIBIDN
+ LIBS=
+ 
+ JCOMP_LIB_OBJECTS=expat.o \
diff --git a/chat/mu-conference/patches/patch-src_jcomp_Makefile b/chat/mu-conference/patches/patch-src_jcomp_Makefile
new file mode 100644
index 00000000000..121fceb8f05
--- /dev/null
+++ b/chat/mu-conference/patches/patch-src_jcomp_Makefile
@@ -0,0 +1,8 @@
+$NetBSD: patch-src_jcomp_Makefile,v 1.1 2011/02/04 12:05:45 adam Exp $
+
+--- src/jcomp/Makefile.orig	2011-02-04 09:44:51.000000000 +0000
++++ src/jcomp/Makefile	2011-02-04 09:45:02.000000000 +0000
+@@ -3,2 +3 @@
+-CC=gcc
+-CFLAGS:=$(CFLAGS) -O2 -Wall -I../../include -I. `pkg-config --cflags glib-2.0` -D_REENTRANT
++CFLAGS:=$(CFLAGS) -Wall -I../../include -I. `pkg-config --cflags glib-2.0` -D_REENTRANT