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: 22-Jan-2008 17:06:33
Branch: HEAD Handle: 2008012216063200
Modified files:
openpkg-src/jabberd jabberd.patch jabberd.spec
Log:
upgrading package: jabberd 2.1.21 -> 2.1.22
Summary:
Revision Changes Path
1.15 +17 -38 openpkg-src/jabberd/jabberd.patch
1.68 +2 -2 openpkg-src/jabberd/jabberd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 jabberd.patch
--- openpkg-src/jabberd/jabberd.patch 28 Dec 2007 09:34:45 -0000 1.14
+++ openpkg-src/jabberd/jabberd.patch 22 Jan 2008 16:06:32 -0000 1.15
@@ -1,27 +1,6 @@
-Index: configure
---- configure.orig 2007-12-27 18:52:32 +0100
-+++ configure 2007-12-28 10:26:47 +0100
-@@ -30150,7 +30150,7 @@
- fi
-
- if test "x-$enable_mysql" = "x-yes" ; then
-- for i in /usr /usr/local /usr/local/mysql ; 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
-@@ -30168,7 +30168,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmysqlclient $LIBS"
-+LIBS="-L$MYSQL_LIBDIR -lmysqlclient $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
Index: etc/c2s.xml.dist.in
---- etc/c2s.xml.dist.in.orig 2007-12-27 18:52:08 +0100
-+++ etc/c2s.xml.dist.in 2007-12-28 10:30:18 +0100
+--- etc/c2s.xml.dist.in.orig 2008-01-21 16:17:03 +0100
++++ etc/c2s.xml.dist.in 2008-01-22 16:57:57 +0100
@@ -50,18 +50,16 @@
</router>
@@ -63,8 +42,8 @@
<!-- Available authentication mechanisms -->
<mechanisms>
Index: etc/resolver.xml.dist.in
---- etc/resolver.xml.dist.in.orig 2007-12-27 18:52:08 +0100
-+++ etc/resolver.xml.dist.in 2007-12-28 10:26:47 +0100
+--- etc/resolver.xml.dist.in.orig 2008-01-21 16:17:03 +0100
++++ etc/resolver.xml.dist.in 2008-01-22 16:57:57 +0100
@@ -50,18 +50,16 @@
</router>
@@ -88,8 +67,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-12-27 18:52:08 +0100
-+++ etc/router.xml.dist.in 2007-12-28 10:26:47 +0100
+--- etc/router.xml.dist.in.orig 2008-01-21 16:17:03 +0100
++++ etc/router.xml.dist.in 2008-01-22 16:57:57 +0100
@@ -8,24 +8,22 @@
<pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
@@ -120,8 +99,8 @@
<!-- Port to bind to (default: 5347) -->
<port>5347</port>
Index: etc/s2s.xml.dist.in
---- etc/s2s.xml.dist.in.orig 2007-12-27 18:52:08 +0100
-+++ etc/s2s.xml.dist.in 2007-12-28 10:26:47 +0100
+--- etc/s2s.xml.dist.in.orig 2008-01-21 16:17:03 +0100
++++ etc/s2s.xml.dist.in 2008-01-22 16:57:57 +0100
@@ -60,25 +60,23 @@
</router>
@@ -153,8 +132,8 @@
<!-- Helper DNS resolver component - if this component is not
Index: etc/sm.xml.dist.in
---- etc/sm.xml.dist.in.orig 2007-12-27 18:52:08 +0100
-+++ etc/sm.xml.dist.in 2007-12-28 10:26:47 +0100
+--- etc/sm.xml.dist.in.orig 2008-01-21 16:17:03 +0100
++++ etc/sm.xml.dist.in 2008-01-22 16:57:57 +0100
@@ -53,13 +53,13 @@
</router>
@@ -182,8 +161,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-12-27 18:52:04 +0100
-+++ sm/mod_iq_time.c 2007-12-28 10:26:47 +0100
+--- sm/mod_iq_time.c.orig 2008-01-21 16:16:56 +0100
++++ sm/mod_iq_time.c 2008-01-22 16:57:57 +0100
@@ -39,6 +39,7 @@
static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt)
{
@@ -203,9 +182,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 2007-12-27 18:52:04 +0100
-+++ sm/mod_roster.c 2007-12-28 10:26:47 +0100
-@@ -641,6 +641,9 @@
+--- sm/mod_roster.c.orig 2008-01-21 16:16:56 +0100
++++ sm/mod_roster.c 2008-01-22 16:57:57 +0100
+@@ -639,6 +639,9 @@
if(user->sessions == NULL)
return mod_PASS;
@@ -216,8 +195,8 @@
pkt = pkt_create(user->sm, "iq", "set", NULL, NULL);
pkt_id_new(pkt);
Index: util/util.h
---- util/util.h.orig 2007-12-27 18:52:08 +0100
-+++ util/util.h 2007-12-28 10:26:47 +0100
+--- util/util.h.orig 2008-01-21 16:17:04 +0100
++++ util/util.h 2008-01-22 16:57:57 +0100
@@ -30,6 +30,8 @@
#include <time.h>
#include <errno.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.spec
============================================================================
$ cvs diff -u -r1.67 -r1.68 jabberd.spec
--- openpkg-src/jabberd/jabberd.spec 8 Jan 2008 19:07:56 -0000 1.67
+++ openpkg-src/jabberd/jabberd.spec 22 Jan 2008 16:06:32 -0000 1.68
@@ -23,7 +23,7 @@
# package version
%define V_major 2.1
-%define V_minor 21
+%define V_minor 22
# package information
Name: jabberd
@@ -36,7 +36,7 @@
Group: InstantMessaging
License: JOSL/GPL
Version: %{V_major}.%{V_minor}
-Release: 20080108
+Release: 20080122
# package options
%option with_sqlite no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
