changeset
Include forgotten patch logic and multiuser conference, and improve
Mon, 17 Sep 2012 19:16:02 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 17 Sep 2012 19:16:02 +0200
- changeset 693
- 165d980aa5f1
- parent 692
- 67831a9de168
- child 694
- 5bd730820c5b
Include forgotten patch logic and multiuser conference, and improve
default configuration to log services in appropriate paths.
| jabberd/jabberd.patch | file | annotate | diff | comparison | revisions | |
| jabberd/jabberd.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/jabberd/jabberd.patch Mon Sep 17 19:13:34 2012 +0200 1.2 +++ b/jabberd/jabberd.patch Mon Sep 17 19:16:02 2012 +0200 1.3 @@ -2,7 +2,7 @@ 1.4 Index: etc/c2s.xml.dist.in 1.5 --- etc/c2s.xml.dist.in.orig 2012-05-22 22:27:51.000000000 +0200 1.6 +++ etc/c2s.xml.dist.in 2012-08-27 13:44:20.119445160 +0200 1.7 -@@ -50,13 +50,13 @@ 1.8 +@@ -50,18 +50,16 @@ 1.9 </router> 1.10 1.11 <!-- Log configuration - type is "syslog", "file" or "stdout" --> 1.12 @@ -18,8 +18,13 @@ 1.13 + <!-- <facility>local3</facility> --> 1.14 1.15 <!-- If logging to file, this is the filename of the logfile --> 1.16 +- <!-- 1.17 + <file>@localstatedir@/@package@/log/c2s.log</file> 1.18 +- --> 1.19 + 1.20 + <!-- Filename of the debug logfile --> 1.21 <!-- 1.22 -@@ -154,7 +154,7 @@ 1.23 +@@ -154,7 +152,7 @@ 1.24 <id password-change='mu' /> --> 1.25 1.26 <!-- IP address to bind to (default: 0.0.0.0) --> 1.27 @@ -28,20 +33,11 @@ 1.28 1.29 <!-- Port to bind to, or 0 to disable unencrypted access to the 1.30 server (default: 5222) --> 1.31 -@@ -370,7 +370,7 @@ 1.32 - <path>@pkglibdir@</path> 1.33 - 1.34 - <!-- Backend module to use --> 1.35 -- <module>sqlite</module> 1.36 -+ <module>db</module> 1.37 - 1.38 - <!-- Available authentication mechanisms --> 1.39 - <mechanisms> 1.40 diff -Nau etc/router.xml.dist.in.orig etc/router.xml.dist.in 1.41 Index: etc/router.xml.dist.in 1.42 --- etc/router.xml.dist.in.orig 2012-05-04 18:24:36.000000000 +0200 1.43 +++ etc/router.xml.dist.in 2012-08-27 13:47:20.357743449 +0200 1.44 -@@ -8,13 +8,13 @@ 1.45 +@@ -8,18 +8,16 @@ 1.46 <pidfile>@localstatedir@/@package@/pid/router.pid</pidfile> 1.47 1.48 <!-- Log configuration - type is "syslog", "file" or "stdout" --> 1.49 @@ -57,8 +53,13 @@ 1.50 + <!-- <facility>local3</facility> --> 1.51 1.52 <!-- If logging to file, this is the filename of the logfile --> 1.53 +- <!-- 1.54 + <file>@localstatedir@/@package@/log/router.log</file> 1.55 +- --> 1.56 + 1.57 + <!-- Filename of the debug logfile --> 1.58 <!-- 1.59 -@@ -30,7 +30,7 @@ 1.60 +@@ -30,7 +28,7 @@ 1.61 <!-- Local network configuration --> 1.62 <local> 1.63 <!-- IP address to bind to (default: 0.0.0.0) --> 1.64 @@ -71,7 +72,7 @@ 1.65 Index: etc/s2s.xml.dist.in 1.66 --- etc/s2s.xml.dist.in.orig 2012-08-06 20:18:46.000000000 +0200 1.67 +++ etc/s2s.xml.dist.in 2012-08-27 13:45:50.771011934 +0200 1.68 -@@ -60,13 +60,13 @@ 1.69 +@@ -60,18 +60,16 @@ 1.70 </router> 1.71 1.72 <!-- Log configuration - type is "syslog", "file" or "stdout" --> 1.73 @@ -87,8 +88,13 @@ 1.74 + <!-- <facility>local3</facility> --> 1.75 1.76 <!-- if logging to file, this is the filename of the logfile --> 1.77 +- <!-- 1.78 + <file>@localstatedir@/@package@/log/s2s.log</file> 1.79 +- --> 1.80 + 1.81 + <!-- Filename of the debug logfile --> 1.82 <!-- 1.83 -@@ -83,7 +83,7 @@ 1.84 +@@ -83,7 +81,7 @@ 1.85 <local> 1.86 <!-- IP and port to listen for incoming s2s connections on 1.87 (default: 0.0.0.0, 5269) --> 1.88 @@ -118,15 +124,6 @@ 1.89 1.90 <!-- If logging to file, this is the filename of the logfile --> 1.91 <!-- 1.92 -@@ -90,7 +90,7 @@ 1.93 - <path>@pkglibdir@</path> 1.94 - 1.95 - <!-- By default, we use the SQLite driver for all storage --> 1.96 -- <driver>sqlite</driver> 1.97 -+ <driver>db</driver> 1.98 - 1.99 - <!-- Its also possible to explicitly list alternate drivers for 1.100 - specific data types. --> 1.101 diff -Nau sm/mod_iq_time.c.orig sm/mod_iq_time.c 1.102 Index: sm/mod_iq_time.c 1.103 --- sm/mod_iq_time.c.orig 2011-10-22 21:56:00.000000000 +0200 1.104 @@ -163,6 +160,37 @@ 1.105 /* build a new packet to push out to everyone */ 1.106 pkt = pkt_create(user->sm, "iq", "set", NULL, NULL); 1.107 pkt_id_new(pkt); 1.108 +diff -Nau tools/jabberd.in.orig tools/jabberd.in 1.109 +Index: tools/jabberd.in 1.110 +--- tools/jabberd.in.orig 2012-02-12 22:38:25.000000000 +0100 1.111 ++++ tools/jabberd.in 2012-09-16 11:21:49.325189601 +0200 1.112 +@@ -65,7 +65,7 @@ 1.113 + 1.114 + 1.115 + #----------------------------------------------------------------------------- 1.116 +-# Setup the jobs: router, sm, c2s, s2s 1.117 ++# Setup the jobs: router, sm, c2s, s2s, mu-conference 1.118 + #----------------------------------------------------------------------------- 1.119 + $jobs{jabberd}->{prefix} = "JBRD"; 1.120 + 1.121 +@@ -85,12 +85,17 @@ 1.122 + $jobs{s2s}->{config} = "$config_dir/s2s.xml"; 1.123 + $jobs{s2s}->{prefix} = "S2S"; 1.124 + 1.125 ++$jobs{muc}->{cmd} = "$Bin/mu-conference"; 1.126 ++$jobs{muc}->{config} = "$config_dir/muc.xml"; 1.127 ++$jobs{muc}->{prefix} = "MUC"; 1.128 ++ 1.129 + if ($config eq "internal") 1.130 + { 1.131 + $programs[0] = ["router"]; 1.132 + $programs[1] = ["sm"]; 1.133 + $programs[2] = ["c2s"]; 1.134 + $programs[3] = ["s2s"]; 1.135 ++ $programs[4] = ["muc"]; 1.136 + } 1.137 + else 1.138 + { 1.139 diff -Nau util/util.h.orig util/util.h 1.140 Index: util/util.h 1.141 --- util/util.h.orig 2012-08-22 08:03:58.000000000 +0200
2.1 --- a/jabberd/jabberd.spec Mon Sep 17 19:13:34 2012 +0200 2.2 +++ b/jabberd/jabberd.spec Mon Sep 17 19:16:02 2012 +0200 2.3 @@ -40,7 +40,7 @@ 2.4 Release: 20120800 2.5 2.6 # package options 2.7 -%option with_sqlite no 2.8 +%option with_sqlite yes 2.9 %option with_mysql no 2.10 %option with_pgsql no 2.11 %option with_pam no 2.12 @@ -100,6 +100,7 @@ 2.13 %prep 2.14 %setup -q -n jabberd-%{version} 2.15 %setup -q -D -T -a 1 2.16 + %{l_sed} <%{PATCH0} -e 's;@l_prefix@;%{l_prefix};g' | %{l_patch} -p0 -b 2.17 %{l_shtool} subst \ 2.18 -e 's;exec perl;exec %{l_prefix}/bin/perl;' \ 2.19 tools/jabberd.in
