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: 28-Dec-2007 10:34:46
Branch: HEAD Handle: 2007122809344500
Modified files:
openpkg-src/jabberd jabberd.patch jabberd.spec
Log:
upgrading package: jabberd 2.1.19 -> 2.1.20
Summary:
Revision Changes Path
1.14 +30 -30 openpkg-src/jabberd/jabberd.patch
1.65 +2 -2 openpkg-src/jabberd/jabberd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 jabberd.patch
--- openpkg-src/jabberd/jabberd.patch 18 Oct 2007 07:28:06 -0000 1.13
+++ openpkg-src/jabberd/jabberd.patch 28 Dec 2007 09:34:45 -0000 1.14
@@ -1,7 +1,7 @@
Index: configure
---- configure.orig 2007-10-17 21:15:51 +0200
-+++ configure 2007-10-18 09:22:02 +0200
-@@ -30157,7 +30157,7 @@
+--- 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
@@ -10,7 +10,7 @@
for j in include include/mysql "" ; do
if test -r "$i/$j/mysql.h" ; then
MYSQL_INCLUDE=$i/$j
-@@ -30175,7 +30175,7 @@
+@@ -30168,7 +30168,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -20,9 +20,9 @@
/* confdefs.h. */
_ACEOF
Index: etc/c2s.xml.dist.in
---- 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 @@
+--- 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
+@@ -50,18 +50,16 @@
</router>
<!-- Log configuration - type is "syslog", "file" or "stdout" -->
@@ -36,7 +36,7 @@
(local0 - local7) [default: local3] -->
- <facility>local3</facility>
+ <!-- <facility>local3</facility> -->
-
+
<!-- If logging to file, this is the filename of the logfile -->
- <!--
<file>@localstatedir@/jabberd/log/c2s.log</file>
@@ -44,7 +44,7 @@
</log>
<!-- Local network configuration -->
-@@ -129,7 +127,7 @@
+@@ -128,7 +126,7 @@
<id password-change='true' /> -->
<!-- IP address to bind to (default: 0.0.0.0) -->
@@ -53,7 +53,7 @@
<!-- Port to bind to, or 0 to disable unencrypted access to the
server (default: 5222) -->
-@@ -285,7 +283,7 @@
+@@ -292,7 +290,7 @@
<path>@pkglibdir@</path>
<!-- Backend module to use -->
@@ -63,9 +63,9 @@
<!-- Available authentication mechanisms -->
<mechanisms>
Index: etc/resolver.xml.dist.in
---- 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 @@
+--- 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
+@@ -50,18 +50,16 @@
</router>
<!-- Log configuration - type is "syslog", "file" or "stdout" -->
@@ -88,9 +88,9 @@
<!-- SRV records will be resolved in the following order. The first
Index: etc/router.xml.dist.in
---- 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 @@
+--- 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
+@@ -8,24 +8,22 @@
<pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
<!-- Log configuration - type is "syslog", "file" or "stdout" -->
@@ -120,9 +120,9 @@
<!-- Port to bind to (default: 5347) -->
<port>5347</port>
Index: etc/s2s.xml.dist.in
---- 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 @@
+--- 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
+@@ -60,25 +60,23 @@
</router>
<!-- Log configuration - type is "syslog", "file" or "stdout" -->
@@ -153,9 +153,9 @@
<!-- Helper DNS resolver component - if this component is not
Index: etc/sm.xml.dist.in
---- 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 @@
+--- 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
+@@ -53,13 +53,13 @@
</router>
<!-- Log configuration - type is "syslog", "file" or "stdout" -->
@@ -172,7 +172,7 @@
<!-- If logging to file, this is the filename of the logfile -->
<!--
-@@ -74,7 +74,7 @@
+@@ -73,7 +73,7 @@
<path>@pkglibdir@</path>
<!-- By default, we use the MySQL driver for all storage -->
@@ -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-10-17 21:15:26 +0200
-+++ sm/mod_iq_time.c 2007-10-18 09:23:35 +0200
+--- 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
@@ -39,6 +39,7 @@
static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt)
{
@@ -203,9 +203,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-10-17 21:15:26 +0200
-+++ sm/mod_roster.c 2007-10-18 09:22:02 +0200
-@@ -643,6 +643,9 @@
+--- 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 @@
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-10-17 21:15:30 +0200
-+++ util/util.h 2007-10-18 09:22:02 +0200
+--- util/util.h.orig 2007-12-27 18:52:08 +0100
++++ util/util.h 2007-12-28 10:26:47 +0100
@@ -30,6 +30,8 @@
#include <time.h>
#include <errno.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.spec
============================================================================
$ cvs diff -u -r1.64 -r1.65 jabberd.spec
--- openpkg-src/jabberd/jabberd.spec 31 Oct 2007 14:58:43 -0000 1.64
+++ openpkg-src/jabberd/jabberd.spec 28 Dec 2007 09:34:45 -0000 1.65
@@ -24,7 +24,7 @@
# package version
%define V_major 2.1
-%define V_minor 19
+%define V_minor 20
# package information
Name: jabberd
@@ -37,7 +37,7 @@
Group: InstantMessaging
License: JOSL/GPL
Version: %{V_major}.%{V_minor}
-Release: 20071031
+Release: 20071228
# package options
%option with_sqlite no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
