Author: jajcus Date: Wed Apr 26 09:32:51 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for ejabberd-1.1.0
---- Files affected: SOURCES: ejabberd-config.patch (1.3 -> 1.4) , ejabberd-makefile.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/ejabberd-config.patch diff -u SOURCES/ejabberd-config.patch:1.3 SOURCES/ejabberd-config.patch:1.4 --- SOURCES/ejabberd-config.patch:1.3 Thu Dec 15 18:56:00 2005 +++ SOURCES/ejabberd-config.patch Wed Apr 26 11:32:46 2006 @@ -1,6 +1,6 @@ -diff -dur -x '*~' ejabberd-1.0.0.orig/src/ejabberd.cfg.example ejabberd-1.0.0/src/ejabberd.cfg.example ---- ejabberd-1.0.0.orig/src/ejabberd.cfg.example 2005-12-08 22:35:15.000000000 +0100 -+++ ejabberd-1.0.0/src/ejabberd.cfg.example 2005-12-15 18:36:10.000000000 +0100 +diff -dur -x '*~' ejabberd-1.1.0.orig/src/ejabberd.cfg.example ejabberd-1.1.0/src/ejabberd.cfg.example +--- ejabberd-1.1.0.orig/src/ejabberd.cfg.example 2006-04-22 15:50:30.000000000 +0200 ++++ ejabberd-1.1.0/src/ejabberd.cfg.example 2006-04-26 10:36:38.000000000 +0200 @@ -1,5 +1,11 @@ % $Id$ @@ -27,24 +27,28 @@ % After successful registration user will get message with following subject % and body: -@@ -103,18 +108,29 @@ +@@ -112,22 +117,32 @@ % Listened ports: {listen, -- [{5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, ++% TSL disabled, enable _after_ providing the certificate + [{5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, + {max_stanza_size, 65536}, - starttls, {certfile, "./ssl.pem"}]}, - {5223, ejabberd_c2s, [{access, c2s}, +- {max_stanza_size, 65536}, - tls, {certfile, "./ssl.pem"}]}, -+% TSL disabled, enable _after_ providing the certificate -+ [{5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper} -+% ,starttls, {certfile, "./ssl.pem"} -+ ]}, ++% starttls, {certfile, "./ssl.pem"} ++ ]}, +% {5223, ejabberd_c2s, [{access, c2s}, ++% {max_stanza_size, 65536}, +% tls, {certfile, "./ssl.pem"}]}, % Use these two lines instead if TLS support is not compiled %{5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}]}, %{5223, ejabberd_c2s, [{access, c2s}, ssl, {certfile, "./ssl.pem"}]}, - {5269, ejabberd_s2s_in, [{shaper, s2s_shaper}]}, + {5269, ejabberd_s2s_in, [{shaper, s2s_shaper}, + {max_stanza_size, 131072} + ]}, - {5280, ejabberd_http, [http_poll, web_admin]}, - {8888, ejabberd_service, [{access, all}, - {hosts, ["icq.localhost", "sms.localhost"], @@ -60,8 +64,9 @@ +% {5347, ejabberd_service, [{access, all}, +% {hosts, ["ircnet.localhost", "freenode.localhost"], +% [{password, ">secret<"}]}]}, -+ + {5280, ejabberd_http, [http_poll, web_admin]} ]}. +Only in ejabberd-1.1.0/src: ejabberd.cfg.example.orig +Only in ejabberd-1.1.0/src: ejabberd.cfg.example.rej ================================================================ Index: SOURCES/ejabberd-makefile.patch diff -u SOURCES/ejabberd-makefile.patch:1.1 SOURCES/ejabberd-makefile.patch:1.2 --- SOURCES/ejabberd-makefile.patch:1.1 Tue Aug 31 22:58:00 2004 +++ SOURCES/ejabberd-makefile.patch Wed Apr 26 11:32:46 2006 @@ -1,27 +1,20 @@ -diff -dur ejabberd-0.7.orig/src/Makefile.in ejabberd-0.7/src/Makefile.in ---- ejabberd-0.7.orig/src/Makefile.in 2004-07-06 23:34:49.000000000 +0200 -+++ ejabberd-0.7/src/Makefile.in 2004-08-31 13:41:14.270564254 +0200 -@@ -7,6 +7,7 @@ - LIBS = @LIBS@ +diff -dur -x '*~' ejabberd-1.1.0.orig/src/Makefile.in ejabberd-1.1.0/src/Makefile.in +--- ejabberd-1.1.0.orig/src/Makefile.in 2006-04-01 18:06:36.000000000 +0200 ++++ ejabberd-1.1.0/src/Makefile.in 2006-04-26 10:32:28.000000000 +0200 +@@ -34,13 +34,13 @@ - prefix = @prefix@ -+libdir = @libdir@ + DESTDIR = - INCLUDES = @ERLANG_CFLAGS@ @EXPAT_CFLAGS@ - -@@ -18,13 +19,13 @@ - - DESTDIR = - --EJABBERDDIR = $(DESTDIR)/var/lib/ejabberd +-EJABBERDDIR = $(DESTDIR)@prefix@/var/lib/ejabberd +EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd BEAMDIR = $(EJABBERDDIR)/ebin PRIVDIR = $(EJABBERDDIR)/priv SODIR = $(PRIVDIR)/lib MSGSDIR = $(PRIVDIR)/msgs - LOGDIR = $(DESTDIR)/var/log/ejabberd --ETCDIR = $(DESTDIR)/etc/ejabberd +-LOGDIR = $(DESTDIR)@prefix@/var/log/ejabberd +-ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd ++LOGDIR = $(DESTDIR)/var/log/ejabberd +ETCDIR = $(DESTDIR)/etc/jabber - all: $(ERLSHLIBS) compile-beam all-recursive + ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/ejabberd-config.patch?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SOURCES/ejabberd-makefile.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit