OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Oct-2007 09:28:07
Branch: HEAD Handle: 2007101808280600
Modified files:
openpkg-src/jabberd jabberd.patch jabberd.spec
Log:
upgrading package: jabberd 2.1.17 -> 2.1.18
Summary:
Revision Changes Path
1.13 +21 -21 openpkg-src/jabberd/jabberd.patch
1.63 +2 -2 openpkg-src/jabberd/jabberd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 jabberd.patch
--- openpkg-src/jabberd/jabberd.patch 2 Oct 2007 06:17:48 -0000 1.12
+++ openpkg-src/jabberd/jabberd.patch 18 Oct 2007 07:28:06 -0000 1.13
@@ -1,6 +1,6 @@
Index: configure
---- configure.orig 2007-10-02 01:21:21 +0200
-+++ configure 2007-10-02 08:12:59 +0200
+--- configure.orig 2007-10-17 21:15:51 +0200
++++ configure 2007-10-18 09:22:02 +0200
@@ -30157,7 +30157,7 @@
fi
@@ -20,8 +20,8 @@
/* confdefs.h. */
_ACEOF
Index: etc/c2s.xml.dist.in
---- etc/c2s.xml.dist.in.orig 2007-09-21 10:54:46 +0200
-+++ etc/c2s.xml.dist.in 2007-10-02 08:13:00 +0200
+--- etc/c2s.xml.dist.in.orig 2007-10-17 21:15:30 +0200
++++ etc/c2s.xml.dist.in 2007-10-18 09:22:02 +0200
@@ -51,18 +51,16 @@
</router>
@@ -53,7 +53,7 @@
<!-- Port to bind to, or 0 to disable unencrypted access to the
server (default: 5222) -->
-@@ -282,7 +280,7 @@
+@@ -285,7 +283,7 @@
<path>@pkglibdir@</path>
<!-- Backend module to use -->
@@ -63,8 +63,8 @@
<!-- Available authentication mechanisms -->
<mechanisms>
Index: etc/resolver.xml.dist.in
---- etc/resolver.xml.dist.in.orig 2007-04-09 16:19:52 +0200
-+++ etc/resolver.xml.dist.in 2007-10-02 08:13:00 +0200
+--- etc/resolver.xml.dist.in.orig 2007-10-17 21:15:30 +0200
++++ etc/resolver.xml.dist.in 2007-10-18 09:22:02 +0200
@@ -51,18 +51,16 @@
</router>
@@ -88,8 +88,8 @@
<!-- SRV records will be resolved in the following order. The first
Index: etc/router.xml.dist.in
---- etc/router.xml.dist.in.orig 2007-04-09 16:19:52 +0200
-+++ etc/router.xml.dist.in 2007-10-02 08:13:00 +0200
+--- etc/router.xml.dist.in.orig 2007-10-17 21:15:30 +0200
++++ etc/router.xml.dist.in 2007-10-18 09:22:02 +0200
@@ -9,24 +9,22 @@
<pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
@@ -120,8 +120,8 @@
<!-- Port to bind to (default: 5347) -->
<port>5347</port>
Index: etc/s2s.xml.dist.in
---- etc/s2s.xml.dist.in.orig 2007-09-25 22:37:54 +0200
-+++ etc/s2s.xml.dist.in 2007-10-02 08:13:00 +0200
+--- etc/s2s.xml.dist.in.orig 2007-10-17 21:15:30 +0200
++++ etc/s2s.xml.dist.in 2007-10-18 09:22:02 +0200
@@ -61,25 +61,23 @@
</router>
@@ -153,8 +153,8 @@
<!-- Helper DNS resolver component - if this component is not
Index: etc/sm.xml.dist.in
---- etc/sm.xml.dist.in.orig 2007-09-07 18:18:44 +0200
-+++ etc/sm.xml.dist.in 2007-10-02 08:13:00 +0200
+--- etc/sm.xml.dist.in.orig 2007-10-17 21:15:30 +0200
++++ etc/sm.xml.dist.in 2007-10-18 09:22:02 +0200
@@ -54,13 +54,13 @@
</router>
@@ -182,8 +182,8 @@
<!-- Its also possible to explicitly list alternate drivers for
specific data types. -->
Index: sm/mod_iq_time.c
---- sm/mod_iq_time.c.orig 2007-09-25 22:34:24 +0200
-+++ sm/mod_iq_time.c 2007-10-02 08:14:59 +0200
+--- sm/mod_iq_time.c.orig 2007-10-17 21:15:26 +0200
++++ sm/mod_iq_time.c 2007-10-18 09:23:35 +0200
@@ -39,6 +39,7 @@
static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt)
{
@@ -196,16 +196,16 @@
datetime_out(t, dt_DATETIME, buf, 64);
nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "utc", buf);
#ifdef HAVE_TZSET
-- snprintf(buf, 64, "%+03d:%02d", (int) -timezone/(60*60), (int)
-timezone%(60*60));
+- snprintf(buf, 64, "%+03d:%02d", -((int)timezone)/(60*60),
-((int)timezone)%(60*60));
+ tzone = (time_t)((long)mktime(gmtime(&t)) - (long)t);
+ snprintf(buf, 64, "%+03d:%02d", (int) -tzone/(60*60), (int)
-tzone%(60*60));
#else
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 2007-09-05 11:35:42 +0200
-+++ sm/mod_roster.c 2007-10-02 08:13:00 +0200
-@@ -642,6 +642,9 @@
+--- sm/mod_roster.c.orig 2007-10-17 21:15:26 +0200
++++ sm/mod_roster.c 2007-10-18 09:22:02 +0200
+@@ -643,6 +643,9 @@
if(user->sessions == NULL)
return mod_PASS;
@@ -216,8 +216,8 @@
pkt = pkt_create(user->sm, "iq", "set", NULL, NULL);
pkt_id_new(pkt);
Index: util/util.h
---- util/util.h.orig 2007-09-21 02:33:08 +0200
-+++ util/util.h 2007-10-02 08:13:00 +0200
+--- util/util.h.orig 2007-10-17 21:15:30 +0200
++++ util/util.h 2007-10-18 09:22:02 +0200
@@ -30,6 +30,8 @@
#include <time.h>
#include <errno.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.spec
============================================================================
$ cvs diff -u -r1.62 -r1.63 jabberd.spec
--- openpkg-src/jabberd/jabberd.spec 2 Oct 2007 06:17:48 -0000 1.62
+++ openpkg-src/jabberd/jabberd.spec 18 Oct 2007 07:28:06 -0000 1.63
@@ -24,7 +24,7 @@
# package version
%define V_major 2.1
-%define V_minor 17
+%define V_minor 18
# package information
Name: jabberd
@@ -37,7 +37,7 @@
Group: InstantMessaging
License: JOSL/GPL
Version: %{V_major}.%{V_minor}
-Release: 20071002
+Release: 20071018
# package options
%option with_sqlite no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
