f4a64e57d6
From the changelog:
v0.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
* Bugfix: Two vulnerabilities in mysql module
* Bugfix: send code=110 when needed according to XEP-0045
* Bugfix: Fix crash when changing roles (M. Doliner)
* 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: Minors memleak fixed by M. Doliner (#11300 and #10862)
* 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 (#12592, patch by Garrett Kuchta)
* Bugfix: Fix a segfault with badly formed packets
* Bugfix: Corrected a bug which allowed to have html in nickname in
the logs (A. Verrier)
28 lines
1.4 KiB
Text
28 lines
1.4 KiB
Text
$NetBSD: patch-aa,v 1.2 2009/04/27 01:53:29 schnoebe Exp $
|
|
|
|
--- Makefile.orig 2007-07-16 17:05:44.000000000 -0500
|
|
+++ Makefile
|
|
@@ -1,7 +1,12 @@
|
|
CC:=gcc
|
|
-CFLAGS:=$(CFLAGS) -O2 -Wall -I../../lib -I../include `pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT -DLIBIDN
|
|
+
|
|
+# MYSQL_CFLAGS:= -DHAVE_MYSQL
|
|
+# MYSQL_LIBS:=$(shell mysql_config --libs)
|
|
+# MYSQL_OBJS:= mysql.o
|
|
+
|
|
+CFLAGS:=$(CFLAGS) -O2 -Wall -I../../lib -I../include `pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT -DLIBIDN $(MYSQL_CFLAGS)
|
|
#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_LIBS)
|
|
#LIBS:=$(LIBS) -ljcomp -lm `pkg-config --libs glib-2.0` `pkg-config --libs gthread-2.0` -lexpat -lidn `mysql_config --libs`
|
|
LDFLAGS:=-L.
|
|
|
|
@@ -11,7 +16,7 @@ LDFLAGS:=-L.
|
|
#LIBS:=$(LIBS) -lmemusage
|
|
#LIBS:=$(LIBS) -lmcheck
|
|
|
|
-conference_OBJECTS=libjcomp.a conference.o conference_room.o conference_user.o utils.o xdata.o admin.o roles.o xdb.o hash.o iq.o main.o mysql.o
|
|
+conference_OBJECTS=libjcomp.a conference.o conference_room.o conference_user.o utils.o xdata.o admin.o roles.o xdb.o hash.o iq.o main.o $(MYSQL_OBJS)
|
|
|
|
all: mu-conference
|
|
|