packages: ejabberd/ejabberd-config.patch, ejabberd/ejabberd-makefile.patch, ...

Thu Nov 19 09:54:47 CET 2009

Author: arekm                        Date: Thu Nov 19 08:54:47 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.1.0 (still no mod_logdb for this version)

---- Files affected:
packages/ejabberd:
   ejabberd-config.patch (1.6 -> 1.7) , ejabberd-makefile.patch (1.7 -> 1.8) , ejabberd.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: packages/ejabberd/ejabberd-config.patch
diff -u packages/ejabberd/ejabberd-config.patch:1.6 packages/ejabberd/ejabberd-config.patch:1.7

--- packages/ejabberd/ejabberd-config.patch:1.6	Sun Jun  1 21:35:00 2008
+++ packages/ejabberd/ejabberd-config.patch	Thu Nov 19 09:54:41 2009
@@ -13,31 +13,24 @@
  %%% The parameters used in this configuration file are explained in more detail
  %%% in the ejabberd Installation and Operation Guide.
  %%% Please consult the Guide in case of doubts, it is included in 
-@@ -138,14 +144,16 @@
-   %%
-   %% ejabberd_service: Interact with external components (transports...)
-   %%
--  %%{8888, ejabberd_service, [
--  %%			    {access, all}, 
--  %%			    {shaper_rule, fast},
--  %%			    {ip, {127, 0, 0, 1}},
--  %%			    {hosts, ["icq.example.org", "sms.example.org"],
--  %%			     [{password, "secret"}]
--  %%			    }
--  %%			   ]},
+@@ -155,6 +155,17 @@
+   %%			    }
+   %%			   ]},
+ 
 +  %%To enable more than one you _must_ change port numbers (here and in service's config)
 +  %% {5347, ejabberd_service, [{access, all},
-+  %%			    {hosts, ["icq.localhost", "sms.localhost"],
-+  %%			     [{password, ">secret<"}]}]},
++  %%			 {hosts, ["icq.localhost", "sms.localhost"],
++  %%			 [{password, ">secret<"}]}]},
 +  %% {5347, ejabberd_service, [{access, all},
-+  %%			    {host, "gg.localhost",
-+  %%			     [{password, ">secret<"}]}]},
++  %%			 {host, "gg.localhost",
++  %%			 [{password, ">secret<"}]}]},
 +  %% {5347, ejabberd_service, [{access, all},
-+  %%			    {hosts, ["ircnet.localhost", "freenode.localhost"],
-+  %%			     [{password, ">secret<"}]}]},
- 
++  %%			 {hosts, ["ircnet.localhost", "freenode.localhost"],
++  %%			  [{password, ">secret<"}]}]},
++
    {5280, ejabberd_http, [
- 			 http_poll, 
+ 			 %%{request_handlers,
+ 			 %% [
 @@ -391,9 +391,9 @@
  %% All users are allowed to use MUC service:
  {access, muc, [{allow, all}]}.

================================================================
Index: packages/ejabberd/ejabberd-makefile.patch
diff -u packages/ejabberd/ejabberd-makefile.patch:1.7 packages/ejabberd/ejabberd-makefile.patch:1.8
--- packages/ejabberd/ejabberd-makefile.patch:1.7	Mon Oct 13 20:27:21 2008
+++ packages/ejabberd/ejabberd-makefile.patch	Thu Nov 19 09:54:41 2009
@@ -1,20 +1,11 @@
 --- 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
-@@ -58,7 +58,7 @@
- 
+@@ -74,7 +74,7 @@
  DESTDIR =
  
--EJABBERDDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
-+EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
- BEAMDIR = $(EJABBERDDIR)/ebin
- SPOOLDIR = $(EJABBERDDIR)/db
- PRIVDIR = $(EJABBERDDIR)/priv
-@@ -66,7 +66,7 @@
- PBINDIR = $(PRIVDIR)/bin
- MSGSDIR = $(PRIVDIR)/msgs
- LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
+ # /etc/ejabberd/
 -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
 +ETCDIR = $(DESTDIR)@sysconfdir@/jabber
- SBINDIR = $(DESTDIR)@sbindir@
  
- ifeq ($(shell uname),Darwin)
+ # /sbin/
+ SBINDIR = $(DESTDIR)@sbindir@

================================================================
Index: packages/ejabberd/ejabberd.spec
diff -u packages/ejabberd/ejabberd.spec:1.53 packages/ejabberd/ejabberd.spec:1.54
--- packages/ejabberd/ejabberd.spec:1.53	Sat Aug 15 15:00:17 2009
+++ packages/ejabberd/ejabberd.spec	Thu Nov 19 09:54:41 2009
@@ -10,12 +10,12 @@
 Summary:	Fault-tolerant distributed Jabber/XMPP server
 Summary(pl.UTF-8):	Odporny na awarie rozproszony serwer Jabbera/XMPP
 Name:		%{realname}
-Version:	2.0.5
-Release:	2
+Version:	2.1.0
+Release:	1
 License:	GPL
 Group:		Applications/Communications
-Source0:	http://www.process-one.net/downloads/ejabberd/%{version}/%{realname}-%{version}.tar.gz
-# Source0-md5:	2d85b47df969daf0a78ed3b16562d731
+Source0:	http://www.process-one.net/downloads/ejabberd/%{version}/sources/%{realname}-%{version}.tar.gz
+# Source0-md5:	373be6e99acf7c930ab85531489c63c4
 Source1:	%{realname}.init
 Source2:	%{realname}.sysconfig
 Source3:	%{realname}.sh
@@ -88,6 +88,7 @@
 sed -e's, at libdir@,%{_libdir},g' -e 's, at EJABBERD_DOC_PATH@,%{_docdir}/%{name}-%{version}/doc,g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/%{realname}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{realname}
 
+chmod u+rw $RPM_BUILD_ROOT%{_sbindir}/%{realname}*
 sed -e's, at libdir@,%{_libdir},g' %{SOURCE3} > $RPM_BUILD_ROOT%{_sbindir}/%{realname}
 sed -e's, at libdir@,%{_libdir},g' %{SOURCE4} > $RPM_BUILD_ROOT%{_sbindir}/%{realname}ctl
 install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/jabber
@@ -122,7 +123,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog doc src/odbc/pg.sql src/odbc/mysql.sql src/odbc/mssql.sql
+%doc doc src/odbc/pg.sql src/odbc/mysql.sql
 %attr(755,root,root) %{_sbindir}/*
 %attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/*
 %attr(770,root,jabber) /var/log/ejabberd
@@ -146,6 +147,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2009/11/19 08:54:41  arekm
+- up to 2.1.0 (still no mod_logdb for this version)
+
 Revision 1.53  2009/08/15 13:00:17  arekm
 - set EJABBERD_DOC_PATH so help over html works
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ejabberd/ejabberd-config.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ejabberd/ejabberd-makefile.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ejabberd/ejabberd.spec?r1=1.53&r2=1.54&f=u

