jabberd/jabberd.patch@9fe04d4d4e5a
jabberd/jabberd.patch
Mon, 17 Sep 2012 19:10:10 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 17 Sep 2012 19:10:10 +0200
- changeset 689
- 9fe04d4d4e5a
- parent 540
- 6becb64fe77d
- child 693
- 165d980aa5f1
- permissions
- -rw-r--r--
Update to new version of vendor software although Oracle fails to deliver.
More specifically, newer db(3) patch revisions exist but Oracle has
removed them from the canonical download server URI for Berkely DB.
1 diff -Nau etc/c2s.xml.dist.in.orig 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
4 +++ etc/c2s.xml.dist.in 2012-08-27 13:44:20.119445160 +0200
5 @@ -50,13 +50,13 @@
6 </router>
8 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
9 - <log type='syslog'>
10 + <log type='file'>
11 <!-- If logging to syslog, this is the log ident -->
12 - <ident>jabberd/c2s</ident>
13 + <!-- <ident>jabberd/c2s</ident> -->
15 <!-- If logging to syslog, this is the log facility
16 (local0 - local7) [default: local3] -->
17 - <facility>local3</facility>
18 + <!-- <facility>local3</facility> -->
20 <!-- If logging to file, this is the filename of the logfile -->
21 <!--
22 @@ -154,7 +154,7 @@
23 <id password-change='mu' /> -->
25 <!-- IP address to bind to (default: 0.0.0.0) -->
26 - <ip>0.0.0.0</ip>
27 + <ip>127.0.0.1</ip>
29 <!-- Port to bind to, or 0 to disable unencrypted access to the
30 server (default: 5222) -->
31 @@ -370,7 +370,7 @@
32 <path>@pkglibdir@</path>
34 <!-- Backend module to use -->
35 - <module>sqlite</module>
36 + <module>db</module>
38 <!-- Available authentication mechanisms -->
39 <mechanisms>
40 diff -Nau etc/router.xml.dist.in.orig etc/router.xml.dist.in
41 Index: etc/router.xml.dist.in
42 --- 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
44 @@ -8,13 +8,13 @@
45 <pidfile>@localstatedir@/@package@/pid/router.pid</pidfile>
47 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
48 - <log type='syslog'>
49 + <log type='file'>
50 <!-- If logging to syslog, this is the log ident -->
51 - <ident>jabberd/router</ident>
52 + <!-- <ident>jabberd/router</ident> -->
54 <!-- If logging to syslog, this is the log facility
55 (local0 - local7) [default: local3] -->
56 - <facility>local3</facility>
57 + <!-- <facility>local3</facility> -->
59 <!-- If logging to file, this is the filename of the logfile -->
60 <!--
61 @@ -30,7 +30,7 @@
62 <!-- Local network configuration -->
63 <local>
64 <!-- IP address to bind to (default: 0.0.0.0) -->
65 - <ip>0.0.0.0</ip>
66 + <ip>127.0.0.1</ip>
68 <!-- Port to bind to (default: 5347) -->
69 <port>5347</port>
70 diff -Nau etc/s2s.xml.dist.in.orig etc/s2s.xml.dist.in
71 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 2012-08-27 13:45:50.771011934 +0200
74 @@ -60,13 +60,13 @@
75 </router>
77 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
78 - <log type='syslog'>
79 + <log type='file'>
80 <!-- If logging to syslog, this is the log ident -->
81 - <ident>jabberd/s2s</ident>
82 + <!-- <ident>jabberd/s2s</ident> -->
84 <!-- If logging to syslog, this is the log facility
85 (local0 - local7) [default: local3] -->
86 - <facility>local3</facility>
87 + <!-- <facility>local3</facility> -->
89 <!-- if logging to file, this is the filename of the logfile -->
90 <!--
91 @@ -83,7 +83,7 @@
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 diff -Nau etc/sm.xml.dist.in.orig etc/sm.xml.dist.in
101 Index: etc/sm.xml.dist.in
102 --- etc/sm.xml.dist.in.orig 2012-05-04 18:24:36.000000000 +0200
103 +++ etc/sm.xml.dist.in 2012-08-27 13:41:59.772838992 +0200
104 @@ -50,13 +50,13 @@
105 </router>
107 <!-- Log configuration - type is "syslog", "file" or "stdout" -->
108 - <log type='syslog'>
109 + <log type='file'>
110 <!-- If logging to syslog, this is the log ident -->
111 - <ident>jabberd/sm</ident>
112 + <!-- <ident>jabberd/sm</ident> -->
114 <!-- If logging to syslog, this is the log facility
115 (local0 - local7) [default: local3] -->
116 - <facility>local3</facility>
117 + <!-- <facility>local3</facility> -->
119 <!-- If logging to file, this is the filename of the logfile -->
120 <!--
121 @@ -90,7 +90,7 @@
122 <path>@pkglibdir@</path>
124 <!-- By default, we use the SQLite driver for all storage -->
125 - <driver>sqlite</driver>
126 + <driver>db</driver>
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
131 Index: sm/mod_iq_time.c
132 --- 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
134 @@ -39,6 +39,7 @@
135 static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt)
136 {
137 time_t t;
138 + time_t tzone;
139 struct tm *tm;
140 char buf[64];
141 char *c;
142 @@ -78,7 +79,8 @@
143 datetime_out(t, dt_DATETIME, buf, 64);
144 nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "utc", buf);
145 #ifdef HAVE_TZSET
146 - snprintf(buf, 64, "%+03d:%02d", -((int)timezone)/(60*60), -((int)timezone)%(60*60));
147 + tzone = (time_t)((long)mktime(gmtime(&t)) - (long)t);
148 + snprintf(buf, 64, "%+03d:%02d", (int) -tzone/(60*60), (int) -tzone%(60*60));
149 #else
150 snprintf(buf, 64, "%+03d:%02d", (int) tm->tm_gmtoff/(60*60), (int) tm->tm_gmtoff%(60*60));
151 #endif
152 diff -Nau sm/mod_roster.c.orig sm/mod_roster.c
153 Index: sm/mod_roster.c
154 --- sm/mod_roster.c.orig 2012-02-12 22:36:18.000000000 +0100
155 +++ sm/mod_roster.c 2012-08-27 13:41:59.773438877 +0200
156 @@ -717,6 +717,9 @@
157 if(user->sessions == NULL)
158 return mod_PASS;
160 + /* We have to free old packet - Lemming's memory leak fix */
161 + pkt_free(pkt);
162 +
163 /* build a new packet to push out to everyone */
164 pkt = pkt_create(user->sm, "iq", "set", NULL, NULL);
165 pkt_id_new(pkt);
166 diff -Nau util/util.h.orig util/util.h
167 Index: util/util.h
168 --- util/util.h.orig 2012-08-22 08:03:58.000000000 +0200
169 +++ util/util.h 2012-08-27 13:41:59.773719964 +0200
170 @@ -30,6 +30,8 @@
171 #include <time.h>
172 #include <errno.h>
173 #include <assert.h>
174 +#include <sys/types.h>
175 +#include <sys/socket.h>
177 #include <expat.h>
