- updated

Changed files:
    ejabberd-config.patch -> 1.6
    ejabberd-makefile.patch -> 1.4

diff --git a/ejabberd-config.patch b/ejabberd-config.patch
index 27c5f5ec244f79025c2ea11bf260438d989c6505..ba5d28dd9899f82ddd562f469abcbe18c1032457 100644 (file)
--- a/ejabberd-config.patch
+++ b/ejabberd-config.patch
@@ -38,15 +38,15 @@
  
    {5280, ejabberd_http, [
                         http_poll, 
-@@ -374,9 +382,9 @@
+@@ -391,9 +391,9 @@
  %% All users are allowed to use MUC service:
  {access, muc, [{allow, all}]}.
  
--%% Every username can be registered via in-band registration:
+-%% In-band registration allows registration of any possible username.
 -%% To disable in-band registration, replace 'allow' with 'deny'.
 -{access, register, [{allow, all}]}.
-+%% In-band registration disabled, let the admin decide who will use his server
-+%% replace "deny, all" with "allow, all" to enable in-band registration
++%% In-band registration disabled.
++%% To enable  in-band registration, replace 'deny' with 'allow'.
 +{access, register, [{deny, all}]}.
  
  %% Everybody can create pubsub nodes

diff --git a/ejabberd-makefile.patch b/ejabberd-makefile.patch
index 6b053791c7e8780e7dcfefd04d1359077e9bd6b7..ca78ded891c3e8fab9903c7445cf4b761878e211 100644 (file)
--- a/ejabberd-makefile.patch
+++ b/ejabberd-makefile.patch
@@ -1,19 +1,19 @@
 --- ejabberd-2.0.0/src/Makefile.in.orig        2008-02-21 11:02:12.000000000 +0100
 +++ ejabberd-2.0.0/src/Makefile.in     2008-02-22 14:52:47.000000000 +0100
-@@ -50,13 +50,13 @@
+@@ -56,14 +56,14 @@
  
  DESTDIR =
  
--EJABBERDDIR = $(DESTDIR)@prefix@/var/lib/ejabberd
+-EJABBERDDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
 +EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
  BEAMDIR = $(EJABBERDDIR)/ebin
  PRIVDIR = $(EJABBERDDIR)/priv
  SODIR = $(PRIVDIR)/lib
+ PBINDIR = $(PRIVDIR)/bin
  MSGSDIR = $(PRIVDIR)/msgs
--LOGDIR = $(DESTDIR)@prefix@/var/log/ejabberd
--ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd
-+LOGDIR = $(DESTDIR)/var/log/ejabberd
-+ETCDIR = $(DESTDIR)/etc/jabber
- SBINDIR = $(DESTDIR)@prefix@/sbin
+ LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
+-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
++ETCDIR = $(DESTDIR)@sysconfdir@/jabber
+ SBINDIR = $(DESTDIR)@sbindir@
  
  ifeq ($(shell uname),Darwin)