OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 02-Jul-2009 18:12:56
Branch: HEAD Handle: 2009070217125600
Modified files:
openpkg-src/jabberd jabberd.patch jabberd.spec
Log:
upgrading package: jabberd 2.2.8 -> 2.2.8.91
Summary:
Revision Changes Path
1.17 +23 -23 openpkg-src/jabberd/jabberd.patch
1.82 +2 -2 openpkg-src/jabberd/jabberd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.patch
============================================================================
$ cvs diff -u -r1.16 -r1.17 jabberd.patch
--- openpkg-src/jabberd/jabberd.patch 23 May 2008 11:01:35 -0000 1.16
+++ openpkg-src/jabberd/jabberd.patch 2 Jul 2009 16:12:56 -0000 1.17
@@ -1,6 +1,6 @@
Index: etc/c2s.xml.dist.in
---- etc/c2s.xml.dist.in.orig 2008-05-22 17:36:32 +0200
-+++ etc/c2s.xml.dist.in 2008-05-23 08:29:23 +0200
+--- etc/c2s.xml.dist.in.orig 2009-06-30 11:38:16 +0200
++++ etc/c2s.xml.dist.in 2009-06-30 20:45:22 +0200
@@ -50,18 +50,16 @@
</router>
@@ -23,7 +23,7 @@
</log>
<!-- Local network configuration -->
-@@ -130,7 +128,7 @@
+@@ -137,7 +135,7 @@
<id password-change='true' /> -->
<!-- IP address to bind to (default: 0.0.0.0) -->
@@ -32,18 +32,18 @@
<!-- Port to bind to, or 0 to disable unencrypted access to the
server (default: 5222) -->
-@@ -294,7 +292,7 @@
+@@ -331,7 +329,7 @@
<path>@pkglibdir@</path>
<!-- Backend module to use -->
-- <module>mysql</module>
+- <module>sqlite</module>
+ <module>db</module>
<!-- Available authentication mechanisms -->
<mechanisms>
Index: etc/router.xml.dist.in
---- etc/router.xml.dist.in.orig 2008-05-22 17:36:32 +0200
-+++ etc/router.xml.dist.in 2008-05-23 08:29:23 +0200
+--- etc/router.xml.dist.in.orig 2009-06-30 11:38:16 +0200
++++ etc/router.xml.dist.in 2009-06-30 20:45:06 +0200
@@ -8,24 +8,22 @@
<pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
@@ -74,8 +74,8 @@
<!-- Port to bind to (default: 5347) -->
<port>5347</port>
Index: etc/s2s.xml.dist.in
---- etc/s2s.xml.dist.in.orig 2008-05-22 17:36:32 +0200
-+++ etc/s2s.xml.dist.in 2008-05-23 08:29:23 +0200
+--- etc/s2s.xml.dist.in.orig 2009-06-30 11:38:16 +0200
++++ etc/s2s.xml.dist.in 2009-06-30 20:45:06 +0200
@@ -60,25 +60,23 @@
</router>
@@ -105,11 +105,11 @@
+ <ip>127.0.0.1</ip>
<port>5269</port>
- <!-- Secret used to generate dialback keys. If you have more than
+ <!-- Multihomed machines (with more than one interface and IP address)
Index: etc/sm.xml.dist.in
---- etc/sm.xml.dist.in.orig 2008-05-22 17:36:32 +0200
-+++ etc/sm.xml.dist.in 2008-05-23 08:29:23 +0200
-@@ -52,13 +52,13 @@
+--- etc/sm.xml.dist.in.orig 2009-06-30 11:38:16 +0200
++++ etc/sm.xml.dist.in 2009-06-30 20:45:36 +0200
+@@ -50,13 +50,13 @@
</router>
<!-- Log configuration - type is "syslog", "file" or "stdout" -->
@@ -126,18 +126,18 @@
<!-- If logging to file, this is the filename of the logfile -->
<!--
-@@ -72,7 +72,7 @@
+@@ -85,7 +85,7 @@
<path>@pkglibdir@</path>
- <!-- By default, we use the MySQL driver for all storage -->
-- <driver>mysql</driver>
+ <!-- By default, we use the SQLite driver for all storage -->
+- <driver>sqlite</driver>
+ <driver>db</driver>
<!-- Its also possible to explicitly list alternate drivers for
specific data types. -->
Index: sm/mod_iq_time.c
---- sm/mod_iq_time.c.orig 2008-05-22 17:36:28 +0200
-+++ sm/mod_iq_time.c 2008-05-23 08:29:23 +0200
+--- sm/mod_iq_time.c.orig 2009-06-30 11:38:15 +0200
++++ sm/mod_iq_time.c 2009-06-30 20:45:06 +0200
@@ -39,6 +39,7 @@
static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt)
{
@@ -157,9 +157,9 @@
snprintf(buf, 64, "%+03d:%02d", (int) tm->tm_gmtoff/(60*60), (int)
tm->tm_gmtoff%(60*60));
#endif
Index: sm/mod_roster.c
---- sm/mod_roster.c.orig 2008-05-22 17:36:28 +0200
-+++ sm/mod_roster.c 2008-05-23 08:29:23 +0200
-@@ -639,6 +639,9 @@
+--- sm/mod_roster.c.orig 2009-06-30 11:38:15 +0200
++++ sm/mod_roster.c 2009-06-30 20:45:06 +0200
+@@ -635,6 +635,9 @@
if(user->sessions == NULL)
return mod_PASS;
@@ -170,8 +170,8 @@
pkt = pkt_create(user->sm, "iq", "set", NULL, NULL);
pkt_id_new(pkt);
Index: util/util.h
---- util/util.h.orig 2008-05-22 17:36:32 +0200
-+++ util/util.h 2008-05-23 08:29:23 +0200
+--- util/util.h.orig 2009-06-30 11:38:16 +0200
++++ util/util.h 2009-06-30 20:45:06 +0200
@@ -30,6 +30,8 @@
#include <time.h>
#include <errno.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.spec
============================================================================
$ cvs diff -u -r1.81 -r1.82 jabberd.spec
--- openpkg-src/jabberd/jabberd.spec 28 Apr 2009 17:00:18 -0000 1.81
+++ openpkg-src/jabberd/jabberd.spec 2 Jul 2009 16:12:56 -0000 1.82
@@ -23,7 +23,7 @@
# package version
%define V_major 2.2
-%define V_minor 8
+%define V_minor 8.91
# package information
Name: jabberd
@@ -36,7 +36,7 @@
Group: InstantMessaging
License: JOSL/GPL
Version: %{V_major}.%{V_minor}
-Release: 20090428
+Release: 20090702
# package options
%option with_sqlite no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
