OpenPKG Specs / file comparison

comparison: jabberd/jabberd.patch

jabberd/jabberd.patch

changeset 758
a2c6460cfb16
parent 541
869d6847b13e
child 768
70baf26f1088
equal deleted inserted replaced
5:d8716d296f76 6:c0c9b0f05492
1 diff -Nau etc/c2s.xml.dist.in.orig etc/c2s.xml.dist.in 1 diff -Nau etc/c2s.xml.dist.in.orig etc/c2s.xml.dist.in
2 Index: etc/c2s.xml.dist.in 2 Index: etc/c2s.xml.dist.in
3 --- etc/c2s.xml.dist.in.orig 2012-05-22 22:27:51.000000000 +0200 3 --- etc/c2s.xml.dist.in.orig 2012-05-22 22:27:51.000000000 +0200
4 +++ etc/c2s.xml.dist.in 2012-08-27 13:44:20.119445160 +0200 4 +++ etc/c2s.xml.dist.in 2012-08-27 13:44:20.119445160 +0200
5 @@ -50,13 +50,13 @@ 5 @@ -50,18 +50,16 @@
6 </router> 6 </router>
7 7
8 <!-- Log configuration - type is "syslog", "file" or "stdout" --> 8 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
9 - <log type='syslog'> 9 - <log type='syslog'>
10 + <log type='file'> 10 + <log type='file'>
16 (local0 - local7) [default: local3] --> 16 (local0 - local7) [default: local3] -->
17 - <facility>local3</facility> 17 - <facility>local3</facility>
18 + <!-- <facility>local3</facility> --> 18 + <!-- <facility>local3</facility> -->
19 19
20 <!-- If logging to file, this is the filename of the logfile --> 20 <!-- If logging to file, this is the filename of the logfile -->
21 <!-- 21 - <!--
22 @@ -154,7 +154,7 @@ 22 <file>@localstatedir@/@package@/log/c2s.log</file>
23 - -->
24
25 <!-- Filename of the debug logfile -->
26 <!--
27 @@ -154,7 +152,7 @@
23 <id password-change='mu' /> --> 28 <id password-change='mu' /> -->
24 29
25 <!-- IP address to bind to (default: 0.0.0.0) --> 30 <!-- IP address to bind to (default: 0.0.0.0) -->
26 - <ip>0.0.0.0</ip> 31 - <ip>0.0.0.0</ip>
27 + <ip>127.0.0.1</ip> 32 + <ip>127.0.0.1</ip>
28 33
29 <!-- Port to bind to, or 0 to disable unencrypted access to the 34 <!-- Port to bind to, or 0 to disable unencrypted access to the
30 server (default: 5222) --> 35 server (default: 5222) -->
31 @@ -370,7 +370,7 @@
32 <path>@pkglibdir@</path>
33
34 <!-- Backend module to use -->
35 - <module>sqlite</module>
36 + <module>db</module>
37
38 <!-- Available authentication mechanisms -->
39 <mechanisms>
40 diff -Nau etc/router.xml.dist.in.orig etc/router.xml.dist.in 36 diff -Nau etc/router.xml.dist.in.orig etc/router.xml.dist.in
41 Index: etc/router.xml.dist.in 37 Index: etc/router.xml.dist.in
42 --- etc/router.xml.dist.in.orig 2012-05-04 18:24:36.000000000 +0200 38 --- etc/router.xml.dist.in.orig 2012-05-04 18:24:36.000000000 +0200
43 +++ etc/router.xml.dist.in 2012-08-27 13:47:20.357743449 +0200 39 +++ etc/router.xml.dist.in 2012-08-27 13:47:20.357743449 +0200
44 @@ -8,13 +8,13 @@ 40 @@ -8,18 +8,16 @@
45 <pidfile>@localstatedir@/@package@/pid/router.pid</pidfile> 41 <pidfile>@localstatedir@/@package@/pid/router.pid</pidfile>
46 42
47 <!-- Log configuration - type is "syslog", "file" or "stdout" --> 43 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
48 - <log type='syslog'> 44 - <log type='syslog'>
49 + <log type='file'> 45 + <log type='file'>
55 (local0 - local7) [default: local3] --> 51 (local0 - local7) [default: local3] -->
56 - <facility>local3</facility> 52 - <facility>local3</facility>
57 + <!-- <facility>local3</facility> --> 53 + <!-- <facility>local3</facility> -->
58 54
59 <!-- If logging to file, this is the filename of the logfile --> 55 <!-- If logging to file, this is the filename of the logfile -->
60 <!-- 56 - <!--
61 @@ -30,7 +30,7 @@ 57 <file>@localstatedir@/@package@/log/router.log</file>
58 - -->
59
60 <!-- Filename of the debug logfile -->
61 <!--
62 @@ -30,7 +28,7 @@
62 <!-- Local network configuration --> 63 <!-- Local network configuration -->
63 <local> 64 <local>
64 <!-- IP address to bind to (default: 0.0.0.0) --> 65 <!-- IP address to bind to (default: 0.0.0.0) -->
65 - <ip>0.0.0.0</ip> 66 - <ip>0.0.0.0</ip>
66 + <ip>127.0.0.1</ip> 67 + <ip>127.0.0.1</ip>
69 <port>5347</port> 70 <port>5347</port>
70 diff -Nau etc/s2s.xml.dist.in.orig etc/s2s.xml.dist.in 71 diff -Nau etc/s2s.xml.dist.in.orig etc/s2s.xml.dist.in
71 Index: etc/s2s.xml.dist.in 72 Index: etc/s2s.xml.dist.in
72 --- etc/s2s.xml.dist.in.orig 2012-08-06 20:18:46.000000000 +0200 73 --- etc/s2s.xml.dist.in.orig 2012-08-06 20:18:46.000000000 +0200
73 +++ etc/s2s.xml.dist.in 2012-08-27 13:45:50.771011934 +0200 74 +++ etc/s2s.xml.dist.in 2012-08-27 13:45:50.771011934 +0200
74 @@ -60,13 +60,13 @@ 75 @@ -60,18 +60,16 @@
75 </router> 76 </router>
76 77
77 <!-- Log configuration - type is "syslog", "file" or "stdout" --> 78 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
78 - <log type='syslog'> 79 - <log type='syslog'>
79 + <log type='file'> 80 + <log type='file'>
85 (local0 - local7) [default: local3] --> 86 (local0 - local7) [default: local3] -->
86 - <facility>local3</facility> 87 - <facility>local3</facility>
87 + <!-- <facility>local3</facility> --> 88 + <!-- <facility>local3</facility> -->
88 89
89 <!-- if logging to file, this is the filename of the logfile --> 90 <!-- if logging to file, this is the filename of the logfile -->
90 <!-- 91 - <!--
91 @@ -83,7 +83,7 @@ 92 <file>@localstatedir@/@package@/log/s2s.log</file>
93 - -->
94
95 <!-- Filename of the debug logfile -->
96 <!--
97 @@ -83,7 +81,7 @@
92 <local> 98 <local>
93 <!-- IP and port to listen for incoming s2s connections on 99 <!-- IP and port to listen for incoming s2s connections on
94 (default: 0.0.0.0, 5269) --> 100 (default: 0.0.0.0, 5269) -->
95 - <ip>0.0.0.0</ip> 101 - <ip>0.0.0.0</ip>
96 + <ip>127.0.0.1</ip> 102 + <ip>127.0.0.1</ip>
116 - <facility>local3</facility> 122 - <facility>local3</facility>
117 + <!-- <facility>local3</facility> --> 123 + <!-- <facility>local3</facility> -->
118 124
119 <!-- If logging to file, this is the filename of the logfile --> 125 <!-- If logging to file, this is the filename of the logfile -->
120 <!-- 126 <!--
121 @@ -90,7 +90,7 @@
122 <path>@pkglibdir@</path>
123
124 <!-- By default, we use the SQLite driver for all storage -->
125 - <driver>sqlite</driver>
126 + <driver>db</driver>
127
128 <!-- Its also possible to explicitly list alternate drivers for
129 specific data types. -->
130 diff -Nau sm/mod_iq_time.c.orig sm/mod_iq_time.c 127 diff -Nau sm/mod_iq_time.c.orig sm/mod_iq_time.c
131 Index: sm/mod_iq_time.c 128 Index: sm/mod_iq_time.c
132 --- sm/mod_iq_time.c.orig 2011-10-22 21:56:00.000000000 +0200 129 --- sm/mod_iq_time.c.orig 2011-10-22 21:56:00.000000000 +0200
133 +++ sm/mod_iq_time.c 2012-08-27 13:41:59.773059371 +0200 130 +++ sm/mod_iq_time.c 2012-08-27 13:41:59.773059371 +0200
134 @@ -39,6 +39,7 @@ 131 @@ -39,6 +39,7 @@
161 + pkt_free(pkt); 158 + pkt_free(pkt);
162 + 159 +
163 /* build a new packet to push out to everyone */ 160 /* build a new packet to push out to everyone */
164 pkt = pkt_create(user->sm, "iq", "set", NULL, NULL); 161 pkt = pkt_create(user->sm, "iq", "set", NULL, NULL);
165 pkt_id_new(pkt); 162 pkt_id_new(pkt);
163 diff -Nau tools/jabberd.in.orig tools/jabberd.in
164 Index: tools/jabberd.in
165 --- tools/jabberd.in.orig 2012-02-12 22:38:25.000000000 +0100
166 +++ tools/jabberd.in 2012-09-16 11:21:49.325189601 +0200
167 @@ -65,7 +65,7 @@
168
169
170 #-----------------------------------------------------------------------------
171 -# Setup the jobs: router, sm, c2s, s2s
172 +# Setup the jobs: router, sm, c2s, s2s, mu-conference
173 #-----------------------------------------------------------------------------
174 $jobs{jabberd}->{prefix} = "JBRD";
175
176 @@ -85,12 +85,17 @@
177 $jobs{s2s}->{config} = "$config_dir/s2s.xml";
178 $jobs{s2s}->{prefix} = "S2S";
179
180 +$jobs{muc}->{cmd} = "$Bin/mu-conference";
181 +$jobs{muc}->{config} = "$config_dir/muc.xml";
182 +$jobs{muc}->{prefix} = "MUC";
183 +
184 if ($config eq "internal")
185 {
186 $programs[0] = ["router"];
187 $programs[1] = ["sm"];
188 $programs[2] = ["c2s"];
189 $programs[3] = ["s2s"];
190 + $programs[4] = ["muc"];
191 }
192 else
193 {
166 diff -Nau util/util.h.orig util/util.h 194 diff -Nau util/util.h.orig util/util.h
167 Index: util/util.h 195 Index: util/util.h
168 --- util/util.h.orig 2012-08-22 08:03:58.000000000 +0200 196 --- util/util.h.orig 2012-08-22 08:03:58.000000000 +0200
169 +++ util/util.h 2012-08-27 13:41:59.773719964 +0200 197 +++ util/util.h 2012-08-27 13:41:59.773719964 +0200
170 @@ -30,6 +30,8 @@ 198 @@ -30,6 +30,8 @@

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial