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: 23-May-2008 13:01:36
Branch: HEAD Handle: 2008052312013500
Modified files:
openpkg-src/jabberd jabberd.patch jabberd.spec
Log:
upgrading package: jabberd 2.1.24.1 -> 2.2.0
Summary:
Revision Changes Path
1.16 +19 -44 openpkg-src/jabberd/jabberd.patch
1.71 +5 -8 openpkg-src/jabberd/jabberd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 jabberd.patch
--- openpkg-src/jabberd/jabberd.patch 22 Jan 2008 16:06:32 -0000 1.15
+++ openpkg-src/jabberd/jabberd.patch 23 May 2008 11:01:35 -0000 1.16
@@ -1,6 +1,6 @@
Index: etc/c2s.xml.dist.in
---- 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
+--- 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
@@ -50,18 +50,16 @@
</router>
@@ -23,7 +23,7 @@
</log>
<!-- Local network configuration -->
-@@ -128,7 +126,7 @@
+@@ -130,7 +128,7 @@
<id password-change='true' /> -->
<!-- IP address to bind to (default: 0.0.0.0) -->
@@ -32,7 +32,7 @@
<!-- Port to bind to, or 0 to disable unencrypted access to the
server (default: 5222) -->
-@@ -292,7 +290,7 @@
+@@ -294,7 +292,7 @@
<path>@pkglibdir@</path>
<!-- Backend module to use -->
@@ -41,34 +41,9 @@
<!-- Available authentication mechanisms -->
<mechanisms>
-Index: etc/resolver.xml.dist.in
---- 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>
-
- <!-- Log configuration - type is "syslog", "file" or "stdout" -->
-- <log type='syslog'>
-+ <log type='file'>
- <!-- If logging to syslog, this is the log ident -->
-- <ident>jabberd/resolver</ident>
-+ <!-- <ident>jabberd/resolver</ident> -->
-
- <!-- If logging to syslog, this is the log facility
- (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/resolver.log</file>
-- -->
- </log>
-
- <!-- SRV records will be resolved in the following order. The first
Index: etc/router.xml.dist.in
---- 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
+--- 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
@@ -8,24 +8,22 @@
<pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
@@ -99,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-01-21 16:17:03 +0100
-+++ etc/s2s.xml.dist.in 2008-01-22 16:57:57 +0100
+--- 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
@@ -60,25 +60,23 @@
</router>
@@ -130,11 +105,11 @@
+ <ip>127.0.0.1</ip>
<port>5269</port>
- <!-- Helper DNS resolver component - if this component is not
+ <!-- Secret used to generate dialback keys. If you have more than
Index: etc/sm.xml.dist.in
---- 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 @@
+--- 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 @@
</router>
<!-- Log configuration - type is "syslog", "file" or "stdout" -->
@@ -151,7 +126,7 @@
<!-- If logging to file, this is the filename of the logfile -->
<!--
-@@ -73,7 +73,7 @@
+@@ -72,7 +72,7 @@
<path>@pkglibdir@</path>
<!-- By default, we use the MySQL driver for all storage -->
@@ -161,8 +136,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 2008-01-21 16:16:56 +0100
-+++ sm/mod_iq_time.c 2008-01-22 16:57:57 +0100
+--- 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
@@ -39,6 +39,7 @@
static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt)
{
@@ -182,8 +157,8 @@
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-01-21 16:16:56 +0100
-+++ sm/mod_roster.c 2008-01-22 16:57:57 +0100
+--- 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 @@
if(user->sessions == NULL)
return mod_PASS;
@@ -195,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-01-21 16:17:04 +0100
-+++ util/util.h 2008-01-22 16:57:57 +0100
+--- util/util.h.orig 2008-05-22 17:36:32 +0200
++++ util/util.h 2008-05-23 08:29:23 +0200
@@ -30,6 +30,8 @@
#include <time.h>
#include <errno.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.spec
============================================================================
$ cvs diff -u -r1.70 -r1.71 jabberd.spec
--- openpkg-src/jabberd/jabberd.spec 27 Apr 2008 18:54:21 -0000 1.70
+++ openpkg-src/jabberd/jabberd.spec 23 May 2008 11:01:35 -0000 1.71
@@ -22,8 +22,8 @@
##
# package version
-%define V_major 2.1
-%define V_minor 24.1
+%define V_major 2.2
+%define V_minor 0
# package information
Name: jabberd
@@ -36,7 +36,7 @@
Group: InstantMessaging
License: JOSL/GPL
Version: %{V_major}.%{V_minor}
-Release: 20080427
+Release: 20080523
# package options
%option with_sqlite no
@@ -54,8 +54,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, make
PreReq: OpenPKG, openpkg >= 20060823, perl
-BuildPreReq: db, expat, libiconv, libidn, gpg-error, gcrypt, libgsasl,
openssl
-PreReq: db, expat, libiconv, libidn, gpg-error, gcrypt, libgsasl,
openssl
+BuildPreReq: db, expat, libiconv, libidn, gpg-error, gcrypt, libgsasl,
openssl, udns
+PreReq: db, expat, libiconv, libidn, gpg-error, gcrypt, libgsasl,
openssl, udns
%if "%{with_sqlite}" == "yes"
BuildPreReq: sqlite
PreReq: sqlite
@@ -122,8 +122,6 @@
--mandir=%{l_prefix}/man \
--enable-db \
--enable-fs \
- --enable-gsasl \
- --enable-idn \
--enable-pipe \
--enable-ssl \
%if "%{with_sqlite}" == "yes"
@@ -146,7 +144,6 @@
%else
--disable-pam \
%endif
- --disable-cyrus \
--disable-oracle \
--enable-static \
--enable-shared
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
