jabberd/jabberd.patch@6becb64fe77d
jabberd/jabberd.patch
Tue, 28 Aug 2012 18:30:35 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 28 Aug 2012 18:30:35 +0200
- changeset 540
- 6becb64fe77d
- parent 363
- 641cacc76b02
- child 541
- 869d6847b13e
- permissions
- -rw-r--r--
Resynchronize with upstream package maintainer version.
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 @@ -331,7 +329,7 @@
36 <path>@pkglibdir@</path>
38 <!-- Backend module to use -->
39 - <module>sqlite</module>
40 + <module>db</module>
42 <!-- Available authentication mechanisms -->
43 <mechanisms>
44 Index: etc/router.xml.dist.in
45 --- etc/router.xml.dist.in.orig 2009-06-30 11:38:16 +0200
46 +++ etc/router.xml.dist.in 2009-06-30 20:45:06 +0200
47 @@ -8,24 +8,22 @@
48 <pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
50 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
51 - <log type='syslog'>
52 + <log type='file'>
53 <!-- If logging to syslog, this is the log ident -->
54 - <ident>jabberd/router</ident>
55 + <!-- <ident>jabberd/router</ident> -->
57 <!-- If logging to syslog, this is the log facility
58 (local0 - local7) [default: local3] -->
59 - <facility>local3</facility>
60 + <!-- <facility>local3</facility> -->
62 <!-- If logging to file, this is the filename of the logfile -->
63 - <!--
64 <file>@localstatedir@/jabberd/log/router.log</file>
65 - -->
66 </log>
68 <!-- Local network configuration -->
69 <local>
70 <!-- IP address to bind to (default: 0.0.0.0) -->
71 - <ip>0.0.0.0</ip>
72 + <ip>127.0.0.1</ip>
74 <!-- Port to bind to (default: 5347) -->
75 <port>5347</port>
76 Index: etc/s2s.xml.dist.in
77 --- etc/s2s.xml.dist.in.orig 2009-06-30 11:38:16 +0200
78 +++ etc/s2s.xml.dist.in 2009-06-30 20:45:06 +0200
79 @@ -60,25 +60,23 @@
80 </router>
82 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
83 - <log type='syslog'>
84 + <log type='file'>
85 <!-- If logging to syslog, this is the log ident -->
86 - <ident>jabberd/s2s</ident>
87 + <!-- <ident>jabberd/s2s</ident> -->
89 <!-- If logging to syslog, this is the log facility
90 (local0 - local7) [default: local3] -->
91 - <facility>local3</facility>
92 + <!-- <facility>local3</facility> -->
94 <!-- if logging to file, this is the filename of the logfile -->
95 - <!--
96 <file>@localstatedir@/jabberd/log/s2s.log</file>
97 - -->
98 </log>
100 <!-- Local network configuration -->
101 <local>
102 <!-- IP and port to listen for incoming s2s connections on
103 (default: 0.0.0.0, 5269) -->
104 - <ip>0.0.0.0</ip>
105 + <ip>127.0.0.1</ip>
106 <port>5269</port>
108 <!-- Multihomed machines (with more than one interface and IP address)
109 Index: etc/sm.xml.dist.in
110 --- etc/sm.xml.dist.in.orig 2009-06-30 11:38:16 +0200
111 +++ etc/sm.xml.dist.in 2009-06-30 20:45:36 +0200
112 @@ -50,13 +50,13 @@
113 </router>
115 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
116 - <log type='syslog'>
117 + <log type='file'>
118 <!-- If logging to syslog, this is the log ident -->
119 - <ident>jabberd/sm</ident>
120 + <!-- <ident>jabberd/sm</ident> -->
122 <!-- If logging to syslog, this is the log facility
123 (local0 - local7) [default: local3] -->
124 - <facility>local3</facility>
125 + <!-- <facility>local3</facility> -->
127 <!-- If logging to file, this is the filename of the logfile -->
128 <!--
129 @@ -85,7 +85,7 @@
130 <path>@pkglibdir@</path>
132 <!-- By default, we use the SQLite driver for all storage -->
133 - <driver>sqlite</driver>
134 + <driver>db</driver>
136 <!-- Its also possible to explicitly list alternate drivers for
137 specific data types. -->
138 Index: sm/mod_iq_time.c
139 --- sm/mod_iq_time.c.orig 2009-06-30 11:38:15 +0200
140 +++ sm/mod_iq_time.c 2009-06-30 20:45:06 +0200
141 @@ -39,6 +39,7 @@
142 static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt)
143 {
144 time_t t;
145 + time_t tzone;
146 struct tm *tm;
147 char buf[64];
148 char *c;
149 @@ -78,7 +79,8 @@
150 datetime_out(t, dt_DATETIME, buf, 64);
151 nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "utc", buf);
152 #ifdef HAVE_TZSET
153 - snprintf(buf, 64, "%+03d:%02d", -((int)timezone)/(60*60), -((int)timezone)%(60*60));
154 + tzone = (time_t)((long)mktime(gmtime(&t)) - (long)t);
155 + snprintf(buf, 64, "%+03d:%02d", (int) -tzone/(60*60), (int) -tzone%(60*60));
156 #else
157 snprintf(buf, 64, "%+03d:%02d", (int) tm->tm_gmtoff/(60*60), (int) tm->tm_gmtoff%(60*60));
158 #endif
159 Index: sm/mod_roster.c
160 --- sm/mod_roster.c.orig 2009-06-30 11:38:15 +0200
161 +++ sm/mod_roster.c 2009-06-30 20:45:06 +0200
162 @@ -635,6 +635,9 @@
163 if(user->sessions == NULL)
164 return mod_PASS;
166 + /* We have to free old packet - Lemming's memory leak fix */
167 + pkt_free(pkt);
168 +
169 /* build a new packet to push out to everyone */
170 pkt = pkt_create(user->sm, "iq", "set", NULL, NULL);
171 pkt_id_new(pkt);
172 Index: util/util.h
173 --- util/util.h.orig 2009-06-30 11:38:16 +0200
174 +++ util/util.h 2009-06-30 20:45:06 +0200
175 @@ -30,6 +30,8 @@
176 #include <time.h>
177 #include <errno.h>
178 #include <assert.h>
179 +#include <sys/types.h>
180 +#include <sys/socket.h>
182 #include <expat.h>
