jabberd/jabberd.patch@acad5c9dea5f
jabberd/jabberd.patch
Fri, 22 Oct 2010 19:54:57 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 22 Oct 2010 19:54:57 +0200
- changeset 281
- acad5c9dea5f
- parent 224
- 29b273d63835
- child 303
- 2bd9bf3f6f03
- permissions
- -rw-r--r--
Correct dependencies and use a canonical package name.
1 Index: etc/c2s.xml.dist.in
2 --- etc/c2s.xml.dist.in.orig 2009-06-30 11:38:16 +0200
3 +++ etc/c2s.xml.dist.in 2009-06-30 20:45:22 +0200
4 @@ -50,18 +50,16 @@
5 </router>
7 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
8 - <log type='syslog'>
9 + <log type='file'>
10 <!-- If logging to syslog, this is the log ident -->
11 - <ident>jabberd/c2s</ident>
12 + <!-- <ident>jabberd/c2s</ident> -->
14 <!-- If logging to syslog, this is the log facility
15 (local0 - local7) [default: local3] -->
16 - <facility>local3</facility>
17 + <!-- <facility>local3</facility> -->
19 <!-- If logging to file, this is the filename of the logfile -->
20 - <!--
21 <file>@localstatedir@/jabberd/log/c2s.log</file>
22 - -->
23 </log>
25 <!-- Local network configuration -->
26 @@ -137,7 +135,7 @@
27 <id password-change='true' /> -->
29 <!-- IP address to bind to (default: 0.0.0.0) -->
30 - <ip>0.0.0.0</ip>
31 + <ip>127.0.0.1</ip>
33 <!-- Port to bind to, or 0 to disable unencrypted access to the
34 server (default: 5222) -->
35 Index: etc/router.xml.dist.in
36 --- etc/router.xml.dist.in.orig 2009-06-30 11:38:16 +0200
37 +++ etc/router.xml.dist.in 2009-06-30 20:45:06 +0200
38 @@ -8,24 +8,22 @@
39 <pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
41 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
42 - <log type='syslog'>
43 + <log type='file'>
44 <!-- If logging to syslog, this is the log ident -->
45 - <ident>jabberd/router</ident>
46 + <!-- <ident>jabberd/router</ident> -->
48 <!-- If logging to syslog, this is the log facility
49 (local0 - local7) [default: local3] -->
50 - <facility>local3</facility>
51 + <!-- <facility>local3</facility> -->
53 <!-- If logging to file, this is the filename of the logfile -->
54 - <!--
55 <file>@localstatedir@/jabberd/log/router.log</file>
56 - -->
57 </log>
59 <!-- Local network configuration -->
60 <local>
61 <!-- IP address to bind to (default: 0.0.0.0) -->
62 - <ip>0.0.0.0</ip>
63 + <ip>127.0.0.1</ip>
65 <!-- Port to bind to (default: 5347) -->
66 <port>5347</port>
67 Index: etc/s2s.xml.dist.in
68 --- etc/s2s.xml.dist.in.orig 2009-06-30 11:38:16 +0200
69 +++ etc/s2s.xml.dist.in 2009-06-30 20:45:06 +0200
70 @@ -60,25 +60,23 @@
71 </router>
73 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
74 - <log type='syslog'>
75 + <log type='file'>
76 <!-- If logging to syslog, this is the log ident -->
77 - <ident>jabberd/s2s</ident>
78 + <!-- <ident>jabberd/s2s</ident> -->
80 <!-- If logging to syslog, this is the log facility
81 (local0 - local7) [default: local3] -->
82 - <facility>local3</facility>
83 + <!-- <facility>local3</facility> -->
85 <!-- if logging to file, this is the filename of the logfile -->
86 - <!--
87 <file>@localstatedir@/jabberd/log/s2s.log</file>
88 - -->
89 </log>
91 <!-- Local network configuration -->
92 <local>
93 <!-- IP and port to listen for incoming s2s connections on
94 (default: 0.0.0.0, 5269) -->
95 - <ip>0.0.0.0</ip>
96 + <ip>127.0.0.1</ip>
97 <port>5269</port>
99 <!-- Multihomed machines (with more than one interface and IP address)
100 Index: etc/sm.xml.dist.in
101 --- etc/sm.xml.dist.in.orig 2009-06-30 11:38:16 +0200
102 +++ etc/sm.xml.dist.in 2009-06-30 20:45:36 +0200
103 @@ -50,13 +50,13 @@
104 </router>
106 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
107 - <log type='syslog'>
108 + <log type='file'>
109 <!-- If logging to syslog, this is the log ident -->
110 - <ident>jabberd/sm</ident>
111 + <!-- <ident>jabberd/sm</ident> -->
113 <!-- If logging to syslog, this is the log facility
114 (local0 - local7) [default: local3] -->
115 - <facility>local3</facility>
116 + <!-- <facility>local3</facility> -->
118 <!-- If logging to file, this is the filename of the logfile -->
119 <!--
120 Index: sm/mod_iq_time.c
121 --- sm/mod_iq_time.c.orig 2009-06-30 11:38:15 +0200
122 +++ sm/mod_iq_time.c 2009-06-30 20:45:06 +0200
123 @@ -39,6 +39,7 @@
124 static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt)
125 {
126 time_t t;
127 + time_t tzone;
128 struct tm *tm;
129 char buf[64];
130 char *c;
131 @@ -78,7 +79,8 @@
132 datetime_out(t, dt_DATETIME, buf, 64);
133 nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "utc", buf);
134 #ifdef HAVE_TZSET
135 - snprintf(buf, 64, "%+03d:%02d", -((int)timezone)/(60*60), -((int)timezone)%(60*60));
136 + tzone = (time_t)((long)mktime(gmtime(&t)) - (long)t);
137 + snprintf(buf, 64, "%+03d:%02d", (int) -tzone/(60*60), (int) -tzone%(60*60));
138 #else
139 snprintf(buf, 64, "%+03d:%02d", (int) tm->tm_gmtoff/(60*60), (int) tm->tm_gmtoff%(60*60));
140 #endif
141 Index: sm/mod_roster.c
142 --- sm/mod_roster.c.orig 2009-06-30 11:38:15 +0200
143 +++ sm/mod_roster.c 2009-06-30 20:45:06 +0200
144 @@ -635,6 +635,9 @@
145 if(user->sessions == NULL)
146 return mod_PASS;
148 + /* We have to free old packet - Lemming's memory leak fix */
149 + pkt_free(pkt);
150 +
151 /* build a new packet to push out to everyone */
152 pkt = pkt_create(user->sm, "iq", "set", NULL, NULL);
153 pkt_id_new(pkt);
154 Index: util/util.h
155 --- util/util.h.orig 2009-06-30 11:38:16 +0200
156 +++ util/util.h 2009-06-30 20:45:06 +0200
157 @@ -30,6 +30,8 @@
158 #include <time.h>
159 #include <errno.h>
160 #include <assert.h>
161 +#include <sys/types.h>
162 +#include <sys/socket.h>
164 #include <expat.h>
166 Index: tools/jabberd.in
167 --- tools/jabberd.in.orig 2009-10-31 17:51:42.857115000 +0100
168 +++ tools/jabberd.in 2009-10-31 18:07:52.095812899 +0100
169 @@ -63,7 +63,7 @@
172 #-----------------------------------------------------------------------------
173 -# Setup the jobs: router, sm, c2s, s2s
174 +# Setup the jobs: router, sm, c2s, s2s, mu-conference
175 #-----------------------------------------------------------------------------
176 $jobs{jabberd}->{prefix} = "JBRD";
178 @@ -83,12 +83,17 @@
179 $jobs{s2s}->{config} = "$config_dir/s2s.xml";
180 $jobs{s2s}->{prefix} = "S2S";
182 +$jobs{muc}->{cmd} = "$Bin/mu-conference";
183 +$jobs{muc}->{config} = "$config_dir/muc.xml";
184 +$jobs{muc}->{prefix} = "MUC";
185 +
186 if ($config eq "internal")
187 {
188 $programs[0] = ["router"];
189 $programs[1] = ["sm"];
190 $programs[2] = ["c2s"];
191 $programs[3] = ["s2s"];
192 + $programs[4] = ["muc"];
193 }
194 else
195 {
