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: 24-Sep-2007 08:13:55
Branch: HEAD Handle: 2007092407131808
Modified files:
openpkg-src/jabberd jabberd.patch jabberd.spec
Log:
upgrading package: jabberd 2.1.15 -> 2.1.16
Summary:
Revision Changes Path
1.10 +42 -21 openpkg-src/jabberd/jabberd.patch
1.61 +2 -2 openpkg-src/jabberd/jabberd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 jabberd.patch
--- openpkg-src/jabberd/jabberd.patch 31 Jul 2007 14:15:48 -0000 1.9
+++ openpkg-src/jabberd/jabberd.patch 24 Sep 2007 06:13:18 -0000 1.10
@@ -1,16 +1,16 @@
Index: configure
---- configure.orig 2007-07-30 21:12:45 +0200
-+++ configure 2007-07-31 15:47:45 +0200
-@@ -29528,7 +29528,7 @@
+--- configure.orig 2007-09-23 16:18:12 +0200
++++ configure 2007-09-24 08:00:08 +0200
+@@ -30157,7 +30157,7 @@
fi
if test "x-$enable_mysql" = "x-yes" ; then
- for i in /usr /usr/local /usr/local/mysql ; do
-+ for i in @l_prefix@ ; do
++ for i in /openpkg-dev ; do
for j in include include/mysql "" ; do
if test -r "$i/$j/mysql.h" ; then
MYSQL_INCLUDE=$i/$j
-@@ -29546,7 +29546,7 @@
+@@ -30175,7 +30175,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -20,8 +20,8 @@
/* confdefs.h. */
_ACEOF
Index: etc/c2s.xml.dist.in
---- etc/c2s.xml.dist.in.orig 2007-07-19 15:18:32 +0200
-+++ etc/c2s.xml.dist.in 2007-07-27 08:15:22 +0200
+--- etc/c2s.xml.dist.in.orig 2007-09-21 10:54:46 +0200
++++ etc/c2s.xml.dist.in 2007-09-24 08:00:08 +0200
@@ -51,18 +51,16 @@
</router>
@@ -44,8 +44,8 @@
</log>
<!-- Local network configuration -->
-@@ -123,7 +121,7 @@
- >localhost</id> -->
+@@ -129,7 +127,7 @@
+ <id password-change='true' /> -->
<!-- IP address to bind to (default: 0.0.0.0) -->
- <ip>0.0.0.0</ip>
@@ -53,7 +53,7 @@
<!-- Port to bind to, or 0 to disable unencrypted access to the
server (default: 5222) -->
-@@ -263,7 +261,7 @@
+@@ -282,7 +280,7 @@
<path>@pkglibdir@</path>
<!-- Backend module to use -->
@@ -64,7 +64,7 @@
<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-07-27 08:15:22 +0200
++++ etc/resolver.xml.dist.in 2007-09-24 08:00:08 +0200
@@ -51,18 +51,16 @@
</router>
@@ -89,7 +89,7 @@
<!-- 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-07-27 08:15:22 +0200
++++ etc/router.xml.dist.in 2007-09-24 08:00:08 +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-04-09 16:19:52 +0200
-+++ etc/s2s.xml.dist.in 2007-07-27 08:15:22 +0200
+--- etc/s2s.xml.dist.in.orig 2007-08-31 02:24:28 +0200
++++ etc/s2s.xml.dist.in 2007-09-24 08:00:08 +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-07-20 01:39:48 +0200
-+++ etc/sm.xml.dist.in 2007-07-27 08:16:56 +0200
+--- etc/sm.xml.dist.in.orig 2007-09-07 18:18:44 +0200
++++ etc/sm.xml.dist.in 2007-09-24 08:00:08 +0200
@@ -54,13 +54,13 @@
</router>
@@ -181,10 +181,31 @@
<!-- 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-05 17:05:29 +0200
++++ sm/mod_iq_time.c 2007-09-24 08:08:40 +0200
+@@ -39,6 +39,7 @@
+ static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt)
+ {
+ time_t t;
++ time_t tzone;
+ struct tm *tm;
+ char buf[64];
+ char *c;
+@@ -78,7 +79,8 @@
+ datetime_out(t, dt_DATETIME, buf, 64);
+ nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "utc", buf);
+
+- 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));
+ nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "tzo", buf);
+
+ #ifdef ENABLE_SUPERSEDED
Index: sm/mod_roster.c
---- sm/mod_roster.c.orig 2007-07-20 01:39:48 +0200
-+++ sm/mod_roster.c 2007-07-27 08:15:22 +0200
-@@ -628,6 +628,9 @@
+--- sm/mod_roster.c.orig 2007-09-05 11:35:42 +0200
++++ sm/mod_roster.c 2007-09-24 08:00:08 +0200
+@@ -642,6 +642,9 @@
if(user->sessions == NULL)
return mod_PASS;
@@ -195,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-07-20 21:23:33 +0200
-+++ util/util.h 2007-07-27 08:15:22 +0200
+--- util/util.h.orig 2007-09-21 02:33:08 +0200
++++ util/util.h 2007-09-24 08:00:08 +0200
@@ -30,6 +30,8 @@
#include <time.h>
#include <errno.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.spec
============================================================================
$ cvs diff -u -r1.60 -r1.61 jabberd.spec
--- openpkg-src/jabberd/jabberd.spec 28 Aug 2007 08:20:41 -0000 1.60
+++ openpkg-src/jabberd/jabberd.spec 24 Sep 2007 06:13:26 -0000 1.61
@@ -24,7 +24,7 @@
# package version
%define V_major 2.1
-%define V_minor 15
+%define V_minor 16
# package information
Name: jabberd
@@ -37,7 +37,7 @@
Group: InstantMessaging
License: JOSL/GPL
Version: %{V_major}.%{V_minor}
-Release: 20070828
+Release: 20070924
# package options
%option with_sqlite no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
