SOURCES: jabber-mu-conference-config.patch, jabber-mu-conference-drop_priv....

hawk hawk at pld-linux.org
Sun May 11 23:09:18 CEST 2008 

Author: hawk                         Date: Sun May 11 21:09:18 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.7

---- Files affected:
SOURCES:
   jabber-mu-conference-config.patch (1.2 -> 1.3) , jabber-mu-conference-drop_priv.patch (1.1 -> 1.2) , jabber-mu-conference-Makefiles.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/jabber-mu-conference-config.patch
diff -u SOURCES/jabber-mu-conference-config.patch:1.2 SOURCES/jabber-mu-conference-config.patch:1.3
--- SOURCES/jabber-mu-conference-config.patch:1.2	Tue Jun  1 13:55:03 2004
+++ SOURCES/jabber-mu-conference-config.patch	Sun May 11 23:09:13 2008
@@ -1,30 +1,32 @@
-diff -dur mu-conference-0.6.0.orig/muc-jcr.xml mu-conference-0.6.0/muc-jcr.xml
---- mu-conference-0.6.0.orig/muc-jcr.xml	2003-10-26 20:42:03.000000000 +0100
-+++ mu-conference-0.6.0/muc-jcr.xml	2004-06-01 13:02:57.369014309 +0200
+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
 @@ -11,13 +11,13 @@
  
-   <name>conference.localhost</name>
-   <host>conference.localhost</host>
--  <ip>localhost</ip>
-+  <ip>127.0.0.1</ip>
-   <port>5347</port>
-   <secret>secret</secret>
+   <name>conference.localhost</name> <!-- the jid of your component -->
+   <host>conference.localhost</host> <!-- this should be the same as above -->
+-  <ip>localhost</ip> <!-- adress of the jabber server -->
+-  <port>7009</port>  <!-- port used to connect the service to the jabber server -->
++  <ip>127.0.0.1</ip> <!-- adress of the jabber server -->
++  <port>5437</port>  <!-- port used to connect the service to the jabber server -->
+   <secret>secret</secret> <!-- secret shared with the jabber server -->
  
--  <spool>./spool/conference.localhost</spool>
--  <logdir>./syslogs</logdir>
--  <pidfile>./mu-conference.pid</pidfile>
-+  <spool>/var/lib/jabber-mu-conference</spool>
-+  <logdir>/var/log/jabber-mu-conference</logdir>
-+  <pidfile>/var/run/jabber/mu-conference.pid</pidfile>
-   <!--
-      <logstderr/>
-   -->
-@@ -31,7 +31,7 @@
+-  <spool>./spool/chat.localhost</spool> <!-- directory containing the rooms data -->
+-  <logdir>./syslogs</logdir> <!-- directory containing the debug log (the file is called mu-conference.log) -->
+-  <pidfile>./mu-conference.pid</pidfile> <!-- file that will contain the PID of the process -->
++  <spool>/var/lib/jabber-mu-conference</spool> <!-- directory containing the rooms data -->
++  <logdir>/var/log/jabber-mu-conference</logdir> <!-- directory containing the debug log (the file is called mu-conference.log) -->
++  <pidfile>/var/run/jabber/mu-conference.pid</pidfile> <!-- file that will contain the PID of the process -->
+   
+   <!--   <logstderr/> --> <!-- uncomment to also send log to stderr -->
+   
+@@ -32,7 +32,7 @@
          <URL>http://foo.bar/</URL>
        </vCard>
-       <history>40</history>
--      <logdir>./logs/</logdir>
-+      <logdir>/var/log/jabber-mu-conference/chats/</logdir>
+       <history>40</history> <!-- maximum numbers of history lines send when joining a room -->
+-      <logdir>./logs/</logdir> <!-- where to store the room logs -->
+-      <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>
-         <leave>has left</leave>

================================================================
Index: SOURCES/jabber-mu-conference-drop_priv.patch
diff -u SOURCES/jabber-mu-conference-drop_priv.patch:1.1 SOURCES/jabber-mu-conference-drop_priv.patch:1.2
--- SOURCES/jabber-mu-conference-drop_priv.patch:1.1	Tue Jun  1 13:39:16 2004
+++ SOURCES/jabber-mu-conference-drop_priv.patch	Sun May 11 23:09:13 2008
@@ -1,9 +1,9 @@
-diff -dur mu-conference-0.6.0.orig/jcr/src/main.c mu-conference-0.6.0/jcr/src/main.c
---- mu-conference-0.6.0.orig/jcr/src/main.c	2003-11-01 23:27:21.000000000 +0100
-+++ mu-conference-0.6.0/jcr/src/main.c	2004-06-01 13:23:48.293786649 +0200
-@@ -22,6 +22,11 @@
- 
+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
+@@ -23,6 +23,11 @@
  #include "jcomp.h"
+ #include "lib.h"
  
 +#include <sys/types.h>
 +#include <unistd.h>
@@ -13,7 +13,7 @@
  int main(int argc, char *argv[]) {
    extern char *optarg;
    extern int optind, opterr, optopt;
-@@ -33,6 +38,9 @@
+@@ -35,6 +40,9 @@
    FILE *pid_stream;
    struct stat st;
    char *config_file = NULL;
@@ -21,33 +21,41 @@
 +  struct passwd *pw;
 +  struct group *gr;
    pool p;
-   jcr = (jcr_instance)malloc(sizeof(_jcr_instance));
- 
-@@ -42,7 +50,7 @@
  
+   /* GThread       *dthread; */ /* the packet delivery thread */
+@@ -45,7 +53,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)
      switch (c) {
-     case 'B':
-       inBackground = 1;
-@@ -57,6 +65,14 @@
-       message_mask_set = 1;
-       break;
- 
-+    case 'U':
-+      user=optarg;
-+      break;
+       case 'B':
+         inBackground = 1;
+@@ -60,14 +68,20 @@
+         message_mask_set = 1;
+         break;
+ 
++      case 'U':
++        user=optarg;
++        break;
 +
-+    case 'G':
-+      group=optarg;
-+      break;
++      case 'G':
++        group=optarg;
++        break;
 +
-     case 's':
-       jcr->message_stderr = 1;
-       message_stderr_set = 1;
-@@ -117,6 +133,29 @@
+       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 @@
    if (!message_stderr_set)
      jcr->message_stderr = (xmlnode_get_type(xmlnode_get_tag(jcr->config,"logstderr")) == NTYPE_TAG);
  
@@ -77,14 +85,3 @@
  
    if (inBackground == 1) {
      if ((pid = fork()) == -1) {
-@@ -141,8 +180,7 @@
-   /* We now can initialize the resources */
-   g_log_set_handler (NULL, G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL
-                      | G_LOG_FLAG_RECURSION, jcr_log_handler, jcr);
--
--
-+  
-   log_warn(JDBG, "%s -- %s  starting.", _JCOMP_NAME, _JCOMP_VERS);
- 
-   config_file = xmlnode_get_data(xmlnode_get_tag(jcr->config,"pidfile"));
-

================================================================
Index: SOURCES/jabber-mu-conference-Makefiles.patch
diff -u SOURCES/jabber-mu-conference-Makefiles.patch:1.1 SOURCES/jabber-mu-conference-Makefiles.patch:1.2
--- SOURCES/jabber-mu-conference-Makefiles.patch:1.1	Tue Jun  1 13:38:45 2004
+++ SOURCES/jabber-mu-conference-Makefiles.patch	Sun May 11 23:09:13 2008
@@ -1,62 +1,53 @@
-diff -dur mu-conference-0.6.0.orig/jcr/Makefile mu-conference-0.6.0/jcr/Makefile
---- mu-conference-0.6.0.orig/jcr/Makefile	2003-10-13 04:02:21.000000000 +0200
-+++ mu-conference-0.6.0/jcr/Makefile	2004-06-01 12:44:05.804852140 +0200
-@@ -2,10 +2,10 @@
- #  $Id$
- 
- all: 
--	cd jabberd/ ; make
--	cd jcomp/ ; make lib
-+	make -C jabberd
-+	make -C jcomp lib
- 
- clean:
--	cd jabberd/ ; make clean
--	cd jcomp/ ; make clean
-+	make -C jabberd clean
-+	make -C jcomp clean
+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
+@@ -1,6 +1,6 @@
  
-diff -dur mu-conference-0.6.0.orig/jcr/jabberd/Makefile mu-conference-0.6.0/jcr/jabberd/Makefile
---- mu-conference-0.6.0.orig/jcr/jabberd/Makefile	2003-10-14 02:20:25.000000000 +0200
-+++ mu-conference-0.6.0/jcr/jabberd/Makefile	2004-06-01 12:44:05.804852140 +0200
-@@ -1,7 +1,7 @@
- 
- #  $Id$
  CC=gcc
--CFLAGS=-O2 -g -Wall -I. -I../lib `pkg-config --cflags glib-2.0` -D_REENTRANT
-+CFLAGS=$(OFLAGS) -Wall -I. -I../lib `pkg-config --cflags glib-2.0` -D_REENTRANT
+-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
  LIBS=
  
  JCOMP_LIB_OBJECTS=expat.o \
-diff -dur mu-conference-0.6.0.orig/jcr/jcomp/Makefile mu-conference-0.6.0/jcr/jcomp/Makefile
---- mu-conference-0.6.0.orig/jcr/jcomp/Makefile	2003-10-14 02:20:31.000000000 +0200
-+++ mu-conference-0.6.0/jcr/jcomp/Makefile	2004-06-01 12:44:05.805852078 +0200
+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
 @@ -1,7 +1,7 @@
  
  #  $Id$
  CC=gcc
--CFLAGS=-O2 -g -Wall -I../lib -I. `pkg-config --cflags glib-2.0` -D_REENTRANT
-+CFLAGS=$(OFLAGS) -Wall -I../lib -I. `pkg-config --cflags glib-2.0` -D_REENTRANT
+-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
  LIBS=
  
  JCOMP_OBJECTS=jcr_xdb.o \
-diff -dur mu-conference-0.6.0.orig/jcr/src/jcomp.mk mu-conference-0.6.0/jcr/src/jcomp.mk
---- mu-conference-0.6.0.orig/jcr/src/jcomp.mk	2003-10-26 13:35:19.000000000 +0100
-+++ mu-conference-0.6.0/jcr/src/jcomp.mk	2004-06-01 12:45:15.361561610 +0200
-@@ -19,14 +19,14 @@
- # $Id$
+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 @@
  
  CC:=gcc
--CFLAGS:=$(CFLAGS) -O2 -g -Wall -I../../lib -I../include `pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT
-+CFLAGS:=$(CFLAGS) $(OFLAGS) -Wall -I../jcr/lib -I../include `pkg-config --cflags glib-2.0` -D_JCOMP -D_REENTRANT
+-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.
+@@ -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
  
- # Debug/Experimental
- #CFLAGS:=$(CFLAGS) -pipe -Os -I../../jabberd -I../include 
- #LIBS:=$(LIBS) /usr/local/lib/ccmalloc-gcc.o -lccmalloc 
- #LIBS:=$(LIBS) -lmemusage
- LIBS:=$(LIBS) -ljcomp -lm `pkg-config --libs glib-2.0` `pkg-config --libs gthread-2.0`
--LDFLAGS:=-L../../lib 
-+LDFLAGS:=-L../jcr/lib 
+ static: $(conference_OBJECTS)
  
- conference_OBJECTS=conference.o conference_room.o conference_user.o utils.o xdata.o admin.o roles.o xdb.o hash.o main.o
+@@ -28,5 +28,5 @@
  
+ clean:
+ 	rm -f $(conference_OBJECTS) mu-conference *~
+-	cd jcomp ; make clean
+-	cd jabberd ; make clean
++	make -C jabberd clean
++	make -C jcomp clean
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/jabber-mu-conference-config.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/jabber-mu-conference-drop_priv.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/jabber-mu-conference-Makefiles.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list