packages: jabber-mu-conference/jabber-mu-conference-config.patch, jabber-mu...
hawk
hawk at pld-linux.org
Thu Nov 5 13:04:54 CET 2009
Author: hawk Date: Thu Nov 5 12:04:54 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- updated for 0.8
---- Files affected:
packages/jabber-mu-conference:
jabber-mu-conference-config.patch (1.4 -> 1.5) , jabber-mu-conference-drop_priv.patch (1.2 -> 1.3) , jabber-mu-conference-Makefiles.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/jabber-mu-conference/jabber-mu-conference-config.patch
diff -u packages/jabber-mu-conference/jabber-mu-conference-config.patch:1.4 packages/jabber-mu-conference/jabber-mu-conference-config.patch:1.5
--- packages/jabber-mu-conference/jabber-mu-conference-config.patch:1.4 Sun May 11 23:49:53 2008
+++ packages/jabber-mu-conference/jabber-mu-conference-config.patch Thu Nov 5 13:04:49 2009
@@ -1,6 +1,6 @@
-diff -ur mu-conference_0.7.orig/muc-default.xml mu-conference_0.7/muc-default.xml
---- mu-conference_0.7.orig/muc-default.xml 2007-06-08 22:19:49.000000000 +0200
-+++ mu-conference_0.7/muc-default.xml 2008-05-11 22:56:20.000000000 +0200
+diff -ur mu-conference_0.8.orig/muc-default.xml mu-conference_0.8/muc-default.xml
+--- mu-conference_0.8.orig/muc-default.xml 2008-01-18 21:24:36.000000000 +0100
++++ mu-conference_0.8/muc-default.xml 2009-11-05 12:58:59.524162051 +0100
@@ -11,13 +11,13 @@
<name>conference.localhost</name> <!-- the jid of your component -->
@@ -20,13 +20,15 @@
<!-- <logstderr/> --> <!-- uncomment to also send log to stderr -->
-@@ -32,7 +32,7 @@
+@@ -32,9 +32,9 @@
<URL>http://foo.bar/</URL>
</vCard>
<history>40</history> <!-- maximum numbers of history lines send when joining a room -->
-- <logdir>./logs/</logdir> <!-- where to store the room logs -->
+- <logdir>./logs/</logdir> <!-- where to store the room logs, comment to disable logging -->
++ <logdir>/var/log/jabber-mu-conference/chats/</logdir> <!-- where to store the room logs, comment to disable logging -->
+ <!--logsubdirs/--> <!-- uncomment to stores the room logs in subdirs (for example 2007/08/02) -->
- <stylesheet>../style.css</stylesheet> <!--URL of the log stylesheet -->
-+ <logdir>/var/log/jabber-mu-conference/chats/</logdir> <!-- where to store the room logs -->
+ <stylesheet>/etc/jabber/jabber-mu-conference-style.css</stylesheet> <!--URL of the log stylesheet -->
<!-- default text to send to legacy clients, will also be used in the logs -->
<notice>
+ <join>has become available</join>
================================================================
Index: packages/jabber-mu-conference/jabber-mu-conference-drop_priv.patch
diff -u packages/jabber-mu-conference/jabber-mu-conference-drop_priv.patch:1.2 packages/jabber-mu-conference/jabber-mu-conference-drop_priv.patch:1.3
--- packages/jabber-mu-conference/jabber-mu-conference-drop_priv.patch:1.2 Sun May 11 23:09:13 2008
+++ packages/jabber-mu-conference/jabber-mu-conference-drop_priv.patch Thu Nov 5 13:04:49 2009
@@ -1,6 +1,6 @@
-diff -ur mu-conference_0.7.orig/src/main.c mu-conference_0.7/src/main.c
---- mu-conference_0.7.orig/src/main.c 2007-06-08 22:19:48.000000000 +0200
-+++ mu-conference_0.7/src/main.c 2008-05-11 22:59:41.000000000 +0200
+diff -ur mu-conference_0.8.orig/src/main.c mu-conference_0.8/src/main.c
+--- mu-conference_0.8.orig/src/main.c 2007-06-29 11:01:03.000000000 +0200
++++ mu-conference_0.8/src/main.c 2009-11-05 13:03:46.704757099 +0100
@@ -23,6 +23,11 @@
#include "jcomp.h"
#include "lib.h"
@@ -10,10 +10,10 @@
+#include <grp.h>
+#include <pwd.h>
+
- int main(int argc, char *argv[]) {
- extern char *optarg;
- extern int optind, opterr, optopt;
-@@ -35,6 +40,9 @@
+ void usage() {
+ printf("Usage: mu-conference [-B] [-s] [-h] [-d LEVEL] -c FILE\n");
+ printf(" -B Put the daemon in background\n");
+@@ -44,6 +49,9 @@
FILE *pid_stream;
struct stat st;
char *config_file = NULL;
@@ -23,16 +23,16 @@
pool p;
/* GThread *dthread; */ /* the packet delivery thread */
-@@ -45,7 +53,7 @@
+@@ -54,7 +62,7 @@
g_thread_init(NULL);
fprintf(stderr, "%s -- %s\n%s\n\n", _JCOMP_NAME, _JCOMP_VERS, _JCOMP_COPY);
-- while ((c = getopt(argc, argv, "Bsd:c:")) != EOF)
-+ while ((c = getopt(argc, argv, "Bsd:c:U:G:")) != EOF)
+- while ((c = getopt(argc, argv, "Bshd:c:")) != EOF)
++ while ((c = getopt(argc, argv, "Bshd:c:U:G:")) != EOF)
switch (c) {
case 'B':
inBackground = 1;
-@@ -60,14 +68,20 @@
+@@ -69,6 +77,14 @@
message_mask_set = 1;
break;
@@ -47,15 +47,7 @@
case 's':
jcr->message_stderr = 1;
message_stderr_set = 1;
- break;
--
- }
-
--
- /* The configuration file must be specified, and there is no default */
- if (config_file == NULL) {
- fprintf(stderr, "%s: Configuration file not specified, exiting.\n", JDBG);
-@@ -127,6 +141,29 @@
+@@ -139,6 +155,29 @@
if (!message_stderr_set)
jcr->message_stderr = (xmlnode_get_type(xmlnode_get_tag(jcr->config,"logstderr")) == NTYPE_TAG);
================================================================
Index: packages/jabber-mu-conference/jabber-mu-conference-Makefiles.patch
diff -u packages/jabber-mu-conference/jabber-mu-conference-Makefiles.patch:1.2 packages/jabber-mu-conference/jabber-mu-conference-Makefiles.patch:1.3
--- packages/jabber-mu-conference/jabber-mu-conference-Makefiles.patch:1.2 Sun May 11 23:09:13 2008
+++ packages/jabber-mu-conference/jabber-mu-conference-Makefiles.patch Thu Nov 5 13:04:49 2009
@@ -1,45 +1,44 @@
-diff -ur mu-conference_0.7.orig/src/jabberd/Makefile mu-conference_0.7/src/jabberd/Makefile
---- mu-conference_0.7.orig/src/jabberd/Makefile 2007-06-08 22:19:48.000000000 +0200
-+++ mu-conference_0.7/src/jabberd/Makefile 2008-05-11 22:51:15.000000000 +0200
+diff -ur mu-conference_0.8.orig/src/jabberd/Makefile mu-conference_0.8/src/jabberd/Makefile
+--- mu-conference_0.8.orig/src/jabberd/Makefile 2008-03-25 17:50:13.000000000 +0100
++++ mu-conference_0.8/src/jabberd/Makefile 2009-11-05 12:55:04.188143009 +0100
@@ -1,6 +1,6 @@
CC=gcc
--CFLAGS=-O2 -Wall -I. -I../../include `pkg-config --cflags glib-2.0` -D_REENTRANT -DLIBIDN
-+CFLAGS=$(OFLAGS) -Wall -I. -I../../include `pkg-config --cflags glib-2.0` -D_REENTRANT -DLIBIDN
+-CFLAGS:=$(CFLAGS) -O2 -Wall -I. -I../../include `pkg-config --cflags glib-2.0` -D_REENTRANT -DLIBIDN
++CFLAGS:=$(CFLAGS) $(OFLAGS) -Wall -I. -I../../include `pkg-config --cflags glib-2.0` -D_REENTRANT -DLIBIDN
LIBS=
JCOMP_LIB_OBJECTS=expat.o \
-diff -ur mu-conference_0.7.orig/src/jcomp/Makefile mu-conference_0.7/src/jcomp/Makefile
---- mu-conference_0.7.orig/src/jcomp/Makefile 2007-06-08 22:19:48.000000000 +0200
-+++ mu-conference_0.7/src/jcomp/Makefile 2008-05-11 22:51:04.000000000 +0200
+diff -ur mu-conference_0.8.orig/src/jcomp/Makefile mu-conference_0.8/src/jcomp/Makefile
+--- mu-conference_0.8.orig/src/jcomp/Makefile 2008-03-25 17:50:13.000000000 +0100
++++ mu-conference_0.8/src/jcomp/Makefile 2009-11-05 12:55:50.331471273 +0100
@@ -1,7 +1,7 @@
# $Id$
CC=gcc
--CFLAGS=-O2 -Wall -I../../include -I. `pkg-config --cflags glib-2.0` -D_REENTRANT
-+CFLAGS=$(OFLAGS) -Wall -I../../include -I. `pkg-config --cflags glib-2.0` -D_REENTRANT
+-CFLAGS:=$(CFLAGS) -O2 -Wall -I../../include -I. `pkg-config --cflags glib-2.0` -D_REENTRANT
++CFLAGS:=$(CFLAGS) $(OFLAGS) -Wall -I../../include -I. `pkg-config --cflags glib-2.0` -D_REENTRANT
LIBS=
JCOMP_OBJECTS=jcr_xdb.o \
-diff -ur mu-conference_0.7.orig/src/Makefile mu-conference_0.7/src/Makefile
---- mu-conference_0.7.orig/src/Makefile 2007-06-08 22:19:48.000000000 +0200
-+++ mu-conference_0.7/src/Makefile 2008-05-11 22:52:55.000000000 +0200
-@@ -1,6 +1,6 @@
-
+diff -ur mu-conference_0.8.orig/src/Makefile mu-conference_0.8/src/Makefile
+--- mu-conference_0.8.orig/src/Makefile 2007-07-17 00:05:44.000000000 +0200
++++ mu-conference_0.8/src/Makefile 2009-11-05 12:53:51.701483101 +0100
+@@ -1,5 +1,5 @@
CC:=gcc
-CFLAGS:=$(CFLAGS) -O2 -Wall -I../../lib -I../include `pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT -DLIBIDN
+CFLAGS:=$(CFLAGS) $(OFLAGS) -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 `mysql_config --libs`
- LDFLAGS:=-L.
+ 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`
@@ -19,8 +19,8 @@
$(CC) $(CFLAGS) $(MCFLAGS) -o mu-conference $(conference_OBJECTS) $(LDFLAGS) $(LIBS)
libjcomp.a:
-- cd jabberd ; make
-- cd jcomp ; make lib
-+ make -C jabberd
-+ make -C jcomp lib
+- cd jabberd ; $(MAKE)
+- cd jcomp ; $(MAKE) lib
++ $(MAKE) -C jabberd
++ $(MAKE) -C jcomp lib
static: $(conference_OBJECTS)
@@ -47,7 +46,7 @@
clean:
rm -f $(conference_OBJECTS) mu-conference *~
-- cd jcomp ; make clean
-- cd jabberd ; make clean
-+ make -C jabberd clean
-+ make -C jcomp clean
+- cd jcomp ; $(MAKE) clean
+- cd jabberd ; $(MAKE) clean
++ $(MAKE) -C jcomp clean
++ $(MAKE) -C jabberd clean
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jabber-mu-conference/jabber-mu-conference-config.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jabber-mu-conference/jabber-mu-conference-drop_priv.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jabber-mu-conference/jabber-mu-conference-Makefiles.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list